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 |
|
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 |
|
Dirk Kelly
|
974923b929
|
listed translation
|
2011-02-01 16:07:41 +08:00 |
|
Dirk Kelly
|
cc387a91f7
|
style updates
|
2011-02-01 16:07:31 +08:00 |
|
Dirk Kelly
|
b627b9bcb9
|
going for the positive, instead of the double negative (listed not unlisted)
|
2011-02-01 16:07:18 +08:00 |
|
Dirk Kelly
|
d672c0b946
|
moved content type above the templated option to avoid content jumps, added some translations
|
2011-02-01 15:08:56 +08:00 |
|
Dirk Kelly
|
3160f10ec5
|
javascript for the unlisted options show/hide
|
2011-02-01 15:08:26 +08:00 |
|
Dirk Kelly
|
db4d2af1bc
|
Added unlisted selector to page form
|
2011-02-01 14:50:32 +08:00 |
|
Dirk Kelly
|
2d3c0e974f
|
not showing unlisted pages in the nav
|
2011-02-01 14:43:07 +08:00 |
|
Dirk Kelly
|
36053733f7
|
gem updates
|
2011-02-01 14:39:25 +08:00 |
|
Dirk Kelly
|
6ba65b1b96
|
Added an unlisted flag
|
2011-02-01 14:39:20 +08:00 |
|
dinedine
|
02039159d7
|
add getter to the size of an asset collection in liquid
|
2011-01-30 00:30:24 +01:00 |
|
dinedine
|
da51dbc14e
|
more information in the logs when errors during the import + import asset collections without custom fields
|
2011-01-30 00:20:15 +01:00 |
|
dinedine
|
e896618c99
|
fix minor ui issue in the theme assets section
|
2011-01-29 17:24:37 +01:00 |
|
dinedine
|
a525e4ccd5
|
fixing bugs
|
2011-01-29 13:05:42 +01:00 |
|
dinedine
|
c9e1e3278b
|
forgot to update the gemspec file
|
2011-01-27 19:00:20 +01:00 |
|
dinedine
|
dbf5680770
|
wrong custom_fields version
|
2011-01-27 17:12:23 +01:00 |
|
dinedine
|
56059b6579
|
gems dependency with mongoid was messy
|
2011-01-27 15:34:33 +01:00 |
|
dinedine
|
92ec43b2e0
|
Gemfile updated
|
2011-01-27 15:01:03 +01:00 |
|
dinedine
|
a7dfe1152d
|
fix encoding issue in Ruby 1.9
|
2011-01-27 14:07:10 +01:00 |
|
dinedine
|
2e774b2a97
|
conflict between the index scope in the page model and the mongoid index method
|
2011-01-27 10:49:42 +01:00 |
|
dinedine
|
0eb8471c00
|
update the TODO list
|
2011-01-27 09:38:30 +01:00 |
|
dinedine
|
69c9dbbbcf
|
new Gemfile + fixing broken tests + improve the way we fetch the sicurrent te when serving fonts
|
2011-01-26 14:07:33 +01:00 |
|