27 Jun, 2014
2 commits
26 Jun, 2014
2 commits
17 Jun, 2014
2 commits
-
Conflicts: plugins/display_content/test/unit/display_content_block_test.rb
16 Jun, 2014
3 commits
-
'\w-' is the same of 'a-zA-Z0-9_-' (ActionItem3122)
14 Jun, 2014
2 commits
-
(ActionItem2859)
13 Jun, 2014
1 commit
-
added new hotstop "body_ending"
12 Jun, 2014
2 commits
-
Conflicts: plugins/display_content/lib/display_content_block.rb plugins/display_content/test/unit/display_content_block_test.rb
11 Jun, 2014
1 commit
06 Jun, 2014
2 commits
-
Also: - check return of before_disable.rb when disabling plugins - fix rails3: instance_eval -> instance_exec (ActionItem2859)
-
…te, spread actions) when showing upload file in content_viewer
05 Jun, 2014
5 commits
-
(ActionItem2859)
-
(ActionItem2859)
-
(ActionItem2859)
-
(ActionItem2859)
-
Conflicts: app/controllers/admin/environment_design_controller.rb app/models/friends_block.rb app/models/members_block.rb test/functional/environment_design_controller_test.rb test/unit/members_block_test.rb
29 May, 2014
1 commit
20 May, 2014
4 commits
18 May, 2014
4 commits
14 May, 2014
1 commit
13 May, 2014
4 commits
-
Conflicts: app/helpers/application_helper.rb app/helpers/layout_helper.rb app/models/community.rb app/models/enterprise.rb app/models/product_category.rb app/views/account/change_password.html.erb config/boot.rb config/environment.rb config/routes.rb lib/noosfero/plugin.rb test/unit/enterprise_activation_test.rb test/unit/person_notifier_test.rb
12 May, 2014
4 commits
-
Conflicts: app/views/layouts/_javascript.html.erb public/javascripts/jquery-latest.js
-
Conflicts: features/categories_block.feature public/stylesheets/application.css
