16 Jan, 2014
1 commit
15 Jan, 2014
2 commits
-
- Also fixed db/schema (ActionItem2852)
-
Conflicts: app/models/person.rb db/schema.rb
14 Jan, 2014
1 commit
-
(ActionItem2950)
13 Jan, 2014
1 commit
09 Jan, 2014
1 commit
-
- Added a field on article new/edit to specify which users can access the article - Added a relationship has_and_belongs_to_many between Article and Person - Created a new table article_privacy_exceptions for has_and_belongs_to_many - Added cucumber tests - Added a new cucumber step to add a user to the exception users list (ActionItem2852) Signed-off-by: Alex de Souza <campelo.al1@gmail.com> Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com> Signed-off-by: Andre Bedran <bedran.fleck@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com>
08 Jan, 2014
1 commit
-
- Added buttons at members block. - Added checkbox to show or not the buttons on the community members. - Removed the render button "enter/leave" when the checkbox that enables the button is unchecked - Adjusted style CSS and display button - Added cucumber and unit tests. - Removed some spaces. - There are two cucumber tests that wasn't done by the our team that fail if you don't use selenium. The files are publish_article.feature line 20 and search_enterprises.feature line 33 and we didn't modify them. (ActionItem2844) Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Leandro Alves <leandrosustenido@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com> Signed-off-by: Andre Bedran <bedran.fleck@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
07 Jan, 2014
2 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
18 Dec, 2013
3 commits
-
Conflicts: plugins/display_content/lib/display_content_block.rb
16 Dec, 2013
2 commits
-
…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css
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
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
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
25 Nov, 2013
1 commit
-
(ActionItem2748)
22 Nov, 2013
4 commits
21 Nov, 2013
3 commits
-
The numbers of categories are part of the classes names. Probably, those numbers are being used in some environment and we don't want to break those environments
-
Also allowing the expire of cache from old layouts
20 Nov, 2013
3 commits
19 Nov, 2013
1 commit
16 Nov, 2013
3 commits
-
(ActionItem2903)
-
(ActionItem2901)
14 Nov, 2013
1 commit
-
Also, moving requestor match logic to a helper instead of inside the change_password model.
12 Nov, 2013
1 commit