07 Nov, 2012
1 commit
06 Nov, 2012
1 commit
01 Nov, 2012
8 commits
-
Features: * Move Article * Language Selection * Work Assignment Plugin
-
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
-
Conflicts: db/schema.rb test/unit/environment_test.rb
-
Conflicts: app/views/content_viewer/view_page.rhtml public/stylesheets/application.css
-
…into merge-requests/243
-
…into merge-requests/237
31 Oct, 2012
1 commit
-
(ActionItem2498)
29 Oct, 2012
8 commits
-
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
11 commits
-
(ActionItem2388)
-
…into merge-requests/241
-
(ActionItem2495)
-
…into merge-requests/236
-
(ActionItem2494)
-
…into merge-requests/233 Conflicts: test/integration/routing_test.rb
-
When trying to render "partial_for_class" there was the "stack level too deep" error
24 Oct, 2012
8 commits
-
* Adding the button to add the new content in the cms including the name, description and icon.
-
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