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
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