07 Apr, 2014
1 commit
02 Apr, 2014
2 commits
-
…to juniorsilva1001/noosfero-article-version Conflicts: app/views/content_viewer/versioned_article.rhtml db/schema.rb public/stylesheets/application.css
20 Mar, 2014
2 commits
-
Conflicts: app/views/themes/index.rhtml db/schema.rb plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb test/unit/person_test.rb
19 Mar, 2014
2 commits
-
Conflicts: db/schema.rb
18 Mar, 2014
6 commits
-
(ActionItem3039)
-
(ActionItem3039)
-
(ActionItem3039)
-
(ActionItem3039)
-
(ActionItem3039)
-
(ActionItem3039)
14 Mar, 2014
2 commits
-
email is enabled. (ActionItem2998) Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
-
Environment. (ActionItem2998)
03 Mar, 2014
1 commit
21 Feb, 2014
1 commit
28 Jan, 2014
3 commits
-
Signed-off-by: Ana Losnak <analosnak@gmail.com> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> ActionItem1011
-
…pa/noosfero-AI2786-like
24 Jan, 2014
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb db/schema.rb
22 Jan, 2014
1 commit
-
…into merge-requests/342 Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
21 Jan, 2014
1 commit
-
…into merge-requests/337 Conflicts: app/controllers/public/catalog_controller.rb app/helpers/application_helper.rb app/helpers/catalog_helper.rb app/views/catalog/index.rhtml public/stylesheets/application.css
17 Jan, 2014
1 commit
15 Jan, 2014
4 commits
-
- 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
1 commit
-
Conflicts: db/schema.rb test/unit/person_test.rb
03 Jan, 2014
1 commit
19 Dec, 2013
1 commit
16 Dec, 2013
1 commit
-
…into merge-requests/376 Conflicts: db/schema.rb
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
27 Nov, 2013
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
21 Nov, 2013
3 commits
-
Also: - removed whitespaces - added class with plugin name to style a view (ActionItem2837)
-
Also includes migration to remove already orphaned profiles. (ActionItem2906)
16 Nov, 2013
1 commit
-
(ActionItem2903)
24 Oct, 2013
1 commit