25 Feb, 2014
1 commit
18 Dec, 2013
4 commits
-
Conflicts: plugins/display_content/lib/display_content_block.rb
-
Conflicts: test/unit/profile_test.rb
16 Dec, 2013
6 commits
13 Dec, 2013
1 commit
12 Dec, 2013
1 commit
-
…into merge-requests/410
10 Dec, 2013
1 commit
05 Dec, 2013
1 commit
-
…into merge-requests/413
02 Dec, 2013
1 commit
-
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
28 Nov, 2013
1 commit
-
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
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
26 Nov, 2013
1 commit
25 Nov, 2013
1 commit
-
(ActionItem2748)
24 Nov, 2013
1 commit
-
…into merge-requests/414
23 Nov, 2013
1 commit
-
…into merge-requests/418
22 Nov, 2013
2 commits
21 Nov, 2013
6 commits
-
Also includes migration to remove already orphaned profiles. (ActionItem2906)
-
Also allowing the expire of cache from old layouts
20 Nov, 2013
3 commits
19 Nov, 2013
3 commits
-
PS: still breaking some tests due to action_tracker problem and html generation on models problem.
17 Nov, 2013
1 commit
-
…into merge-requests/400
16 Nov, 2013
2 commits
-
(ActionItem2795)
-
…into merge-requests/373
14 Nov, 2013
1 commit
-
Also, moving requestor match logic to a helper instead of inside the change_password model.