Commit Graph

808 Commits

Author SHA1 Message Date
GarPit
09689a0cc9 initial ru translation 2011-08-12 15:32:37 +04:00
did
161878f57e add information to set up carrierwave for local filesystems 2011-08-11 14:47:12 -07:00
Didier Lafforgue
7a4253a7e4 Merge pull request #152 from frisoft/master
Bugfix: import and italian localization update.
2011-08-11 14:00:48 -07:00
did
67d7b13f4f Add the reverse has_many field feature (mainly based on pull request #142) 2011-08-11 13:45:46 -07:00
Andrea Frigido
37c50d27ff Bugfix: import site with empty editable file. 2011-08-03 08:58:47 +02:00
Andrea Frigido
3966c7bdae Italian localization update. 2011-08-01 16:21:15 +02:00
did
333934c022 Merge branch 'master' of github.com:locomotivecms/engine 2011-07-28 21:11:24 +02:00
did
040a51bc5f when used with devise_cas_authenticable, it does make sense to ask for a password in the new account creation page 2011-07-28 21:11:06 +02:00
Didier Lafforgue
49fee12ffe Merge pull request #151 from pollingj/master
Page slugs hyphens
2011-07-28 07:49:45 -07:00
did
a9b6c234e7 fix issue #150 2011-07-28 16:42:16 +02:00
Didier Lafforgue
92ec012472 Merge pull request #149 from corgibytes/content_type_names
Fixed issue with the way import was handling content_type name attributes
2011-07-28 06:09:23 -07:00
did
6d66275def merge pull request #148 2011-07-28 15:03:13 +02:00
did
08cac3b324 merging pull request #147 2011-07-28 13:54:24 +02:00
did
dbee233d0a add test for the issue #146 2011-07-28 13:51:59 +02:00
Didier Lafforgue
50b1c0e383 Merge pull request #147 from infospace/master
Possible fix for Issue #146
2011-07-28 04:46:40 -07:00
did
4c8272dfa0 seo information were not imported for contents 2011-07-28 11:53:36 +02:00
John Polling
7c8b973889 Slugs for pages were using underscores and not hyphens
I think this has been resolved before, but it seems to have reverted.
Hyphens are more of a standard in CMS'
2011-07-28 10:38:00 +01:00
M. Scott Ford
36914834a1 Switched from calling #update to #update_attributes!. 2011-07-28 01:21:28 -04:00
M. Scott Ford
8564055fd1 Modified the existing site context so that it does not reset the site. 2011-07-28 01:20:52 -04:00
M. Scott Ford
a532bb4c60 Fixed issues with the way import handled the content_type.name attribute. 2011-07-28 01:20:39 -04:00
M. Scott Ford
707973be16 Wrote a failing test to demonstrate issue with the way import handles the content_type.name attribute. 2011-07-28 01:19:51 -04:00
Didier Lafforgue
7e31d3ea76 Merge pull request #143 from Sharagoz/master
Cells gem not initialized in engine
2011-07-27 16:34:55 -07:00
Didier Lafforgue
243d0ac381 Merge pull request #141 from corgibytes/host_resolution
Prevent strange Capybara test failures because of missing entry in /etc/hosts
2011-07-27 16:29:41 -07:00
Tony C. Heupel
d810e0b9c4 Issue 146: Try to fix the issue with path querystring messing up slugs. 2011-07-27 15:59:21 -07:00
did
a1977085a3 new bushido gem 2011-07-28 00:41:32 +02:00
did
d51e74b341 Merge branch 'master' of github.com:locomotivecms/engine 2011-07-28 00:40:33 +02:00
did
8da0db2454 improve the solution for the issue #127 and write tests (pull request #139) 2011-07-28 00:39:59 +02:00
Sean Grove
2320aa6fb1 Bump to bushidogem 0.0.35 2011-07-27 10:59:32 -07:00
did
2c2c565aad Merge branch 'master' of github.com:locomotivecms/engine 2011-07-27 16:59:23 +02:00
Didier Lafforgue
e74f996c8c Merge pull request #139 from frisoft/master
Added fix for #127
2011-07-27 07:58:16 -07:00
Sharagoz
4f34610918 initialize Cells when used as an engine 2011-07-27 15:56:56 +02:00
did
b2ca79038b Merge branch 'master' of github.com:locomotivecms/engine 2011-07-27 02:29:49 +02:00
Sean Grove
2f2f410312 Bump the bushido gem version to 0.0.34 2011-07-26 17:26:49 -07:00
did
d4b2153c7b wrong flash message key for the import controller 2011-07-27 02:26:12 +02:00
did
8a58a0cad1 using the last bushido gem (0.0.31) 2011-07-26 23:36:36 +02:00
did
abbc151ed2 new factory_girl gem + fix the require pb with the devise_bushido_authenticatable gem 2011-07-26 23:11:43 +02:00
M. Scott Ford
3a21b7c29c Added test to make sure that test.example.com can be resolved through /etc/hosts. 2011-07-26 16:58:31 -04:00
did
747ba0d6fa disable console.log statements 2011-07-26 22:44:51 +02:00
did
b042a02ed4 Merge branch 'master' into cas 2011-07-26 22:41:44 +02:00
did
7f1c9282c7 disable console.log statements 2011-07-26 22:41:20 +02:00
did
616195fe8c Merge branch 'master' into cas 2011-07-26 22:30:19 +02:00
Kev Zettler
18ab1e09e6 added guard for missing subdomain tutorial 2011-07-26 13:27:21 -07:00
did
a1f0ffad98 Merge branch 'master' into cas 2011-07-26 22:10:13 +02:00
Kev Zettler
0473fdd7ea added guard for missing models error
'
2011-07-26 12:59:07 -07:00
did
d5111d2a4f fix a minor bug about the contents menu + new devise_bushido_authenticatable gem 2011-07-26 21:38:27 +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
Andrea Frigido
1dd432c2c8 Added fix for #127 2011-07-26 09:51:18 +02:00
Sean Grove
5e3a4ffa0f Set account.username for the cas lookup 2011-07-25 21:21:55 -07:00
Sean Grove
09343dd20a Event data structure tweak. 2011-07-25 20:39:09 -07:00
Sean Grove
93a852c705 Tweak with a local variable. 2011-07-25 20:13:21 -07:00