Commit Graph

621 Commits

Author SHA1 Message Date
Mario Visic
26a2b7d2a7 Fixed a bug with snippets within blocks 2011-02-16 17:37:26 +08:00
karlbright
9d11d9e019 Added theme_image_tag liquid tag to make it easy to insert theme image files 2011-02-15 15:33:52 +08:00
did
083debc516 add seo_metadata liquid tag (Mario) 2011-02-13 14:40:55 +01:00
did
3e5e5d5ba9 add seo_metadata liquid tag (Mario) 2011-02-13 14:40:49 +01:00
did
1aee2f4ce5 it prevented the use of rspec when locomotive was using as an engine 2011-02-13 01:12:27 +01:00
did
59618d4f66 when importing theme, force the position of a page as an integer 2011-02-13 00:01:42 +01:00
did
886d67b2a3 wrong Gemfile + define default task rake (rspec + cucumber) 2011-02-12 20:22:11 +01:00
did
e9a6dda6e6 new contributor: Raphael Costa 2011-02-12 18:37:31 +01:00
did
16090a0f75 fix the mess with git and Aloha 2011-02-12 18:21:10 +01:00
did
af5ec86c57 merging 2011-02-12 18:13:06 +01:00
did
ff14f6f64f new version of Aloha-Editor 2011-02-12 16:25:52 +01:00
did
138be23492 weird git behaviour 2011-02-12 16:22:47 +01:00
did
2827834e19 new Aloha version 2011-02-12 16:19:56 +01:00
did
97ff5f07c1 cleaning 2011-02-12 16:19:22 +01:00
did
44a7c33f9f preserve positions of the index and 404 page 2011-02-12 15:32:35 +01:00
did
94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) 2011-02-12 15:00:57 +01:00
Raphael Costa
f281934832 fix in portuguese translations 2011-02-12 01:50:47 -02:00
Raphael Costa
eaab196d06 Brazilian Portuguese Translations 2011-02-11 23:44:35 -02:00
Raphael Costa
d97c8b8525 Brazillian Portuguese Translation (5) 2011-02-10 01:23:28 -02:00
Raphael Costa
c5e9f05ee9 Brazillian Portuguese Translation (5) 2011-02-10 01:12:50 -02:00
Raphael Costa
858ada2f28 Brazillian Portuguese Translation (5) 2011-02-10 01:10:10 -02:00
Raphael Costa
caeac4791b Brazillian Portuguese Translation (4) 2011-02-10 01:07:58 -02:00
Raphael Costa
5f58a6e1cb Brazillian Portuguese Translation (3) 2011-02-10 01:00:50 -02:00
Raphael Costa
742305cdfb Brazillian Portuguese Translation (2) 2011-02-09 23:36:55 -02:00
Raphael Costa
53af21a9f8 Merge branch 'master' of github.com:raphaelcosta/engine
Conflicts:
	config/locales/devise.pt-BR.yml
	config/locales/flash.pt-BR.yml
	config/locales/formtastic.pt-BR.yml
2011-02-09 23:34:16 -02:00
Raphael Costa
7998e3a841 Brazillian Portuguese Translation 2011-02-09 23:29:20 -02:00
Raphael Costa
ab97b9e6bc Brazillian Portuguese Translation 2011-02-09 18:56:31 -02:00
dinedine
0dbc726169 add Dirk and Mario to the team :-) 2011-02-04 15:51:47 +01:00
dinedine
0be4c93924 import theme from the rails console is now possible 2011-02-04 15:43:43 +01:00
dinedine
6ac4ff0393 revert a piece of the theme assets refactoring + upgrade Gemfile as well as the gemspec 2011-02-04 11:18:34 +01:00
dinedine
c178346969 fix the creation of theme assets (and add tests of course) + upgrade Gemfile + remove the mongoid patches 2011-02-04 10:39:23 +01:00
Keith Pitt
124bacba6b Let bundler decide the best version to use 2011-02-04 16:29:12 +08:00
Keith Pitt
a6872b60ef Upgrade fog 2011-02-04 16:26:52 +08:00
Keith Pitt
e3f40558a0 Provide the error message aswell 2011-02-04 16:21:50 +08:00
Keith Pitt
da3bd6cef2 Include error backtrace in output 2011-02-04 15:57:26 +08:00
Keith Pitt
713d30bdb6 Hacked the admin images controller to work 2011-02-04 15:44:42 +08:00
Keith Pitt
cad4471995 Use an old version of fog that carrierwave supports 2011-02-04 14:41:51 +08:00
Keith Pitt
8f73d214ad Don't require delayed_job_mongoid in gemspec 2011-02-04 14:39:46 +08:00
Keith Pitt
d9396cc9ef Downgraded delayed job to use a version that supports mongoid 2.0.0.beta19 2011-02-04 14:35:09 +08:00
dinedine
2402ef2cd4 positions for the index and not found pages were messed up when importing site 2011-02-03 11:22:19 +01:00
Dirk Kelly
8a42e3441b Merge branch 'create_content' into nav-depth 2011-02-03 07:44:43 +08:00
Dirk Kelly
775b6b973d Fixes an issue where custom couldn't would not be created (returning title is blank when it isn't) 2011-02-03 07:43:04 +08:00
Dirk Kelly
c11c18c445 Fixes issue where custom content wouldn't get created. 2011-02-03 07:40:06 +08:00
Dirk Kelly
54b6b9bd13 Merge branch 'master' of github.com:locomotivecms/engine 2011-02-03 07:14:41 +08:00
Dirk Kelly
7d30d00ec4 minimal attributes to include listed 2011-02-01 17:05:36 +08:00
Dirk Kelly
1c91bfb673 returning the height 2011-02-01 16:30:20 +08:00
Dirk Kelly
2b438966f5 including the listed module 2011-02-01 16:17:12 +08:00
Dirk Kelly
9a1f45de36 including the styles to keep the slug and content types the same height 2011-02-01 16:17:05 +08:00
Dirk Kelly
47e6691e3c hide the listed option on a template 2011-02-01 16:08:06 +08:00
Dirk Kelly
7bce392e56 moved to the listed methods in the nav 2011-02-01 16:07:56 +08:00