Commit Graph

1020 Commits

Author SHA1 Message Date
Mario Visic 4d19117351 Print cucumber backtraces for travis on failure. 2011-10-17 23:53:21 +08:00
Mario Visic 70dacfcef2 Set the hostname on travis. 2011-10-17 23:47:51 +08:00
Mario Visic 6b9ccf3854 Updated travis config. 2011-10-17 23:37:33 +08:00
Mario Visic 930a67429d Added a travis CI config. 2011-10-17 22:55:09 +08:00
Mario Visic dd118a7147 Only use autotest with MRI (doesnt work on rbx). 2011-10-16 13:21:12 +08:00
Sharagoz 35e2fd2d57 Merge branch 'master' of git://github.com/locomotivecms/engine 2011-10-08 21:17:03 +02:00
Sharagoz f864980685 norwegian JS translations 2011-10-08 21:09:08 +02:00
Rytis Lukoševičius 6b9d2317da adding .published? and .listed? methods for the liquid Page drop class 2011-10-04 04:35:40 +03:00
Mario Visic 85cabafe67 Merge pull request #218 from corgibytes/ensure_rails_3_0
Rails 3.1 is getting used as a dependency when installing as a gem
2011-10-01 08:52:01 -07:00
did 016d773b2d fix issue #217 (memberships not correctly removed) 2011-09-28 18:27:29 +02:00
did 544e9e5c3c fix issue #225 (bson_ext version) 2011-09-28 11:57:48 +02:00
did 718b3c67bb improve the with_scope tag based on the work on the editor 2011-09-27 00:25:47 +02:00
M. Scott Ford c18dfa035e Prevent rails 3.1 from getting pulled in as a dependency. 2011-09-25 21:03:50 -04:00
did ce24270948 fix issue #193 2011-09-22 01:38:23 +02:00
Sharagoz a843f16be0 norwegian locale 2011-09-19 17:43:23 +02:00
Sharagoz 2b474626b6 add crack to gemspec 2011-09-19 16:28:21 +02:00
Sharagoz ffc7057669 "no" locale added to config options 2011-09-19 16:15:25 +02:00
Sharagoz cb43a878c8 add crack to gemfile 2011-09-19 16:10:29 +02:00
Sharagoz c6ab499664 added norwegian locale 2011-09-19 15:48:43 +02:00
Mario Visic aa21cea13b Typo in the current site feature. 2011-09-17 22:31:50 +08:00
Mario Visic 03b6649742 Designers cannot set others to admins, fixes #197 2011-09-17 22:23:43 +08:00
Mario Visic 4c55401728 Merge pull request #209 from GarPit/master
Liquid syntax mistake
2011-09-16 19:02:03 -07:00
PitOn 6945bed820 liquid syntax translated mistake 2011-09-16 11:23:03 +04:00
Mario Visic ca2ad98cd0 Merge pull request #208 from karlbright/next_previous_content
Provide next and previous methods for content
2011-09-15 21:04:22 -07:00
Karl Brightman 93667018c1 Updated with hashrocket 2011-09-16 11:55:30 +08:00
Karl Brightman 769b0569db Added examples 2011-09-16 11:37:48 +08:00
Karl Brightman 75f4835d3e Integrated next and previous methods for content in content types 2011-09-16 11:35:40 +08:00
did 13b82e66fe fix httparty version to 0.7.8 2011-09-15 16:59:14 +02:00
did 8dfefe5094 fix issue #201 2011-09-14 11:32:14 +02:00
Mario Visic efc843c2d9 Merge branch 'feature/frontend_edit_authentication' 2011-09-04 01:15:52 +08:00
Mario Visic 8dbd51734a Visiting /edit when not authenticated now sends users to the login page. 2011-09-04 01:15:43 +08:00
Mario Visic 82b763c1bf Added a failing cucumber scenario for frontend editing auth. 2011-09-04 01:08:39 +08:00
Mario Visic 1b86150042 Merge branch 'feature/aloha_integration_tests' 2011-09-03 22:38:16 +08:00
Mario Visic 3113fbc9f0 Completed the cucumbet feature for the front end inline editor. 2011-09-03 22:37:08 +08:00
Mario Visic d586d0eff4 Added an incomplete test for the front end inline editor. 2011-09-01 20:30:59 +08:00
Mario Visic eb2d25e2f9 Ruby 1.9 require the correct debug. 2011-09-01 19:28:46 +08:00
Mario Visic f6609a699b Removed an old cucumber scenario. 2011-09-01 18:51:09 +08:00
Mario Visic aa6eb1ea9d Removed a duplicate step. 2011-09-01 18:45:30 +08:00
Didier Lafforgue f81d3a698f Merge pull request #190 from corgibytes/media_dialog_fixes
Adjusted the interaction with the media dialog.
2011-08-31 14:53:16 -07:00
did 6a2f0f17dd complete the Russian version of the engine (#188): add the Russian flag + translate the Russian word in all the other locales 2011-08-31 23:43:52 +02:00
Didier Lafforgue 4a82935b46 Merge pull request #188 from GarPit/master
Russian translation
2011-08-31 14:21:47 -07:00
did c84a571afc new gems for rails and custom_fields (it fixes a bug with the has_many custom field) 2011-08-31 23:14:30 +02:00
Didier Lafforgue 761a64b130 Merge pull request #185 from themgt/patch-1
should sort by Page#depth so slug parts are in the right order
2011-08-30 15:11:46 -07:00
Didier Lafforgue d121a56efc Merge pull request #184 from colibri-software/ie_fix_options
IE workaround for some broken select boxes
2011-08-30 15:06:02 -07:00
did cd5f3b9712 a couple of Dutch translation keys were missing (issue #181) 2011-08-30 23:39:45 +02:00
did dea0b67fe1 fix another bug related to the issue #179 2011-08-30 23:13:34 +02:00
Mario Visic c83c6828a9 Merge pull request #186 from Arjeno/allow_htc_file_content_type
Added .htc file content type to white list
2011-08-30 06:39:04 -07:00
Paul acd731347c should sort by Page#depth so slug parts are in the right order 2011-08-29 16:17:18 +03:00
GarPit 1e5e151be6 russian translation 2011-08-29 16:54:21 +04:00
PitOn 367b0aab4f formtastic.ru.yml finished 2011-08-30 00:35:56 +04:00