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

1457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mario Visic
7e0fcb62ee Merge pull request #395 from willcosgrove/patch-1 
Fixed typo for bootstrap setting: `data-toogle` to `data-toggle`
 2012-05-08 20:49:23 -07:00
Will Cosgrove
c0627bf8a7 Fixed typo for bootstrap setting: data-toogle to data-toggle 2012-05-08 22:31:20 -05:00
Didier Lafforgue
e225ad2278 fix issue #385 2012-05-07 00:31:59 +02:00
did
a939629cbf new multi_json gem 2012-05-05 02:39:23 -07:00
Didier Lafforgue
f42fb1afe1 finally the new version of the multi_json gem (issue #387) 2012-05-05 11:17:18 +02:00
did
03d13d92d0 fix issue #387 2012-05-04 03:35:07 -07: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
a921c44ce9 Fixed access denied error checking step 2012-04-26 16:12:39 -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
Didier Lafforgue
9613058b97 improve the upgrade script (wip) 2012-04-25 19:09:46 +02:00
Alex Sanford
4e6c106772 Added auth feature for snippets 2012-04-25 10:56:38 -03:00
Alex Sanford
d2da4b659e Added auth feature for content entries 2012-04-25 09:51:11 -03:00
Alex Sanford
44aadb8926 Added auth feature for content_types 2012-04-24 15:48:23 -03:00
Alex Sanford
75e694a6f0 Cleaned up API features 2012-04-24 13:37:29 -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
1344463222 Cleaned up features 2012-04-24 12:47:32 -03:00
Alex Sanford
bf65fa47f3 Added destroy API method for pages and fixed feature 2012-04-24 12:13:26 -03:00
Alex Sanford
f53ab18f90 Added features for destroying pages 2012-04-24 12:04:24 -03:00
Didier Lafforgue
0502cf3305 bump version to 2.0.0.rc7 2012-04-23 01:04:06 +02:00
Didier Lafforgue
69c51fbe07 new aloha-rails gem (fixing a typo in a css when precompiling it) 2012-04-23 01:03:21 +02:00
Didier Lafforgue
b3902bb3d5 Merge branch 'master' of github.com:locomotivecms/engine 2012-04-22 23:44:24 +02: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
Mario Visic
283a0d9be4 Merge pull request #378 from davide-malagoli/master 
current_user liquid extension (issue #312) added
 2012-04-22 03:15:05 -07:00
Didier Lafforgue
57b7cc1ef2 just a quick test to demonstrate the documentation was wrong (issue #377) 2012-04-22 01:27:07 +02:00
Didier Lafforgue
08cf381bc3 simple media plugin for Aloha 2012-04-22 01:14:25 +02:00
Annalisa
632e16b18e issue #321 (current_user) working. url_helpers removed. 2012-04-21 11:06:13 +02:00
Annalisa
043b78a061 strange error 2012-04-21 01:50:37 +02:00
Annalisa
fc380e3e4d strange error 2012-04-21 01:31:33 +02:00
Annalisa
b87c76bc67 added current_user 2012-04-21 00:54:54 +02:00
Didier Lafforgue
d6059c2a9b fix issue #373 2012-04-20 15:42:10 +02:00
Didier Lafforgue
fa6e62dd84 Merge branch 'master' of github.com:locomotivecms/engine 2012-04-20 13:13:30 +02:00
Didier Lafforgue
246eadb3fd fix issue #374 2012-04-20 13:11:50 +02:00
Didier Lafforgue
682763445c Merge pull request #372 from GarPit/master 
Added missing ru translations
 2012-04-19 16:05:41 -07:00
Didier Lafforgue
f0e8848ffd repair broken build 2012-04-20 00:35:14 +02:00
Didier Lafforgue
486c6a12a2 fix issue #367 2012-04-20 00:31:48 +02:00
Didier Lafforgue
9b4fc56e82 fix issue #360 2012-04-19 16:30:16 +02:00
PitOn
b0a552dfcf added missing ru translations for upcoming 2.0 version 2012-04-18 16:41:24 +04:00
Didier Lafforgue
9267725c9f clean the upgrade script (v1 -> v2) 2012-04-18 14:35:06 +02:00
PitOn
d78f99703e added missing ru translations for upcoming 2.0 version 2012-04-18 16:20:36 +04:00