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

1406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
2ac74c9a50 fix issue #411 2012-05-25 13:24:10 +02:00
Didier Lafforgue
24ae75c6f5 Gemfile.lock gets updated 2012-05-24 23:37:48 +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
8be23f1cc2 Updated the readme a tad with PhantomJS info. 2012-05-25 00:23:13 +08:00
Mario Visic
fbef06f103 Merge branch 'poltergeist' 2012-05-25 00:16:33 +08:00
Mario Visic
38098e93da Updated the doco to instruct users to install PhantomJS for testing. 2012-05-25 00:16:25 +08:00
Mario Visic
3a27845fe5 Small fix for poltergeist. 2012-05-25 00:13:55 +08: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
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
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
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