10 Feb, 2014
1 commit
28 Jan, 2014
1 commit
-
…into merge-requests/358
20 Jan, 2014
1 commit
16 Jan, 2014
1 commit
15 Jan, 2014
3 commits
-
Conflicts: test/functional/cms_controller_test.rb test/unit/profile_test.rb
-
Conflicts: app/models/person.rb db/schema.rb
-
(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>
12 Dec, 2013
1 commit
-
(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>
27 Nov, 2013
1 commit
-
Added a parameter to specify a url to redirect when save (new or edit) a content with success
25 Nov, 2013
2 commits
-
(ActionItem2875)
-
- Added translation markup - Fixed indentation - css of link (ActionItem2875)
20 Nov, 2013
1 commit
07 Oct, 2013
1 commit
-
Conflicts: app/views/cms/view.rhtml test/functional/profile_controller_test.rb
23 Sep, 2013
2 commits
19 Sep, 2013
1 commit
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
09 Aug, 2013
2 commits
-
ActionItem2752
16 Jul, 2013
1 commit
16 May, 2013
1 commit
09 May, 2013
2 commits
-
…into merge-requests/298 Added html_safe that was missing on the block_helper new method Conflicts: app/views/box_organizer/_highlights_block.rhtml test/unit/application_helper_test.rb
05 Apr, 2013
1 commit
03 Apr, 2013
1 commit
06 Feb, 2013
1 commit
-
closes ActionItem2567
20 Dec, 2012
1 commit
-
(ActionItem2522)
04 Nov, 2012
2 commits
-
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: app/helpers/forms_helper.rb app/sweepers/article_sweeper.rb
24 Oct, 2012
3 commits
-
Conflicts: app/helpers/forms_helper.rb app/models/box.rb app/views/box_organizer/edit.rhtml db/schema.rb test/unit/box_test.rb
-
Conflicts: app/helpers/forms_helper.rb
03 Oct, 2012
1 commit
23 Aug, 2012
1 commit
21 Aug, 2012
2 commits
-
Conflicts: app/helpers/application_helper.rb app/views/content_viewer/_article_toolbar.rhtml test/functional/content_viewer_controller_test.rb
09 Aug, 2012
1 commit
-
* Licenses only can be removed with method 'post' * Fixing truncate calls to stop displaying deprecation warnings * Added buttons to add a new license and to go back to admin panel * Added new db/schema (ActionItem2379)
08 Aug, 2012
1 commit
-
…into merge-requests/187 Conflicts: app/models/environment.rb public/stylesheets/application.css test/factories.rb test/fixtures/roles.yml test/unit/article_test.rb