Commit Graph

635 Commits

Author SHA1 Message Date
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
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
did
86c1342dcd remove useless lines in Gemfile 2011-06-05 14:37:49 +02: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
did
abcf4f684a help to create public form with has_one field 2011-06-03 02:25:19 +02:00
did
a5bf4664f2 [bushido] pass the metrics token to bushido.js 2011-06-01 23:47:06 +02:00
did
91119bf54e allow administrators to change the text displayed for each content in the back-office (documentation is coming) 2011-06-01 23:43:12 +02:00
did
4618b35318 cache-busting asset id for bushido.js + new bushido config var (app_name) 2011-06-01 21:09:09 +02:00
did
4518cfda1f Merge branch 'master' of github.com:locomotivecms/engine 2011-06-01 20:18:48 +02:00
did
6d208553af cleaning submodules 2011-06-01 20:18:41 +02:00
Didier Lafforgue
ddce344e73 Merge pull request #75 from potatosalad/28a4ec4ac2f8d493af130d13a28432d6249f4cfd
Aloha Editor submodule references removal
2011-05-31 15:41:59 -07:00
Didier Lafforgue
372941ad89 Merge pull request #85 from Bushido/bushido
Bushido integration
2011-05-31 15:06:09 -07:00
Sean Grove
d557af74ea Typo 2011-05-30 14:32:34 -07:00
Sean Grove
6834e6db85 Tweaks to match the Bushido Events api 2011-05-30 14:17:42 -07:00
did
293557a245 fix a problem with bushido_app_claimed? if the variable value is an empty string 2011-05-29 15:36:14 -07:00
did
dfb4ed48bc refactor bushido message to event 2011-05-29 15:25:36 -07:00
did
90ab471e43 modify start page to go directly to the pages section 2011-05-29 15:19:36 -07:00
did
20fd07409b bushido stub gem 2011-05-29 14:47:18 -07:00
did
36e5d6d55d Launch user into backoffice on first deploy 2011-05-29 13:32:31 -07:00
did
eb56779370 replace theme by template (better wording) 2011-05-28 20:00:10 -07:00
did
61886ec1b1 installation procedure allows to install the default site template if provided 2011-05-28 19:45:29 -07:00
did
c6b272f9f9 disable authentication if the app has not been claimed yet 2011-05-28 10:52:36 -07:00
did
b467ecbeef display the bushido bar on every page 2011-05-27 16:24:11 -07:00
did
d5f5707e42 change the URL to the bushido js file 2011-05-27 15:39:48 -07:00
did
1731536649 new bushido gem 2011-05-27 15:23:42 -07:00
did
c68817c8c7 comment references to the bushido stub gem 2011-05-27 15:16:59 -07:00
did
ef7ac0e721 make the bushido installation process the smoothest 2011-05-27 15:14:45 -07:00
did
47ffafca20 font files were not correctly served with Locomotive running in single-site 2011-05-27 08:25:40 -07:00
did
2ce1fadf52 simplify the installation procedure for bushido users 2011-05-27 08:19:20 -07:00
Didier Lafforgue
164be33e06 Merge pull request #83 from frisoft/master
Enhance italian translation
2011-05-24 16:22:24 -07:00
Didier Lafforgue
408de3dc85 Merge pull request #80 from mariovisic/hotfix/import_content_type_date
Fix: Content type fields import does not support dates in yaml
2011-05-24 15:39:31 -07:00
did
8ad6ee580e fix issue #78 2011-05-24 12:23:05 -07:00
Andrea Frigido
35d5e7d44e Merge remote-tracking branch 'upstream/master' 2011-05-23 09:07:35 +02:00
Andrea Frigido
149d102c82 enhance italian translation. 2011-05-23 09:05:01 +02:00
did
8f36f5a2d8 solve a bug on has_ony / has_many caused by the caching mechanism 2011-05-21 01:02:03 +02:00
did
7f9a62b0f4 correct name of Bernd's company 2011-05-20 16:04:09 +02:00
did
152fc83d95 README: change version of components + add a support section 2011-05-20 15:43:47 +02:00
did
4cd771aca5 Gemfile.lock updated 2011-05-20 15:36:34 +02:00
did
e8cdfc4794 new version of custom fields + display error messages for has_one and has_many field types 2011-05-20 15:27:07 +02:00