Commit Graph

1388 Commits

Author SHA1 Message Date
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
PitOn
db5cb0950d devise.ru.tml finished 2011-08-30 00:03:47 +04:00
PitOn
a1d976ace1 default.ru.yml finished 2011-08-29 23:52:42 +04:00
PitOn
a46019da40 admin_ui.ru.yml finished 2011-08-29 23:48:33 +04:00
Arjen Oosterkamp
a78bcdaf38 Added .htc file content type to white list
Added .htc file content type javascripts folder
2011-08-29 10:46:31 +02:00
Alex Sanford
988323b1d0 Extracted DOM option creation into function to apply IE workaround 2011-08-28 22:37:16 -03:00
Mario Visic
ff901ca3d3 Merge branch 'feature/unauthorized_admin_login' 2011-08-28 01:15:25 +08:00
Mario Visic
cd464e604c Logging in as an account without membership no longer infinetly redirects. 2011-08-28 01:14:02 +08:00
Mario Visic
63c30bc135 Added a failing cucumber scenario for logging in without a membership to the site. 2011-08-27 13:28:51 +08:00
M. Scott Ford
d49453dfc8 Adjusted the interaction with the media dialog. 2011-08-27 01:15:07 -04:00
PitOn
ef75d4acef devise transaltions 2011-08-27 06:33:33 +04:00
PitOn
d9dafd2222 default.yml translations 2011-08-27 06:27:14 +04:00
PitOn
e8bea2844b more translations 2011-08-27 00:45:25 +04:00
did
265525c1a7 fix issue #175 + the liquid template of content types (back-office) were broken 2011-08-26 00:30:34 +02:00
did
bb48552b51 Ruby MRI 1.9.3 Compatability Fixes 2011-08-25 23:28:56 +02:00
did
aa5c5f0092 tweak the spec_helper.rb file (see issue #157) 2011-08-25 22:15:23 +02:00
Didier Lafforgue
201063aae0 Merge pull request #180 from mariovisic/cache_double_render_error
Issue #176 Fix: Do not render twice for cached pages.
2011-08-25 12:56:17 -07:00
did
71a592eec1 fix issue #177 2011-08-25 18:27:43 +02:00
Mario Visic
fdf55aee88 Do not render twice for cached pages. 2011-08-25 22:11:57 +08:00
did
c990a89e57 db/seeds.rb is not needed anymore 2011-08-25 15:33:06 +02:00
did
01f6a0aad5 fix issue #171 2011-08-25 15:32:00 +02:00
did
7a9caabc41 new custom_fields gem version (beta 24) 2011-08-25 15:15:42 +02:00
did
d0566f917e fix issue #179 2011-08-25 14:58:49 +02:00
did
aff1d23d90 Merge branch 'master' of github.com:locomotivecms/engine 2011-08-24 15:16:33 +02:00
Didier Lafforgue
e111e2c1f9 Merge pull request #174 from mariovisic/hide_unauthorized_links
Links are incorrectly shown to actions accounts cannot access.
2011-08-22 15:55:41 -07:00
Didier Lafforgue
f140fcc260 Merge pull request #172 from colibri-software/tablerow_fix
Fixed issue with tablerow tag
2011-08-22 15:48:42 -07:00
Mario Visic
22445856ec The add account link is now hidden unless admins have permission. 2011-08-20 17:41:00 +08:00
Mario Visic
8a5241f265 Updated a scenario to fail. 2011-08-20 17:37:58 +08:00
Mario Visic
a7bc648333 Implemented the site ability fix for designers. 2011-08-20 17:33:13 +08:00
Mario Visic
5c3cf83082 Added a failing scenario for the new site button when the account is a designer. 2011-08-20 17:31:16 +08:00
Mario Visic
24c9752018 Implemenation for hiding the destroy asset button. 2011-08-20 17:13:06 +08:00
Mario Visic
0ed6c21f10 Added a failing cucumber test for viewing the delete asset button as an author. 2011-08-20 17:08:37 +08:00
Alex Sanford
88fd17a5aa Fixed issue with tablerow tag 2011-08-19 10:10:26 -03:00