16 Jan, 2014
1 commit
15 Jan, 2014
5 commits
-
Conflicts: test/functional/cms_controller_test.rb test/unit/profile_test.rb
-
- Also fixed db/schema (ActionItem2852)
-
Conflicts: app/models/person.rb db/schema.rb
-
- Also included new db/schema - Removed unused partial (ActionItem2513)
-
(ActionItem2513) Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com> Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
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>
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
3 commits
-
Conflicts: test/functional/memberships_controller_test.rb test/unit/person_test.rb
02 Jan, 2014
1 commit
18 Dec, 2013
2 commits
16 Dec, 2013
4 commits
-
…into merge-requests/425
-
…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css
13 Dec, 2013
1 commit
-
(ActionItem2910) Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Rafael de Souza Queiroz <querafael@live.com>
12 Dec, 2013
2 commits
-
…into merge-requests/410
-
(ActionItem2849) Signed-off-by: Marcos Ramos <ms.ramos@outlook.com Signed-off-by: Valéssio Brito <contato@valessiobrito.com.br> Signed-off-by: Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
03 Dec, 2013
1 commit
-
AI2824
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
2 commits
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
-
Added a parameter to specify a url to redirect when save (new or edit) a content with success
25 Nov, 2013
3 commits
-
- Added translation markup - Fixed indentation - css of link (ActionItem2875)
-
(ActionItem2875)
-
…into merge-requests/417
24 Nov, 2013
1 commit
-
(ActionItem2899)
23 Nov, 2013
1 commit
-
…into merge-requests/418
22 Nov, 2013
3 commits
-
(ActionItem2829)
-
Since there are plugins that need to receive the scope clean (that is without filters applied to it) and since the plugin has the power to not apply the filter when conveys it (also rewriting the interface to keep its consistency), I decided to pass the reposability of applying any filter provided by the core to the engines. Nevertheless, if the plugin returns nil (that's the same that it would return if it was disabled) the core will deal with the filters through the default way (that is without any engine).
21 Nov, 2013
3 commits
