Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream #1

Open
wants to merge 429 commits into
base: master
Choose a base branch
from
Open

Merge upstream #1

Changes from 1 commit
Commits
Show all changes
429 commits
Select commit Hold shift + click to select a range
e7638d8
Migrate sources_parses tests (#134)
kaos Mar 1, 2014
1a1140a
Drop old tests (fixes #134)
kaos Mar 1, 2014
1b59f3c
Merge branch 'bug-fix-escape-quotes' of https://github.com/campanja/e…
kaos Mar 1, 2014
a379a0d
Fix broken truncate filters (#138)
kaos Mar 2, 2014
88bcc77
Add failing test for string quote fix in #138
kaos Mar 2, 2014
c9e824d
Merge branch 'campanja-bug-fix-escape-quotes'
kaos Mar 2, 2014
a0b58de
New debug options to not lean on the debug_info option (fixes #139)
kaos Mar 2, 2014
a03a8a6
Clarify applicability of the new debug_root option.
kaos Mar 2, 2014
c9f2f69
Describe our branch and release strategy
kaos Mar 2, 2014
df1516c
Move python code from tests to test.
kaos Mar 3, 2014
fe78fc7
Add NEWS file.
kaos Mar 3, 2014
28a3407
Make NEWS pretty on github..
kaos Mar 3, 2014
4faff51
Fix formatting of NEWS file.
kaos Mar 3, 2014
1af6f8e
FreeBSD uses bmake as make program, so we need to add call to gmake h…
snar Mar 6, 2014
a32f352
Merge pull request #145 from snar/freebsd-uses-gmake
kaos Mar 6, 2014
b86bd99
Missed to rename test target for travis.
kaos Mar 10, 2014
76736d8
Add tests for `compile_dir` (fixes #146)
kaos Mar 10, 2014
c15feec
Missing expected output file (#146)
kaos Mar 10, 2014
16f9978
make clean also for slex.
kaos Mar 10, 2014
cf62dbe
Workaround for rebar/rebar#247.
kaos Mar 10, 2014
94ce794
Update NEWS.
kaos Mar 10, 2014
fd79c34
Don't use `render_tag` for directory templates. (#147)
kaos Mar 11, 2014
6f5c9e4
Revert to previous compile_dir functionality (fixes #148)
kaos Mar 11, 2014
00599f1
Describe the new library behaviour (fixes #149)
kaos Mar 11, 2014
bbe5be8
Add more filter escape tests (fixes #150)
kaos Mar 12, 2014
2bc8343
Add inline comments to erlydtl parse tree.
seriyps Mar 21, 2014
3b1fa97
New api for sources parser: add translators comments extraction.
seriyps Mar 22, 2014
dcf55ec
Update NEWS
kaos Mar 22, 2014
c06240d
Merge branch 'pu-translators_comment' (close #152, fixes #127)
kaos Mar 22, 2014
c59b600
Fix deps in rebar configs.
kaos Mar 22, 2014
49d910f
release 0.9.2
kaos Mar 22, 2014
1149e0c
runtime: fix list access for last element
jflatow Mar 26, 2014
51bb1f2
Run tests on `make all`.
kaos Mar 27, 2014
f7dab6a
Add failing test for #155.
kaos Mar 27, 2014
1f56948
Merge branch 'master' of https://github.com/quasiconvex/erlydtl into …
kaos Mar 27, 2014
bc77e96
Update README to reflect new stable branch usage (#154)
kaos Mar 27, 2014
c39dfe5
Add list indexing incompatibility note (#155)
kaos Mar 27, 2014
d0ddfb5
Update NEWS.
kaos Mar 27, 2014
99afb82
Update Release notes in NEWS.
kaos Mar 27, 2014
0bdfbfa
Hardcode release version in app file (fixes #154)
kaos Mar 27, 2014
cdf7a5f
Setup development branch.
kaos Mar 27, 2014
9e81342
New option for 0-based list access (fixes #156)
kaos Mar 27, 2014
31b53b7
Fix tuple access (related to #155)
kaos Mar 27, 2014
ad43f6e
New option for 0-based tuple access (#156)
kaos Mar 27, 2014
282279b
Merge branch 'master' into stable
kaos Mar 27, 2014
25d632f
Flush NEWS.
kaos Mar 27, 2014
dbb84fb
erlydtl_beam_compiler: clean up meta forms.
kaos Apr 8, 2014
88d3fd4
Fix #61: add compile options default_vars and constants
kaos Apr 8, 2014
3b1e20a
clean up #ast_info.pre_render_asts
kaos Apr 8, 2014
82e3aa1
erlydtl_beam_compiler: refactor custom_forms for readability..
kaos Apr 8, 2014
6644221
fix #157: avoid broken R16B03
kaos Apr 9, 2014
e330fa8
R15B03-1 not available on travis..
kaos Apr 9, 2014
4871ec7
drop bitdeli badge.
kaos Apr 9, 2014
7e0923b
avoid R15B and R15B01
kaos Apr 9, 2014
424b0d9
Run merl tests together with erlydtl tests.
kaos Apr 9, 2014
8bd8043
make -> gmake typo for freebsd
kaos Apr 9, 2014
1ece0a6
fix #153: parse (and unparse) comment tags {# .. #}
kaos Apr 9, 2014
9242712
support translation context in `trans` tags (#131)
kaos Apr 10, 2014
e135b32
support translation context in `blocktrans` blocks (#131)
kaos Apr 10, 2014
cc35ef8
support count and plural forms in blocktrans blocks (#131)
kaos Apr 10, 2014
490763f
fix blocktrans bugs (#131)
kaos Apr 10, 2014
b712972
test `_(Value)` translations (#131)
kaos Apr 11, 2014
73b36c1
set current locale to 'default' if not specified (#131)
kaos Apr 11, 2014
51cc7e1
align compile vs render options for translation (#131)
kaos Apr 11, 2014
fc5fb60
support translation fun initialization.
kaos Apr 14, 2014
f38e759
Preserve _ prefixed to variable names when generating erlang
RJ Apr 14, 2014
b04b238
Merge branch 'unused-vars-fix' of https://github.com/irccloud/erlydtl…
kaos Apr 14, 2014
4f0ea21
rename varify/1 -> varname_ast/1
kaos Apr 14, 2014
580402d
Add note regarding underscore prefix on template variable names.
kaos Apr 14, 2014
497540b
fix #162: parse plural forms and context
kaos Apr 15, 2014
4a98a8e
add missing context clause for trans tag (#162)
kaos Apr 15, 2014
522e1c8
get nice progress while running the test suite
kaos Apr 15, 2014
3358f34
keep noop trans tags in parsed AST tree (fixes #162)
kaos Apr 15, 2014
e0208a3
close #161
kaos Apr 15, 2014
6280d21
Release 0.9.4
kaos Apr 15, 2014
99583b7
Fix ensure_dir when debug_root is specified
choptastic Apr 18, 2014
67daeaf
Merge pull request #166 from choptastic/ensure-dir
kaos Apr 18, 2014
fc7b5ac
Handle loops within {%block%} and {%extend%}
choptastic Apr 18, 2014
d1d3f60
Flush news + drop 17.0 tests on travis.
kaos Apr 21, 2014
b9ec861
Move all for loop logic to erlydtl_runtime (#167)
kaos Apr 21, 2014
96dccf6
Accept any identifier as attribute (Fixes #177)
kaos Jun 29, 2014
7a230a2
Update README.markdown
zkessin Jun 29, 2014
d3f9491
Touch up README (close #179).
kaos Jun 29, 2014
4f5fd21
fix multiple includes which uses extends with blocks of the same name.
kaos Jul 2, 2014
04595cf
improve debug dump of compiled templates.
kaos Jul 2, 2014
e6a0dea
Check that extends-templates don't use non-block tags.
kaos Jul 2, 2014
7b9d879
We need merl?
robashton Jul 4, 2014
961a8ed
Merge pull request #180 from robashton/master
kaos Jul 11, 2014
e9ef33c
Update bundled rebar binary. Fixes #174.
kaos Jul 26, 2014
890f2b3
-W is not a supported make flag on freebsd. Fixes #181.
kaos Jul 26, 2014
64f9886
Add test confirming issue #185.
kaos Jul 26, 2014
88d87f4
Fixes #185.
kaos Jul 26, 2014
9b1a886
Revert a change from commit 51bb1f2387b2ae839637134bb72eda627b63ec85.
kaos Jul 26, 2014
56fe3cd
Test confirming issue #183.
kaos Jul 26, 2014
742df67
Fix quoting in pre_hooks to get it copmiling when folder name has spa…
alexr Jul 28, 2014
d8738e3
Merge pull request #186 from alexr/master
kaos Jul 29, 2014
33b1fa2
Fix issue #183.
kaos Jul 29, 2014
85271f3
Fix #184
kaos Jul 30, 2014
6a15545
change $REBAR_DEPS_DIR to %REBAR_DEPS_DIR% for windows compatibility
andreasgerstmayr Aug 11, 2014
5347e87
Merge pull request #188 from andihit/master
kaos Aug 11, 2014
089d257
remove unused create_scope/3.
kaos Aug 11, 2014
0ba11ce
fix #171 by cleaning out some unused i18n files.
kaos Aug 11, 2014
c79fbc3
add more function for find_value
dcy Oct 23, 2014
6fd16da
add test for 'list no the attr' and 'binary no the attr'
dcy Oct 23, 2014
7d306fa
catch all clause at the end for find_value/2
dcy Oct 27, 2014
7352409
touch up tests for pr #192
kaos Oct 27, 2014
741d0a1
Merge branch 'dcy-master'
kaos Oct 27, 2014
aabdb72
maps support and downward compatibility
dcy Dec 5, 2014
d3e886c
maps support and downward compatibility
dcy Dec 5, 2014
8123886
is_map --> erlang:is_map
dcy Dec 5, 2014
0d96696
add test for maps
dcy Dec 5, 2014
48b256a
reserved words are really only for tags, not for variables at all (cl…
kaos Dec 16, 2014
34f8237
support cycle ... as var syntax (ref #195).
kaos Dec 16, 2014
d8122aa
support silent option in cycle tag (close #195).
kaos Dec 16, 2014
5e49d7a
update docs.
kaos Dec 16, 2014
ad3a5ea
support for records in regroup tag (close #191).
kaos Dec 16, 2014
6b5e579
runtime: null is also false; important for dealing with json
jflatow Aug 3, 2014
3b8d414
minor clean up. support any map keys, not only atoms, lists and binar…
kaos Dec 18, 2014
91a5d1c
Merge branch 'dcy-master'
kaos Dec 18, 2014
82b9238
update NEWS file.
kaos Dec 18, 2014
03af77f
a few more basic tests for maps.
kaos Dec 19, 2014
ffb6abd
Fix bug spotted by dialyzer.
kaos Dec 20, 2014
dce7c95
Release 0.10.0
kaos Dec 20, 2014
dcb3762
flush news.
kaos Dec 20, 2014
aa1aaee
Fix bug when library module implements several behaviours
kudryashov-sv Feb 10, 2015
558385d
refactor out multiple lib test into own test case.
kaos Feb 11, 2015
3f4005a
cleanup behaviour check.
kaos Feb 11, 2015
0611cf8
Merge branch 'kudryashov-sv-fix-multiple-behaviours-issue'
kaos Feb 11, 2015
7e65825
change include path on i18n sources parser to attempt to fix build error
nuex Feb 15, 2015
484cf11
Merge pull request #198 from nuex/change-include-path
kaos Feb 16, 2015
68f90ec
mostly travis-ci stuff
danikp Feb 14, 2015
d1da403
Merge branch 'danikp-master'
kaos Feb 20, 2015
a4ac286
let travis make check to run the dialyzer too.
kaos Feb 20, 2015
4466f0b
Extract LICENSE from src/erlydtl.erl
lukateras Apr 18, 2015
913fa69
Adding support for "Assignment tags" (https://docs.djangoproject.com…
A40in Apr 19, 2015
d166fd5
Merge pull request #203 from yegortimoschenko/license
kaos Apr 20, 2015
5b96446
close #202.
kaos Apr 20, 2015
de00ccf
Merge pull request #204 from A40in/custom_tag_var
kaos Apr 20, 2015
427db67
Adding Options to reader(reader_options) for more flexible custom rea…
A40in Jun 17, 2015
d8dcc0c
readme for Adding Options to reader
A40in Jun 17, 2015
41018fb
some optimize for Adding Options to reader
A40in Jun 17, 2015
66f7818
Merge pull request #206 from A40in/reader_options
kaos Jun 17, 2015
53fe2d0
update rebar.config to accept version 18.*
ricecake Jun 29, 2015
31ff5a5
Update .travis.yml
ricecake Jul 7, 2015
fb7c74c
Fix bug in truncatewords_html on closing tags
pablo-meier Jul 7, 2015
0c1dd00
Merge pull request #208 from pablo-meier/truncatewords_html_bugfix
kaos Jul 8, 2015
a68121b
Allow custom library use either of behaviOUr or behaviOr.
alexr Jul 11, 2015
25da89d
Merge pull request #209 from alexr/recognize_behavior
kaos Jul 12, 2015
5ac3718
Fix bug in truncatewords_html on closing tags
pablo-meier Jul 7, 2015
04d4454
Allow custom library use either of behaviOUr or behaviOr.
alexr Jul 11, 2015
75dbb00
wrap block.super contents in a fun.
kaos Jul 18, 2015
dd16a97
Merge branch 'ricecake-patch-1'
kaos Jul 18, 2015
b992c45
merl shipped with Erlang/OTP as of v18.0.
kaos Jul 19, 2015
f8602ca
Update app file to exclude merl app when shipped with syntax_tools. (…
kaos Jul 23, 2015
5c0793e
type interpolation and escaping in trandlations with parameters
brigadier Aug 17, 2015
18d9017
fix recursive autoescape handling
brigadier Aug 17, 2015
51aec30
translation tests
brigadier Aug 17, 2015
c078160
Be precise about gb_trees struct to avoid problems with simple tuples
oxpa Aug 31, 2015
41bb0c2
adding a test
oxpa Aug 31, 2015
5ac24d1
Merge pull request #216 from oxpa/gb_tree
kaos Aug 31, 2015
7be5db2
pass translation function into 'date' filter.
oxpa Sep 17, 2015
81742fd
misplaced function head moved down.
oxpa Sep 17, 2015
1a99256
date translation interface working + tests happy
oxpa Sep 18, 2015
cba06ff
handle 'none' translation function separately
oxpa Sep 18, 2015
e9257e6
date translation with tests
oxpa Sep 18, 2015
74dce77
replace erlang:apply with direct functin call
oxpa Sep 18, 2015
4d41709
Merge branch 'gb_tree' into module_trans
oxpa Sep 21, 2015
f81b7be
a note on translation function usage with dates
oxpa Sep 29, 2015
ce2ba82
Merge pull request #219 from oxpa/module_trans
kaos Sep 30, 2015
6729a5b
Add test for #220
kaos Oct 14, 2015
e353f37
Add expected output for #220 on 0.9.4
kaos Oct 14, 2015
59cfc37
fix #220
kaos Oct 14, 2015
f5f3267
Merge branch 'issue/220'
kaos Oct 14, 2015
cb2cc0f
make functional trans test actually do something.
kaos Oct 15, 2015
17da86b
Add missing functions in compile_dir template module. (#217)
kaos Oct 15, 2015
f4cef9c
Merge pull request #215 from brigadier/master
kaos Oct 16, 2015
11f4bf0
add language tag (#212).
kaos Oct 17, 2015
27cdc1c
Add trimmed option to blocktrans tag (#212).
kaos Oct 17, 2015
8123a11
Add tests for blocktrans trimmed (#212).
kaos Oct 18, 2015
d2d120c
Warn on usage of unknown tag (#212).
kaos Oct 18, 2015
c3138f6
fix blocktrans unparser tests.
kaos Oct 20, 2015
802c1a1
blocktrans trimmed issues (fixes #212)
kaos Oct 20, 2015
1b8ac20
Merge upstream changes to yeccpre.hrl (closes #214).
kaos Oct 25, 2015
5d0d8d7
Add time compat module from http://www.erlang.org/doc/apps/erts/time_…
kaos Oct 25, 2015
b58b6f4
rename time_compat module to avoid conflicts. Use new compat module.
kaos Oct 25, 2015
b8ed4b5
Move test config to separate file (fixes #211).
kaos Oct 25, 2015
8093fc3
Release 0.11.0
kaos Oct 25, 2015
05acba3
Fix tests on travis. Merl is configured by rebar.config.script.
kaos Oct 26, 2015
f3f943a
Fetch and compile test deps.
kaos Oct 26, 2015
257ad37
Doh. 05acba3d0506ec370485ca005a6aed7b9456965f was a misfix.
kaos Oct 26, 2015
2e314f8
Now, lots of ugly words, should it work.
kaos Oct 26, 2015
333025a
Release 0.11.1
kaos Oct 26, 2015
1973e20
Use phash2/1 explicitly. It's not in compat layer
ten0s Dec 30, 2015
0b1cbeb
Merge pull request #230 from ten0s/master
kaos Jan 4, 2016
2c79692
Make hex package
Licenser Feb 17, 2016
25945a7
Fix url
Licenser Feb 18, 2016
e7c2de7
Merge pull request #234 from project-fifo/hex
kaos Feb 18, 2016
9032b1e
Update a link to Django documentation
KrzysiekJ Mar 31, 2016
aecc1e7
Merge pull request #237 from KrzysiekJ/django-docs-link
kaos Mar 31, 2016
0d7e0a1
Support tuple wrapped list keyfind lookups
jwheare Apr 8, 2016
7633fb9
Merge pull request #239 from irccloud/tuple_wrapped_proplists
kaos Apr 9, 2016
ea9f0dd
fixes #240: introduce newlines in custom tag test.
kaos May 28, 2016
067a109
rebar.config: add 19 to require_otp_version regexp
kaos Jun 22, 2016
7737254
make the 'join' filter work with numbers
brigadier Aug 5, 2016
2aae623
Merge pull request #246 from brigadier/patch-3
kaos Aug 8, 2016
c2a560e
Add failing test for #243.
kaos Aug 8, 2016
0ba4eb5
Merge remote-tracking branch 'origin/master'
kaos Aug 8, 2016
1597b56
Update README to reflect changes in branching model being used.
kaos Aug 8, 2016
e5e2e13
Merge branch 'stable'
kaos Aug 8, 2016
187ef06
Update NEWS.
kaos Aug 8, 2016
7129c77
tweak make release to detect new release version.
kaos Aug 8, 2016
cec398d
release v0.12.0
kaos Aug 8, 2016
87acc29
tweak comment.
kaos Aug 8, 2016
0e926d1
README: fix typos.
kaos Aug 8, 2016
ea955c5
Support filters on trans value (fixes #248).
kaos Aug 16, 2016
7e5058c
Merge branch 'develop'
kaos Aug 25, 2016
b0d0975
Update NEWS.
kaos Sep 2, 2016
ec2f60f
Fix random deprecation warning
Aug 26, 2016
bb1ae0f
release 0.12.1.
kaos Sep 21, 2016
4e6e854
fix
danikp Apr 7, 2017
a7209fc
Add 19.3 Travis build
ten0s Jun 27, 2017
41b5de0
Support Erlang/OTP 20.0
ten0s Jun 27, 2017
dd81263
Merge pull request #254 from danikp/fix-issue-231
kaos Jul 5, 2017
d3d0437
Update README.markdown
kaos Jul 5, 2017
960dc2b
Merge pull request #255 from ten0s/master
kaos Jul 5, 2017
032746b
Update .travis.yml
kaos Jul 5, 2017
bd3ce0f
compatibility with OTP 21
brigadier Aug 16, 2018
7fa45ed
add OTP 21 to .travis.yml
brigadier Aug 17, 2018
c7d65a9
merl bug in OTP 21 workaround
brigadier Aug 18, 2018
118c176
Merge pull request #261 from brigadier/master
seriyps Oct 18, 2018
bf381a9
Make sure that when checking if a function is exported that the modul…
Jan 24, 2019
6486b1e
Merge pull request #263 from sebmaynard/master
seriyps Jan 28, 2019
d4b20d0
Fix stacktrace warnings
burbas Dec 13, 2019
eb29fbe
Drop unsupported travis build R15
burbas Dec 18, 2019
e16631d
Merge pull request #267 from novaframework/stacktrace
kaos Dec 20, 2019
cd418c4
Version bump 0.13.0
seriyps Feb 15, 2020
473a457
Add OTP21 to supported versions and travis
seriyps Feb 15, 2020
cb6dc12
Remove deprecated "maintainers" from app.src
seriyps Feb 15, 2020
2f19777
Added nowarn flag to export all in erlydtl_runtime
Taure Jan 30, 2021
bbbcc22
Merge pull request #270 from Taure/nowarn_export_all
kaos Feb 1, 2021
499dc44
support OTP 23 and modify only applications for spec
Mar 19, 2021
4279d94
Merge pull request #271 from manuel-rubio/master
kaos Mar 19, 2021
c1f3df8
release v0.14.0
kaos Mar 19, 2021
b033ba3
Fix typos
kianmeng Feb 27, 2022
3d21be0
Merge pull request #273 from kianmeng/fix-typos
kaos Mar 8, 2022
998658d
No such function exported gettext_compile:write_pretty/1
lemenkov May 19, 2016
53fc6b3
No such function exported gettext_compile:fmt_fileinfo/1
lemenkov May 19, 2016
adba128
No such fun - gettext_compile:open_po_file/3
lemenkov May 19, 2016
9d83b67
No such fun - gettext_compile:close_file/0
lemenkov May 19, 2016
55d93eb
Merge pull request #274 from lemenkov/gettext_nonexisting_functions
kaos May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
drop bitdeli badge.
  • Loading branch information
@kaos
kaos committed Apr 9, 2014
commit 4871ec7e77cda6307ea1d9d557477928aefdfabc
3 changes: 0 additions & 3 deletions README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,3 @@ From a Unix shell, run:
make tests

Note that the tests will create some output in tests/output in case of regressions.


[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/erlydtl/erlydtl/trend.png)](https://bitdeli.com/free "Bitdeli Badge")