Mario Visic
|
9a1a0f016f
|
Merge branch 'master' into rails_3_1
Conflicts:
app/models/content_type.rb
config/boot.rb
|
2011-12-15 22:29:07 +08:00 |
|
Robsteranium
|
82a61b1d2d
|
spec added to confirm content_type Date problem & patch. Also 1.8.7 compatibility with syck init.
|
2011-12-15 03:16:11 +00:00 |
|
Mario Visic
|
1c139af4e0
|
Small namespace fixes to specs.
|
2011-12-08 23:36:53 +08:00 |
|
Mario Visic
|
4e6fc04889
|
Use contents_custom_fields instead of content_custom_fields
|
2011-12-05 22:29:32 +08:00 |
|
Mario Visic
|
ad6273e2fd
|
Lots of spec fixes (mostly namespacing), down to 107 failing specs.
|
2011-11-26 17:24:34 +11:00 |
|
Mario Visic
|
2a5861e8a7
|
Specs now correctly use a multisite test app.
|
2011-11-25 23:59:44 +11:00 |
|
Mario Visic
|
06f4fc98e3
|
Fixed a bunch of model tests.
|
2011-11-25 00:37:17 +11:00 |
|
Mario Visic
|
40ef3e4fff
|
Fixed a couple of failing tests.
|
2011-11-22 00:08:18 +11:00 |
|
Mario Visic
|
e21a40c157
|
Some fixes for the content asset spec.
|
2011-11-20 22:52:20 +11:00 |
|
Mario Visic
|
75041ba21c
|
Specs now run for all models. The account model now passes GREEEEn.
|
2011-11-20 22:47:41 +11:00 |
|
Mario Visic
|
a7b66f0e25
|
Lots of fixes to get tets closer to working.
|
2011-11-20 21:59:12 +11:00 |
|
did
|
016d773b2d
|
fix issue #217 (memberships not correctly removed)
|
2011-09-28 18:27:29 +02:00 |
|
did
|
718b3c67bb
|
improve the with_scope tag based on the work on the editor
|
2011-09-27 00:25:47 +02:00 |
|
Mario Visic
|
03b6649742
|
Designers cannot set others to admins, fixes #197
|
2011-09-17 22:23:43 +08:00 |
|
Karl Brightman
|
75f4835d3e
|
Integrated next and previous methods for content in content types
|
2011-09-16 11:35:40 +08:00 |
|
did
|
bb48552b51
|
Ruby MRI 1.9.3 Compatability Fixes
|
2011-08-25 23:28:56 +02:00 |
|
did
|
e05586d387
|
write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook
|
2011-07-26 21:20:03 +02:00 |
|
did
|
bd28f4c1ec
|
new sites picker
|
2011-07-05 18:30:12 +02:00 |
|
did
|
e304d5aa98
|
the account_spec failed randomly + remove useless puts
|
2011-06-28 15:50:37 +02:00 |
|
did
|
5e8eac53d4
|
refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave
|
2011-06-28 15:38:13 +02:00 |
|
did
|
2ad01833d8
|
icons for the theme_asset form + add tests (both rspec + features) for the roles
|
2011-06-27 08:27:07 -07:00 |
|
did
|
3c0f7afec0
|
fix tests + rename and refactor the slugify method (now called permalink)
|
2011-06-21 13:03:24 -07:00 |
|
did
|
f4d9acd282
|
fix the tests + finish the integration of Dragonfly + clean code
|
2011-06-20 17:39:59 -07:00 |
|
did
|
8ad6ee580e
|
fix issue #78
|
2011-05-24 12:23:05 -07:00 |
|
AJ Schuster
|
f65cd0b2fc
|
Allows for page- and content instance-specific metadata.
Falls back to site metadata when not specified.
|
2011-04-29 16:10:13 -04:00 |
|
did
|
b58e49fce2
|
make locomotive work with bushido + refactor some portions of code (routing constraints, ...etc) + fix broken tests
|
2011-04-25 01:21:38 +02:00 |
|
did
|
551ef03ff6
|
simply the installation screens + fix all the broken tests + add tests for bushido
|
2011-04-05 02:18:17 +02:00 |
|
did
|
ae51a2d804
|
write specs for the ordered contents
|
2011-03-10 01:15:48 +01:00 |
|
did
|
7d5018eedc
|
fix broken tests
|
2011-03-05 01:51:44 +01:00 |
|
did
|
e6f5353245
|
add more tests
|
2011-02-27 11:33:49 +01:00 |
|
Mario Visic
|
26a2b7d2a7
|
Fixed a bug with snippets within blocks
|
2011-02-16 17:37:26 +08:00 |
|
did
|
94be90986d
|
merge Dirk's branch + upgrade a lot of gems (rails, ...etc)
|
2011-02-12 15:00:57 +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 |
|
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
|
6ba65b1b96
|
Added an unlisted flag
|
2011-02-01 14:39:20 +08: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 |
|
dinedine
|
6f2033a356
|
make the email notification more robust
|
2011-01-18 16:06:36 +01:00 |
|
dinedine
|
2fc99bf90a
|
rename translation files (convention) + email notification when adding contents (api)
|
2011-01-18 15:24:42 +01:00 |
|
dinedine
|
d5464aa782
|
add tests
|
2011-01-18 01:19:18 +01:00 |
|
Mario Visic
|
64eff89c97
|
Added a redirect page extension, integrated into the application and added new tests
|
2011-01-06 22:48:41 +08:00 |
|
dinedine
|
99b54d4d1b
|
fix bug with jammit-s3 and safari css hack + new version of aloha + bug with Heroku / Theme uploader without DJ + other minor things
|
2010-12-30 15:24:47 +01:00 |
|
dinedine
|
bbb09b58cf
|
ruby 1.9.2 compliant
|
2010-11-08 18:42:14 +01:00 |
|
dinedine
|
3863272ced
|
finish to merge + tweak minor stuff
|
2010-10-14 16:01:18 +02:00 |
|
dinedine
|
bab4577de0
|
fixing failed tests
|
2010-10-12 17:26:05 +02:00 |
|
dinedine
|
f7cfcf450e
|
now working with Rails 3.0 and the last Mongoid gem
|
2010-09-01 16:26:00 +02:00 |
|
dinedine
|
af5fe62d89
|
clean and improve the ui concerning the editable elements of a page + fix bugs and refactor a bit
|
2010-08-28 02:00:05 +02:00 |
|
dinedine
|
9d78a32340
|
completely get rid of old layouts + enhance snippets integration + refactor parsing page module
|
2010-08-22 00:48:24 +02:00 |
|
dinedine
|
e25ded881b
|
custom fields has its own repo + upgrade code for Mongoid beta 16 + clean code + fix rspec tests
|
2010-08-20 17:56:15 +02:00 |
|
dinedine
|
4f06dab51e
|
implement liquid inheritance (in progress)
|
2010-08-08 13:30:27 +02:00 |
|
Jacques Crocker
|
d872805101
|
Fix up the default body thing
|
2010-08-01 00:50:29 -07:00 |
|