17 Apr, 2014
1 commit
31 Mar, 2014
3 commits
-
…the link to the original file
17 Mar, 2014
1 commit
-
Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br> (ActionItem2670)
07 Mar, 2014
2 commits
-
Conflicts: app/controllers/my_profile/profile_themes_controller.rb test/unit/comment_test.rb vendor/plugins/action_tracker_has_comments/init.rb
20 Feb, 2014
1 commit
13 Feb, 2014
4 commits
-
This reverts commit 25018e09d903cb9a6cb064ea447888fe2e1c1d39. Reverting substitution of hpricot for nokogiri on macros infra due to segfault problem with nokogiri 1.4.0.
11 Feb, 2014
1 commit
10 Feb, 2014
2 commits
28 Jan, 2014
3 commits
-
…pa/noosfero-AI2786-like
23 Jan, 2014
1 commit
-
…sub_organizations_improvements
22 Jan, 2014
1 commit
-
…into merge-requests/342 Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
20 Jan, 2014
1 commit
17 Jan, 2014
4 commits
-
Conflicts: test/unit/comment_test.rb
-
The following improvements have been made: - Created action that displays sub-organization and super organizations of a given organization. - Created a block that display related organizations. - List mother organizations to person's membership if he/she is member of a sub-organization. (ActionItem2499) (ActionItem2825) Signed-off-by: Arthur Del Esposte <athurmde@yahoo.com.br> Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
-
closes ActionItem2830
15 Jan, 2014
1 commit
14 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
1 commit
03 Jan, 2014
1 commit
26 Dec, 2013
2 commits
18 Dec, 2013
3 commits
-
Conflicts: plugins/display_content/lib/display_content_block.rb
-
Conflicts: test/unit/profile_test.rb
13 Dec, 2013
1 commit
10 Dec, 2013
1 commit
02 Dec, 2013
1 commit