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
6 commits
-
Conflicts: db/schema.rb test/unit/person_test.rb
-
Also increasing margin by 1px.
-
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
5 commits
-
Conflicts: test/functional/memberships_controller_test.rb test/unit/person_test.rb
02 Jan, 2014
5 commits
-
(ActionItem2810)
-
(ActionItem2910)
23 Dec, 2013
1 commit
19 Dec, 2013
1 commit
18 Dec, 2013
7 commits
-
Conflicts: plugins/display_content/lib/display_content_block.rb
-
… into order-attributes
-
Conflicts: test/unit/profile_test.rb
16 Dec, 2013
14 commits
-
Conflicts: test/unit/article_test.rb
-
…into merge-requests/407
-
…into merge-requests/425
-
…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css