Commit Graph

989 Commits

Author SHA1 Message Date
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
did
c9bc8c8222 update gem versions 2011-06-23 23:22:17 +02:00
did
1d1889d155 new bushido gem version 2011-06-23 23:17:36 +02:00
did
2cc07b3957 fix a little typo in the locales 2011-06-23 07:44:14 -07:00
did
eb37cdcf36 fix broken tests + update gemspec / readme 2011-06-23 07:27:03 -07:00
did
587d383ac5 tweak ui: form, quick link to edit a model in the popup menu 2011-06-23 07:10:17 -07:00
did
fa7e4c24d8 implement feature #57 2011-06-23 05:57:52 -07:00
did
d4b7734003 fix issue #90 2011-06-23 01:14:36 -07:00
did
d31f1f959a fix issue #91 2011-06-22 15:57:24 -07:00
did
40530de8bb remove trailing slash and redirect (SEO) 2011-06-22 08:53:29 -07:00
did
a5cd2290ea reflect changes from the bushi.do platform 2011-06-21 15:03:23 -07:00
did
4d29500483 new version of custom_fields + allow users to change the permalink of the custom model instances 2011-06-21 14:53:21 -07:00
did
3c0f7afec0 fix tests + rename and refactor the slugify method (now called permalink) 2011-06-21 13:03:24 -07:00
did
be02539695 do not include the bushido chat js, just declare a variable instead 2011-06-21 20:38:03 +02:00
did
0631b96df9 clean code + fix a tiny weird js behaviour when picking up a theme asset 2011-06-21 06:40:01 -07:00
did
3c31c8dbcf remove all the references to asset_collections 2011-06-21 06:12:20 -07:00
did
a0293b161b add a new plugin in tinymce to upload any kind of files (Bernd) 2011-06-21 05:47:11 -07:00
did
6ed9788d50 clean Gemfile 2011-06-21 03:41:32 +02:00
did
b00c84019c new gems + rspec in colour 2011-06-20 18:40:18 -07:00
did
f4d9acd282 fix the tests + finish the integration of Dragonfly + clean code 2011-06-20 17:39:59 -07:00
did
57ba3ba273 get rid of the yellow banner in production 2011-06-21 01:27:13 +02:00
Kev Zettler
41b26848ee Merge branch 'master' of https://github.com/locomotivecms/engine 2011-06-20 14:10:56 -07:00
did
87e7ced3c1 integrate dragonfly + clean code + fix a js bug when editing a custom field 2011-06-20 12:05:12 -07:00
did
ecdb79bb2d removing asset_collections: script + remove references in liquid 2011-06-20 04:25:17 -07:00
did
58ab954ec1 new task to migrate asset collections to content types 2011-06-18 01:31:43 -07:00
did
21ccbb635b removing asset collections 2011-06-17 14:32:54 -07:00
did
be055e51bc new custom_fields version 2011-06-17 01:55:27 +02:00
did
0878a39858 saving with the inline editor toolbar did not work (fixed) 2011-06-16 05:07:28 -07:00
did
afe07d4976 update gemspec with the last version of locomotive carrierwave 2011-06-12 16:38:11 +02:00
did
6b2f067cb3 remove commented lines 2011-06-12 16:31:27 +02:00
did
adfcbb6658 fix conflict issue with the new linecache gem + clean carrierwave local patch 2011-06-12 16:29:59 +02:00
did
de217b74b7 use default rails logger during the first template import + remove some carrierwave method patches now useless with the new version of the gem 2011-06-11 01:18:34 +02:00
did
cd428e467c back to the sha1 encryptor to be compliant with old accounts 2011-06-11 00:24:10 +02:00
did
f1d8e7c141 clean everything before merging it to the master branch 2011-06-10 01:04:13 +02:00
Kev Zettler
ecbb517215 removed embbed mixpanel stuff 2011-06-08 11:20:04 -07:00
did
5bf6d46574 done for production tests (installation from source) 2011-06-08 17:53:53 +02:00
did
2d060dd2d9 forgot to add an file 2011-06-08 16:34:37 +02:00
did
49080b737d testing out the lastest gems for rails / carrierwave / ...etc 2011-06-08 16:33:33 +02:00
did
fdfa36838b Gemfile.lock updated 2011-06-08 10:57:01 +02:00
Andrea Frigido
9e512485dd page-toolbar css fix (inline_editor) and italian localization fix. 2011-06-06 13:55:24 +02:00
Andrea Frigido
950e59abdc Merge remote-tracking branch 'upstream/master' 2011-06-06 09:27:35 +02:00
did
86c1342dcd remove useless lines in Gemfile 2011-06-05 14:37:49 +02:00
Sean Grove
d954b75285 bump bushido version 2011-06-04 22:18:14 -07:00
Sean Grove
3678c7f49c Merge branch 'master' of https://github.com/locomotivecms/engine 2011-06-04 22:15:57 -07:00
did
f9decc0890 switching over mongoid 2.0.2 + fix bug when displaying content labels in the back-office 2011-06-04 17:35:22 +02:00
Kev Zettler
40dfa83fad expanded the hooks 2011-06-03 22:30:09 -07:00