22 Jan, 2015
3 commits
-
Conflicts: plugins/comment_paragraph/public/comment_paragraph_macro.js plugins/comment_paragraph/public/style.css plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb
21 Jan, 2015
3 commits
-
Conflicts: plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb
20 Jan, 2015
9 commits
-
Conflicts: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb plugins/site_tour/views/tour_actions.html.erb
-
Conflicts: plugins/site_tour/public/main.js plugins/site_tour/views/tour_actions.html.erb
19 Jan, 2015
8 commits
-
The PluginAdminController protect by default users that didn't have edit_environment_features permission against access plugin administration.
16 Jan, 2015
2 commits
15 Jan, 2015
4 commits
-
More fixes for custom forms plugin migration to rails 3 A couple of bugs in custom forms plugin on rails 3 I found while testing another feature, see commit message. See merge request !409
14 Jan, 2015
9 commits
-
Conflicts: public/javascripts/application.js
-
Conflicts: public/javascripts/application.js
-
Conflicts: public/javascripts/application.js
-
When upgrading from 0.47, 20140724134601_fix_yaml_encoding.rb will run before 20140827191326_remove_environment_statistics_block.rb and crash because the EnvironmentStatisticsBlock class does not exist anymore.
13 Jan, 2015
2 commits
-
Fix javascript bug The refactoring of this commit 64d0ae2868654ad922dea3ae23ad3ad7a0421903 was causing the user to be logged out after trying to change his homepage. See merge request !414