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 |
|
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 |
|