Commit Graph

1354 Commits

Author SHA1 Message Date
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
Kev Zettler
2bc79b2703 added metrics token 2011-06-03 21:40:52 -07:00
Kev Zettler
308fcd665a re added mixpanel stuff 2011-06-03 21:27:19 -07:00
Kev Zettler
c39115f5ae removed one off mixpanel stuff 2011-06-03 17:01:54 -07:00
Kev Zettler
891db0d7cc added mixpanel.js and updated th emiddle ware to include it 2011-06-03 15:05:55 -07:00
did
abcf4f684a help to create public form with has_one field 2011-06-03 02:25:19 +02:00
Mario Visic
8c62ec4dba Small refactoring on the snippet tag constructor. 2011-06-02 22:34:06 +08:00
Mario Visic
19a07910f7 Added a feature to creating snippets. 2011-06-02 22:01:25 +08:00
Mario Visic
8575af8b33 Small fix on the admin snippets feature. 2011-06-02 21:58:17 +08:00
Mario Visic
684b1ddf5c Nested snippets now update correctly, fixes #84 2011-06-02 21:56:05 +08:00
Mario Visic
c07dbb3f98 Cleaned up the snippet feature. 2011-06-02 21:36:03 +08:00
Mario Visic
60c48f4f2e Added a failing feature for updating a snippet 2011-06-02 21:15:11 +08: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
Andrea Frigido
cf246268e7 Merge remote-tracking branch 'upstream/master' 2011-06-01 18:34:28 +02:00
Andrea Frigido
db23a06c3f 2011-06-01 18:34:20 +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