github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,454 Commits 13 Branches 7 Tags 15 MiB
Commit Graph

590 Commits

Author SHA1 Message Date
Didier Lafforgue fbcda9cdd6 simply re-organize little piece of code (cleaning stuff) 2012-06-10 01:31:10 +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
did 11c4f98efc asset picker was not accessible from the Aloha toolbar (fixed now) 2012-06-06 01:34:37 -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
did acd46f1c10 fix issue #430 2012-06-02 06:54:16 -07:00
did f8725ede67 fix issue #414 2012-05-31 01:41:19 -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 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 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 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
Mario Visic 415817e20b Merge pull request #409 from waynegerard/label_field_name 
Added a setter method for label_field_id in content_types.rb model
 2012-05-24 03:35:30 -07:00
did 04d9fe17f8 Merge branch 'master' of github.com:locomotivecms/engine 2012-05-23 15:03:37 -07:00
did d90123e321 public forms are now protected from csrf attacks (see issue #382 2012-05-23 15:03:21 -07:00
waynegerard 2fa81112fc Removing inline rescue in favor of where/try combination for label ID in setter method. Thanks @mariovisic\! 2012-05-22 18:27:38 -07:00
waynegerard be26ae3059 Added a setter method for label_field_id in content_types.rb model. Should resolve issue where label_field_name was not being updated properly through the UI. Fix for issue #398. 2012-05-19 13:51:41 -07:00
Didier Lafforgue e225ad2278 fix issue #385 2012-05-07 00:31:59 +02:00
Alex Sanford 24e5eb855a Added auth feature for memberships 2012-04-30 16:29:32 -03:00
Alex Sanford 9c15f1cbab Added API sites_controller and auth feature 2012-04-27 14:52:09 -03:00
Alex Sanford 06e493477c Added auth feature for current site 2012-04-27 12:05:21 -03:00
Alex Sanford 96007174cb Added auth feature for content_assets 2012-04-27 08:27:05 -03:00
Alex Sanford 37f87e694c Added auth feature for theme assets 2012-04-26 12:48:05 -03:00
Didier Lafforgue a8646e7ef3 date picker was not correctly displayed in the popup form (has_many relationship) + previous form errors remained even within a fresh new popup 2012-04-26 12:12:55 +02:00
Didier Lafforgue f9a6155c19 content types can auto-reference them (in a many_to_many relationship for instance) 2012-04-26 04:00:46 +02:00
Didier Lafforgue 23600edb1f performance improvements as described in #383 2012-04-26 03:39:23 +02:00
Alex Sanford 4e6c106772 Added auth feature for snippets 2012-04-25 10:56:38 -03:00
Alex Sanford 44aadb8926 Added auth feature for content_types 2012-04-24 15:48:23 -03:00
Alex Sanford 7dcc1ba3f6 Merge branch 'master' into api_auth 
Conflicts:
	features/step_definitions/api_steps.rb
 2012-04-24 13:22:35 -03:00
Alex Sanford bf65fa47f3 Added destroy API method for pages and fixed feature 2012-04-24 12:13:26 -03:00
Didier Lafforgue ce5576da09 the extends tag was not looking for the right fullpath (when localization is enabled) + sample in order to modify the tinyMCE settings in the back-office 2012-04-22 23:25:18 +02:00
Didier Lafforgue 08cf381bc3 simple media plugin for Aloha 2012-04-22 01:14:25 +02:00
Didier Lafforgue 246eadb3fd fix issue #374 2012-04-20 13:11:50 +02:00
Didier Lafforgue 486c6a12a2 fix issue #367 2012-04-20 00:31:48 +02:00
Didier Lafforgue 47015d3473 write cucumber tests to illustrate how to deal with a contact form + fix a tiny bug about it 2012-04-17 17:48:42 +02:00
Alex Sanford edd236b202 Got authorization working for pages 2012-04-17 10:12:42 -03:00
Didier Lafforgue 60df273e4b fix tests for issue #366 2012-04-17 03:02:31 +02:00
Dmitriy a74a0045a3 Wrong arguments order fixed. 2012-04-17 02:44:19 +04:00
Alex Sanford 97edb0e4b7 Added show action to page API and fixed some features 2012-04-16 15:36:39 -03:00
Didier Lafforgue 256a0e4bc0 Merge branch 'master' of github.com:locomotivecms/engine 2012-04-16 12:35:44 +02:00
Didier Lafforgue 655fe18d72 add UI notifications when a form is submitted + disable the form when it is being submitted + pass the current ability to the presenter + remove debug statements 2012-04-16 11:38:32 +02:00