Commit Graph

934 Commits

Author SHA1 Message Date
Kev Zettler
a342f7e6b1 added hooks and dependencies for tutorial flow 2011-07-06 22:35:15 -07: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
Kev Zettler
e78726caa4 merge Did master 2011-07-06 13:41:27 -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
did
bf99a36b58 tweak forms + fix minor js bug if no multi sites 2011-07-05 20:33:21 +02:00
did
01b0cde69b revert to the default site configuration (multi_sites disabled) 2011-07-05 18:41:14 +02:00
did
ca0921d2f3 tweak the css for firefox and safari 2011-07-05 18:32:21 +02:00
did
bd28f4c1ec new sites picker 2011-07-05 18:30:12 +02:00
did
71d7e86acd admin role was not correctly set when creating a new website 2011-07-05 11:56:24 +02:00
did
00fd00240f the error message was not displayed correctly during a wrong import + remove the last tracks of the deprecated asset collections 2011-07-04 23:11:35 +02:00
did
1e465e231e remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring 2011-07-04 19:40:14 +02:00
did
91f2f145b3 the BIG MERGE is now done 2011-07-04 15:43:05 +02:00
did
02186d7368 add the export link + fix the bugs for the export module + a little bit of refactoring 2011-07-04 15:25:02 +02:00
did
aad4b09ad7 first draft of the export module (not tested) 2011-07-04 03:22:04 -07:00
did
05331dee86 enable fullscreen editing with tinyMCE 2011-07-03 02:02:52 -07:00
did
7405b9343b new custom_field gem version to fix the duplicated fields bug 2011-07-03 02:07:46 +02:00
did
2cd44190ae add missing file in the repo 2011-07-02 05:20:03 -07:00
did
690b2f2b2e fix a bug when filling in the content type name 2011-07-02 04:48:21 -07:00
did
812965ad50 tweak the form UI (errors, input separator) + add more tests 2011-07-01 02:15:45 +02:00
did
e560c71ee5 refactor tests for contents 2011-06-30 12:41:20 +02:00
did
187de54962 more content type tests 2011-06-29 23:52:49 +02:00
did
c7ea5ab532 add more features for the model section 2011-06-29 14:00:26 +02:00
did
b2d6a7e001 new rspec-rails version (2.6.1) + clean the cucumber env.rb file 2011-06-29 03:10:20 +02:00
did
c8f0ad0bbe upgrade rake (0.9.2), cucumber-rails (1.0.2), capybara 2011-06-29 03:05:07 +02:00
did
c1f89f1cca fixing the heroku version: engine requires RMagick 2011-06-28 18:05:23 +02:00
did
322e617068 fixing the heroku version: engine requires cancan 2011-06-28 17:43:11 +02:00
did
8c1372afc6 fixing the heroku version 2011-06-28 17:35:25 +02:00
did
e304d5aa98 the account_spec failed randomly + remove useless puts 2011-06-28 15:50:37 +02:00
did
5e8eac53d4 refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave 2011-06-28 15:38:13 +02:00
did
2ad01833d8 icons for the theme_asset form + add tests (both rspec + features) for the roles 2011-06-27 08:27:07 -07:00
did
be6629d986 done with the roles (tests are coming) + better help messages for theme_assets and snippets 2011-06-26 16:02:48 -07:00
did
1be92e0db4 roles fully implemented for the page / content sections + uniformize drag n drop in the contents section + add the missing selected value for the has_one field 2011-06-25 17:01:11 -07:00
did
09171555a7 fix CSRF issues with tinymce and some ajax actions + begin to work on the roles feature powered by cancan (in progress, not stable) 2011-06-25 09:25:31 -07:00
did
33a29210ba forget to add a field to update the global seo title for a site + fix a tiny bug when destroying session + enhance hints on some form fields 2011-06-24 00:49:12 -07:00
did
c9f3989c2b group contents by category for the has_ony / has_many widgets 2011-06-23 16:17:08 -07:00