17 Apr, 2014
1 commit
31 Mar, 2014
3 commits
-
…the link to the original file
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
2 commits
-
(ActionItem2786)
-
(ActionItem2786)
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
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
2 commits
28 Nov, 2013
2 commits
-
Also: - Removed unused code - Fixed identation (ActionItem2587)
-
Show events by month Event list now only show 10 events when listing events for month (events for a day still listing all events) Add information on indefined place Enhance layout (ActionItem2587) Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br> Signed-off-by: Luiz Matos <luizff.matos@gmail.com> Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com> Signed-off-by: Leandro Alves <leandrosustenido@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by; Gabriela Navarro <navarro1703@gmail.com>
27 Nov, 2013
2 commits
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
26 Nov, 2013
1 commit
22 Nov, 2013
1 commit
-
(ActionItem2887)
14 Nov, 2013
1 commit
-
This reverts commit 4b392f22fb7d07a8d90095f028bfe184a2f58966. This is not necessary since a to_json is already happening on top level.
08 Nov, 2013
3 commits
-
This check, crashes the migration which will include the attribute o Task. Until someone discover how to avoid that, the fail-safe is commented.
05 Nov, 2013
1 commit
-
Conflicts: script/quick-start test/unit/application_helper_test.rb test/unit/environment_statistics_block_test.rb test/unit/environment_test.rb
04 Nov, 2013
1 commit
30 Oct, 2013
1 commit
