Commit Graph

706 Commits

Author SHA1 Message Date
did
819d7ac5ff fix issue #131 2011-07-19 16:20:53 +02:00
did
194a01d15f solve temporarily the issue #127 2011-07-19 15:51:29 +02:00
did
91aa975973 fix issue #126 2011-07-19 15:36:38 +02:00
did
47088f9b0e fix issue #115 + clean code + exporting a site works now with ruby 1.8.7 2011-07-19 14:52:02 +02:00
did
45ff488ae8 enhance the rake task which forces to serialize page templates + do not import twice an asset with the same filename 2011-07-19 11:49:15 +02:00
did
53a83b5f79 fix broken rake task (rebuild_serialized_page_templates) 2011-07-18 23:11:22 +02:00
did
9a36e85ce1 update the export test 2011-07-14 15:18:19 +02:00
did
e27c26ebdd Merge branch 'master' of github.com:locomotivecms/engine 2011-07-14 15:01:53 +02:00
did
5f29ebd55b when exporting a site, a nil value for the listed page property should be considered as false 2011-07-14 15:01:34 +02:00
Didier Lafforgue
cd45ddf551 Merge pull request #124 from vandrijevik/master
Fix usage of HEROKU_LOGIN and HEROKU_PASSWORD for specifying Heroku credentials
2011-07-14 05:58:46 -07:00
did
efe2e63aa3 offical IE maintainer: Alex Sanford 2011-07-14 14:43:59 +02:00
Vladimir Andrijevik
ce96d86cdd Fix usage of environment variables for Heroku credentials. 2011-07-14 14:23:15 +02:00
Didier Lafforgue
4a9da56341 Merge pull request #114 from frisoft/master
Italian localization update + Locomotive.config.default_locale as default locale for new accounts.
2011-07-14 01:02:08 -07:00
Didier Lafforgue
93da1f0cf3 Merge pull request #122 from colibri-software/master
Quick patch for has_many bug in IE
2011-07-14 01:01:38 -07:00
Alex Sanford
d162cf20c8 Mostly fixed issue #121
Made the text show up but now the select won't update when options are
added or deleted
2011-07-13 23:27:48 -03:00
did
2c562038d8 use ActiveSupport::JSON.encode instead of the to_json method (not reliable) 2011-07-14 00:08:43 +02:00
did
8956145da7 use carrierwave instead of locomotive_carrierwave now (engine) 2011-07-13 21:29:39 +02:00
did
770ae3a543 fix a couple of tiny bugs about: export, import and aloha 2011-07-13 11:14:44 +02:00
Andrea Frigido
f6c91ed791 Locomotive.config.default_locale as default locale for new accounts. 2011-07-11 13:13:58 +02:00
Andrea Frigido
0fde9917d5 Italian localization update. 2011-07-11 09:04:12 +02:00
Andrea Frigido
d5e2d20181 Merge remote-tracking branch 'upstream/master' 2011-07-11 07:56:50 +02:00
did
86259e94b7 new carrierwave gem in replacement of locomotive-carrierwave (thanks @trevorturk) 2011-07-10 22:40:12 +02:00
did
dc9570dda0 fix issues #110 and #112 + polish css 2011-07-10 19:59:54 +02:00
did
2236b43222 fix bug #111 2011-07-09 00:47:05 +02:00
did
0ea5275504 make the export more solid 2011-07-08 23:06:07 +02:00
Andrea Frigido
33b2b83db7 Merge remote-tracking branch 'upstream/master' 2011-07-08 15:45:56 +02:00
did
72c1ac9454 solve minor bugs 2011-07-08 15:03:48 +02:00
Andrea Frigido
89cc143083 Commit for merge. 2011-07-08 12:10:07 +02:00
Didier Lafforgue
c426b83871 Merge pull request #109 from corgibytes/capybara-fix
Fixed issue with javascript cucumber features not opening the correct url
2011-07-08 02:01:46 -07:00
M. Scott Ford
8437b51901 Fixed issue with javascript cucumber features not opening the correct url. 2011-07-08 00:00:52 -04:00
did
390f25ce1f minor css improvements 2011-07-08 00:25:03 +02:00
did
b2ddaf805c show page kind: templatized or redirect 2011-07-07 18:03:55 +02:00
did
711110a6e0 snippets were missing in the export 2011-07-07 16:59:50 +02:00
did
9008324367 it won't happen again 2011-07-07 01:36:35 +02:00
did
900d526a2f clean by removing useless files 2011-07-07 01:35:51 +02:00
did
007f34ed8c export didn't work when sub pages 2011-07-07 01:34:11 +02:00
did
88325ca932 Merge branch 'master' of github.com:locomotivecms/engine 2011-07-07 00:07:06 +02:00
Didier Lafforgue
bf4b2be2b9 Merge pull request #108 from corgibytes/variables-as-values
Enabled the use of variable values as the default values for editable con
2011-07-06 15:06:47 -07:00
M. Scott Ford
314c1293d9 Enabled the use of variable values as the default values for editable content. 2011-07-06 15:19:55 -04:00
did
fe47b3e6c6 Merge branch 'master' of github.com:locomotivecms/engine 2011-07-06 21:02:51 +02:00
did
b4e72f98b9 new task in the TODO list 2011-07-06 21:02:39 +02:00
did
37d10aa25b fix bug #104 2011-07-06 11:48:04 -07:00
Didier Lafforgue
875d840442 add new contributors (Enrique & Lars) 2011-07-06 00:56:47 -07:00
did
6acec074e2 spanish translation (ticket #103) 2011-07-06 00:33:34 +02:00
did
0737919c2c Dutch translation (ticket #92) 2011-07-05 23:55:26 +02:00
did
6f58d89e39 ticket #89 closed 2011-07-05 22:39:27 +02:00
did
1a62d8f5ad Adding the ability to set a robots.txt for each site (ticket #87) 2011-07-05 22:34:15 +02:00
Didier Lafforgue
43670714b9 Merge pull request #86 from mariovisic/hotfix/nested_snippets
Fix for issue #84 (Nested snippets)
2011-07-05 12:16:30 -07:00
did
6ce086520f include potatosalad's work about the menu_toggler 2011-07-05 21:03:10 +02:00
Didier Lafforgue
59a6e03da2 Merge pull request #81 from bewculture/master
Fixed JS bugs
2011-07-05 11:37:48 -07:00