632e16b18e
issue #321 (current_user) working. url_helpers removed.
2012-04-21 11:06:13 +02:00
043b78a061
strange error
2012-04-21 01:50:37 +02:00
fc380e3e4d
strange error
2012-04-21 01:31:33 +02:00
b87c76bc67
added current_user
2012-04-21 00:54:54 +02:00
d6059c2a9b
fix issue #373
2012-04-20 15:42:10 +02:00
fa6e62dd84
Merge branch 'master' of github.com:locomotivecms/engine
2012-04-20 13:13:30 +02:00
246eadb3fd
fix issue #374
2012-04-20 13:11:50 +02:00
682763445c
Merge pull request #372 from GarPit/master
...
Added missing ru translations
2012-04-19 16:05:41 -07:00
f0e8848ffd
repair broken build
2012-04-20 00:35:14 +02:00
486c6a12a2
fix issue #367
2012-04-20 00:31:48 +02:00
9b4fc56e82
fix issue #360
2012-04-19 16:30:16 +02:00
b0a552dfcf
added missing ru translations for upcoming 2.0 version
2012-04-18 16:41:24 +04:00
9267725c9f
clean the upgrade script (v1 -> v2)
2012-04-18 14:35:06 +02:00
d78f99703e
added missing ru translations for upcoming 2.0 version
2012-04-18 16:20:36 +04:00
06c1317acb
added missing ru translations for upcoming 2.0 version
2012-04-18 16:18:38 +04:00
23f162f0b3
added missing ru translations for upcoming 2.0 version
2012-04-18 16:16:46 +04:00
0719a8bb76
added missing ru translations for upcoming 2.0 version
2012-04-18 16:14:01 +04:00
9f2cab94cb
the very first tests for the API
2012-04-18 02:07:48 +02:00
792ebd142b
bump version to 2.0.0.rc6 (forgot something)
2012-04-17 18:43:14 +02:00
b053ba5a26
bump version to 2.0.0.rc6
2012-04-17 18:42:27 +02:00
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
1d19d606b8
closing textarea tags do not break the page form anymore
2012-04-17 16:13:21 +02:00
67c36191d2
was breaking the API (tests are coming)
2012-04-17 13:53:15 +02:00
39bb85d163
forgot to push the Gemfile.lock too
2012-04-17 03:11:09 +02:00
bc919ed544
bump version to 2.0.0.rc5
2012-04-17 03:09:17 +02:00
60df273e4b
fix tests for issue #366
2012-04-17 03:02:31 +02:00
3fca9fa2d3
Merge pull request #366 from dimonzozo/master
...
Bug while sending notification email
2012-04-16 17:54:52 -07:00
a74a0045a3
Wrong arguments order fixed.
2012-04-17 02:44:19 +04:00
26662acae9
force version of the multi_json gem (1.2.0)
2012-04-16 20:50:07 +02:00
3eb521ba75
upgrade FOG
2012-04-16 12:36:30 +02:00
256a0e4bc0
Merge branch 'master' of github.com:locomotivecms/engine
2012-04-16 12:35:44 +02:00
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
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
f973ccef1b
preserve whitespace in textarea tags (HAML/Rails bug)
2012-04-14 17:35:11 +02:00
1ae9557515
back to the original editable_short_text ( #349 )
2012-04-14 13:38:47 +02:00
21469ce367
do not display the content types select box if a page is not templatized
2012-04-14 11:55:24 +02:00
06fa564f37
fix a couple of potential bugs when playing with the site locales
2012-04-13 18:32:55 +02:00
a507d756b7
repair the js slugify method
2012-04-13 18:08:53 +02:00
f7388d14e7
Merge pull request #356 from colibri-software/inline_editor_firefox_fix
...
Inline editor bug in Firefox
2012-04-13 07:21:56 -07:00
ebd3081205
Merge remote-tracking branch 'origin/master'
2012-04-13 22:14:23 +08:00
edca6323fb
Fixed a regression when updating javascript stringify. Fixes #355 .
2012-04-13 22:11:44 +08:00
9dc3f778a4
Merge pull request #351 from willcosgrove/spinny-toggle-buttons
...
Spinny toggle buttons
2012-04-13 06:40:07 -07:00
d0698b1ffc
fix issue #348
2012-04-13 15:29:06 +02:00
56a0affbcb
Changed iframe resize function
...
Instead of resizing the iframe based on the height of the body element
of the iframe content, do it based on the entire content height. Also,
don't compare the inner content height to the body height of the outer
page, but use the iframe height instead.
2012-04-13 10:03:31 -03:00
e2b73d786a
Merge pull request #345 from locomotivecms/no_require
...
Require the engine on gem load.
2012-04-13 05:48:22 -07:00
7a595208aa
fix issue #338
2012-04-13 14:38:00 +02:00
560afc6b0a
Fixed my css and javascript problems
2012-04-11 15:35:23 -05:00
cd703970b4
Added new buttons and styling
2012-04-11 14:24:41 -05:00
106cc6fc50
fix issue #346
2012-04-11 00:26:59 +02:00
4bf16b00f9
Require the engine on gem load.
2012-04-10 18:06:28 +08:00
Annalisa
Didier Lafforgue
Didier Lafforgue
PitOn
Dmitriy
Mario Visic
Alex Sanford
Will Cosgrove