28 Jan, 2014
1 commit
22 Jan, 2014
1 commit
-
…into merge-requests/342 Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
15 Jan, 2014
3 commits
-
- Also fixed db/schema (ActionItem2852)
-
Conflicts: app/models/person.rb db/schema.rb
-
- Also included new db/schema - Removed unused partial (ActionItem2513)
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
19 Dec, 2013
1 commit
16 Dec, 2013
1 commit
-
…into merge-requests/376 Conflicts: db/schema.rb
21 Nov, 2013
1 commit
-
Also: - removed whitespaces - added class with plugin name to style a view (ActionItem2837)
16 Nov, 2013
1 commit
-
(ActionItem2903)
24 Oct, 2013
1 commit
14 Oct, 2013
1 commit
-
ActionItem2691
18 Sep, 2013
1 commit
-
Conflicts: db/schema.rb
21 Aug, 2013
1 commit
05 Aug, 2013
1 commit
16 Jul, 2013
1 commit
08 Jul, 2013
1 commit
27 Jun, 2013
1 commit
06 Jun, 2013
1 commit
-
article and article_versions fields type must be the same also removed plugins tables from schema.rb (ActionItem2685)
05 Jun, 2013
1 commit
30 May, 2013
1 commit
06 Mar, 2013
1 commit
04 Mar, 2013
1 commit
-
(ActionItem2599)
12 Jan, 2013
1 commit
27 Nov, 2012
1 commit
06 Nov, 2012
1 commit
04 Nov, 2012
1 commit
-
Conflicts: app/sweepers/article_sweeper.rb db/schema.rb test/unit/environment_test.rb
01 Nov, 2012
2 commits
-
Conflicts: db/schema.rb test/functional/cms_controller_test.rb test/unit/article_test.rb
-
Conflicts: db/schema.rb test/unit/environment_test.rb
29 Oct, 2012
1 commit
-
Added field sigup_welcome_text on environment New tab on admin panel to edit the text When the environment doesn't have a text, will use the default text Added content_type to email (ActionItem2497)
28 Oct, 2012
1 commit
-
(ActionItem2369)
27 Oct, 2012
1 commit
-
Added field redirection_after_login on profiles and environments New db/schema Added a select to choose option to redirect on admin panel and on profile control panel (ActionItem2369)
25 Oct, 2012
1 commit
24 Oct, 2012
1 commit
-
Conflicts: app/helpers/forms_helper.rb app/models/box.rb app/views/box_organizer/edit.rhtml db/schema.rb test/unit/box_test.rb
26 Aug, 2012
1 commit
23 Aug, 2012
1 commit
19 Aug, 2012
1 commit
-
Conflicts: db/schema.rb
18 Aug, 2012
1 commit
-
Also: - Added migration to remove action_trackers with target nil - Updated db/schema (ActionItem2400)
17 Aug, 2012
1 commit
-
Also replaced "if !" by "unless"