13 Jan, 2014
1 commit
07 Jan, 2014
3 commits
-
Conflicts: db/schema.rb test/unit/person_test.rb
-
Add plugin view paths at initialization. Calling prepend_view_path on each request is too slow. Do not include theme dir at view path. Themes must use theme_include method to render rhtml files (instead of using render directly). This avoids conflict of files with same name at different themes and reduces the amount of paths in view_paths.
06 Jan, 2014
4 commits
-
Conflicts: test/functional/memberships_controller_test.rb test/unit/person_test.rb
02 Jan, 2014
2 commits
18 Dec, 2013
6 commits
-
Conflicts: plugins/display_content/lib/display_content_block.rb
-
… into order-attributes
-
Conflicts: test/unit/profile_test.rb
16 Dec, 2013
13 commits
-
Conflicts: test/unit/article_test.rb
-
…into merge-requests/425
-
…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css
-
…nto merge-requests/390
13 Dec, 2013
3 commits
-
(ActionItem2910) Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Rafael de Souza Queiroz <querafael@live.com>
-
(ActionItem2838)
12 Dec, 2013
2 commits
-
…into merge-requests/410
-
(ActionItem2849) Signed-off-by: Marcos Ramos <ms.ramos@outlook.com Signed-off-by: Valéssio Brito <contato@valessiobrito.com.br> Signed-off-by: Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
10 Dec, 2013
1 commit
05 Dec, 2013
2 commits
-
…into merge-requests/413
03 Dec, 2013
1 commit
-
AI2824
02 Dec, 2013
2 commits
-
Conflicts: app/models/category.rb app/models/uploaded_file.rb test/functional/memberships_controller_test.rb test/functional/profile_controller_test.rb vendor/plugins/action_tracker_has_comments/init.rb