Didier Lafforgue
|
bf480a6df5
|
forgot to merge that file
|
2012-04-26 12:47:56 +02:00 |
|
Didier Lafforgue
|
e5cb5d1f9a
|
merge with master
|
2012-04-26 12:46:31 +02:00 |
|
Didier Lafforgue
|
a8646e7ef3
|
date picker was not correctly displayed in the popup form (has_many relationship) + previous form errors remained even within a fresh new popup
|
2012-04-26 12:12:55 +02:00 |
|
Didier Lafforgue
|
f9a6155c19
|
content types can auto-reference them (in a many_to_many relationship for instance)
|
2012-04-26 04:00:46 +02:00 |
|
Didier Lafforgue
|
23600edb1f
|
performance improvements as described in #383
|
2012-04-26 03:39:23 +02:00 |
|
Didier Lafforgue
|
9613058b97
|
improve the upgrade script (wip)
|
2012-04-25 19:09:46 +02:00 |
|
Didier Lafforgue
|
0502cf3305
|
bump version to 2.0.0.rc7
|
2012-04-23 01:04:06 +02:00 |
|
Didier Lafforgue
|
69c51fbe07
|
new aloha-rails gem (fixing a typo in a css when precompiling it)
|
2012-04-23 01:03:21 +02:00 |
|
Didier Lafforgue
|
b3902bb3d5
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2012-04-22 23:44:24 +02:00 |
|
Didier Lafforgue
|
ce5576da09
|
the extends tag was not looking for the right fullpath (when localization is enabled) + sample in order to modify the tinyMCE settings in the back-office
|
2012-04-22 23:25:18 +02:00 |
Mario Visic
|
283a0d9be4
|
Merge pull request #378 from davide-malagoli/master
current_user liquid extension (issue #312) added
|
2012-04-22 03:15:05 -07:00 |
|
Didier Lafforgue
|
57b7cc1ef2
|
just a quick test to demonstrate the documentation was wrong (issue #377)
|
2012-04-22 01:27:07 +02:00 |
|
Didier Lafforgue
|
08cf381bc3
|
simple media plugin for Aloha
|
2012-04-22 01:14:25 +02:00 |
Annalisa
|
632e16b18e
|
issue #321 (current_user) working. url_helpers removed.
|
2012-04-21 11:06:13 +02:00 |
|
Annalisa
|
043b78a061
|
strange error
|
2012-04-21 01:50:37 +02:00 |
|
Annalisa
|
fc380e3e4d
|
strange error
|
2012-04-21 01:31:33 +02:00 |
|
Annalisa
|
b87c76bc67
|
added current_user
|
2012-04-21 00:54:54 +02:00 |
|
Didier Lafforgue
|
d6059c2a9b
|
fix issue #373
|
2012-04-20 15:42:10 +02:00 |
|
Didier Lafforgue
|
fa6e62dd84
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2012-04-20 13:13:30 +02:00 |
|
Didier Lafforgue
|
246eadb3fd
|
fix issue #374
|
2012-04-20 13:11:50 +02:00 |
Didier Lafforgue
|
682763445c
|
Merge pull request #372 from GarPit/master
Added missing ru translations
|
2012-04-19 16:05:41 -07:00 |
|
Didier Lafforgue
|
f0e8848ffd
|
repair broken build
|
2012-04-20 00:35:14 +02:00 |
|
Didier Lafforgue
|
486c6a12a2
|
fix issue #367
|
2012-04-20 00:31:48 +02:00 |
|
Didier Lafforgue
|
9b4fc56e82
|
fix issue #360
|
2012-04-19 16:30:16 +02:00 |
PitOn
|
b0a552dfcf
|
added missing ru translations for upcoming 2.0 version
|
2012-04-18 16:41:24 +04:00 |
|
Didier Lafforgue
|
9267725c9f
|
clean the upgrade script (v1 -> v2)
|
2012-04-18 14:35:06 +02:00 |
|
PitOn
|
d78f99703e
|
added missing ru translations for upcoming 2.0 version
|
2012-04-18 16:20:36 +04:00 |
|
PitOn
|
06c1317acb
|
added missing ru translations for upcoming 2.0 version
|
2012-04-18 16:18:38 +04:00 |
|
PitOn
|
23f162f0b3
|
added missing ru translations for upcoming 2.0 version
|
2012-04-18 16:16:46 +04:00 |
|
PitOn
|
0719a8bb76
|
added missing ru translations for upcoming 2.0 version
|
2012-04-18 16:14:01 +04:00 |
|
Didier Lafforgue
|
9f2cab94cb
|
the very first tests for the API
|
2012-04-18 02:07:48 +02:00 |
|
Didier Lafforgue
|
792ebd142b
|
bump version to 2.0.0.rc6 (forgot something)
|
2012-04-17 18:43:14 +02:00 |
|
Didier Lafforgue
|
b053ba5a26
|
bump version to 2.0.0.rc6
|
2012-04-17 18:42:27 +02:00 |
|
Didier Lafforgue
|
47015d3473
|
write cucumber tests to illustrate how to deal with a contact form + fix a tiny bug about it
|
2012-04-17 17:48:42 +02:00 |
|
Didier Lafforgue
|
1d19d606b8
|
closing textarea tags do not break the page form anymore
|
2012-04-17 16:13:21 +02:00 |
|
Didier Lafforgue
|
67c36191d2
|
was breaking the API (tests are coming)
|
2012-04-17 13:53:15 +02:00 |
|
Didier Lafforgue
|
39bb85d163
|
forgot to push the Gemfile.lock too
|
2012-04-17 03:11:09 +02:00 |
|
Didier Lafforgue
|
bc919ed544
|
bump version to 2.0.0.rc5
|
2012-04-17 03:09:17 +02:00 |
|
Didier Lafforgue
|
60df273e4b
|
fix tests for issue #366
|
2012-04-17 03:02:31 +02:00 |
|
Didier Lafforgue
|
3fca9fa2d3
|
Merge pull request #366 from dimonzozo/master
Bug while sending notification email
|
2012-04-16 17:54:52 -07:00 |
Dmitriy
|
a74a0045a3
|
Wrong arguments order fixed.
|
2012-04-17 02:44:19 +04:00 |
|
Didier Lafforgue
|
26662acae9
|
force version of the multi_json gem (1.2.0)
|
2012-04-16 20:50:07 +02:00 |
|
Didier Lafforgue
|
3eb521ba75
|
upgrade FOG
|
2012-04-16 12:36:30 +02:00 |
|
Didier Lafforgue
|
256a0e4bc0
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2012-04-16 12:35:44 +02:00 |
|
Didier Lafforgue
|
b25332b262
|
disable the inline editor launch button if the page to display enabled the cache (quick patch for #353)
|
2012-04-16 11:49:04 +02:00 |
|
Didier Lafforgue
|
655fe18d72
|
add UI notifications when a form is submitted + disable the form when it is being submitted + pass the current ability to the presenter + remove debug statements
|
2012-04-16 11:38:32 +02:00 |
|
Didier Lafforgue
|
f973ccef1b
|
preserve whitespace in textarea tags (HAML/Rails bug)
|
2012-04-14 17:35:11 +02:00 |
|
Didier Lafforgue
|
1ae9557515
|
back to the original editable_short_text (#349)
|
2012-04-14 13:38:47 +02:00 |
|
Didier Lafforgue
|
21469ce367
|
do not display the content types select box if a page is not templatized
|
2012-04-14 11:55:24 +02:00 |
|
Didier Lafforgue
|
06fa564f37
|
fix a couple of potential bugs when playing with the site locales
|
2012-04-13 18:32:55 +02:00 |