John Bintz
|
60cb10c4ca
|
tweak
|
2012-06-20 15:18:49 -04:00 |
|
John Bintz
|
07e37d0521
|
mounted_on uses url_for
|
2012-06-20 10:38:06 -04:00 |
|
John Bintz
|
07f868594a
|
basic suport for subdirectories
|
2012-06-20 10:28:10 -04:00 |
|
Didier Lafforgue
|
fbcda9cdd6
|
simply re-organize little piece of code (cleaning stuff)
|
2012-06-10 01:31:10 +02:00 |
|
Didier Lafforgue
|
6350652e4b
|
Merge pull request #437 from paulsponagl/devise_2_1
Upgrade to devise 2.1
|
2012-06-09 15:52:05 -07:00 |
|
Paul Sponagl
|
a6ba124a9e
|
need to require devise-encryptable
|
2012-06-09 09:54:58 +02:00 |
|
Paul Sponagl
|
702283322d
|
Upgrade to devise 2.1
rspec and cucumber tests working
untest within a real app
|
2012-06-08 12:52:00 +02:00 |
|
Didier Lafforgue
|
ef66f88f5a
|
forgot to update Gemfile.lock
|
2012-06-08 11:06:17 +02:00 |
|
Didier Lafforgue
|
bae2fe4432
|
releasing new version: 2.0.0.rc8
|
2012-06-08 11:04:23 +02:00 |
|
Didier Lafforgue
|
50204b6556
|
dependency conflict with carrierwave and custom_fields (fixed)
|
2012-06-08 10:57:09 +02:00 |
|
did
|
11c4f98efc
|
asset picker was not accessible from the Aloha toolbar (fixed now)
|
2012-06-06 01:34:37 -07:00 |
|
did
|
55b7d4dbf2
|
status of a redirect page is now 301 (previously 302)
|
2012-06-05 09:32:10 -07:00 |
|
Didier Lafforgue
|
2bd9e254c8
|
rails 3.2.5 + remove warnings + fix broken features + enhance upgrade script
|
2012-06-04 23:23:03 +02:00 |
|
did
|
3f1380408e
|
fix issue #427 + make the content types API features more predictable
|
2012-06-04 08:26:10 -07:00 |
|
Didier Lafforgue
|
5f9c46b42c
|
Merge pull request #419 from colibri-software/api_auth
API auth
|
2012-06-02 10:02:23 -07:00 |
|
Didier Lafforgue
|
b4dd590f9a
|
Merge pull request #432 from colibri-software/fix_page_drop
Fixed issue with page drop slug on templatized pages
|
2012-06-02 09:47:08 -07:00 |
|
Didier Lafforgue
|
34ba62c15c
|
Merge pull request #431 from klaffenboeck/master
updated german locale with proper encoding (UTF-8)
|
2012-06-02 09:36:35 -07:00 |
|
did
|
acd46f1c10
|
fix issue #430
|
2012-06-02 06:54:16 -07:00 |
|
Manfred Klaffenboeck
|
30557ef8b0
|
updated german locale with propper encoding (UTF-8)
|
2012-06-01 19:36:33 +02:00 |
|
Alex Sanford
|
6f5eec18c6
|
Fixed issue with page drop slug on templatized pages
|
2012-06-01 14:28:10 -03:00 |
|
Didier Lafforgue
|
bc63cd8acf
|
Merge pull request #429 from klaffenboeck/master
Updated german locale
|
2012-06-01 01:12:23 -07:00 |
|
Manfred Klaffenboeck
|
b993b4f0ca
|
Updated german locale
|
2012-05-31 21:14:46 +02:00 |
|
Manfred Klaffenboeck
|
590c4bb048
|
added translation for de.locomotive.messages.sending_form
|
2012-05-31 20:42:42 +02:00 |
|
did
|
2bec96e9f1
|
add a default message for the locomotive.messages.sending_form translation key (fix issue #428)
|
2012-05-31 10:03:57 -07:00 |
|
did
|
2568510f01
|
fix issue #426
|
2012-05-31 09:41:37 -07:00 |
|
did
|
f8725ede67
|
fix issue #414
|
2012-05-31 01:41:19 -07:00 |
|
did
|
f4ee99b72b
|
fix issue #425
|
2012-05-30 15:41:11 -07:00 |
|
did
|
763fe5215f
|
fix issue #407 (ie: boolean fields take the false value by default)
|
2012-05-30 15:30:42 -07:00 |
|
did
|
261575eb94
|
a little bit of cleaning for the upgrade scripts
|
2012-05-29 16:24:28 -07:00 |
|
Didier Lafforgue
|
b706d50bdf
|
Merge pull request #424 from Sharagoz/master
Update Norwegian locale for v2.0
|
2012-05-29 16:21:54 -07:00 |
|
did
|
3a4654e8f7
|
the upgrade script v1.1 did not work correctly + fix issue #403 (more generally, enhance the way jQuery modals were used within the back-office) + select the first inverse_of value of a has_many field (UI)
|
2012-05-29 15:53:48 -07:00 |
|
Bjørn Trondsen
|
a662366637
|
bug in prev commit
|
2012-05-29 22:34:38 +02:00 |
|
Bjørn Trondsen
|
6ac3d72aed
|
rename norwegian locale when upgrading
|
2012-05-29 22:13:41 +02:00 |
|
Bjørn Trondsen
|
8b56ee5889
|
update norwegian locale
|
2012-05-29 21:17:17 +02:00 |
|
Didier Lafforgue
|
b751e3d990
|
trying to fix the big problem with jQuery UI modals (if modals have the same z-index, it causes weird behaviours) (WIP)
|
2012-05-29 01:26:51 +02:00 |
|
Didier Lafforgue
|
ae16661286
|
trying to fix cucumber tests
|
2012-05-26 15:21:47 +02:00 |
|
Didier Lafforgue
|
da2d689bdc
|
fix issue #412
|
2012-05-26 14:35:04 +02:00 |
|
Didier Lafforgue
|
2ac74c9a50
|
fix issue #411
|
2012-05-25 13:24:10 +02:00 |
|
Didier Lafforgue
|
24ae75c6f5
|
Gemfile.lock gets updated
|
2012-05-24 23:37:48 +02:00 |
|
Didier Lafforgue
|
c58075b7c3
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2012-05-24 19:19:57 +02:00 |
|
Didier Lafforgue
|
662e359acb
|
fix issue #393
|
2012-05-24 19:19:46 +02:00 |
|
Mario Visic
|
8be23f1cc2
|
Updated the readme a tad with PhantomJS info.
|
2012-05-25 00:23:13 +08:00 |
|
Mario Visic
|
fbef06f103
|
Merge branch 'poltergeist'
|
2012-05-25 00:16:33 +08:00 |
|
Mario Visic
|
38098e93da
|
Updated the doco to instruct users to install PhantomJS for testing.
|
2012-05-25 00:16:25 +08:00 |
|
Mario Visic
|
3a27845fe5
|
Small fix for poltergeist.
|
2012-05-25 00:13:55 +08:00 |
|
Mario Visic
|
4c5d6c92d0
|
Added poltergeist and a small JS fix.
|
2012-05-25 00:06:07 +08:00 |
|
Mario Visic
|
817ee8b0e5
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2012-05-24 23:13:56 +08:00 |
|
Mario Visic
|
13b4d8c606
|
Do not pass the host option to URL helpers for sitemaps. Fixes #415.
|
2012-05-24 23:13:25 +08:00 |
|
did
|
6342b94ede
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2012-05-24 06:47:15 -07:00 |
|
did
|
d3e219018b
|
fix issue #388
|
2012-05-24 06:46:48 -07:00 |
|