17 Dec, 2014
9 commits
16 Dec, 2014
6 commits
-
Conflicts: app/controllers/box_organizer_controller.rb app/controllers/my_profile/profile_design_controller.rb app/helpers/layout_helper.rb
-
Conflicts: Gemfile Gemfile.lock app/controllers/admin/environment_design_controller.rb app/helpers/layout_helper.rb app/models/block.rb script/quick-start
11 Dec, 2014
6 commits
10 Dec, 2014
2 commits
08 Dec, 2014
8 commits
-
When plugin is not enabled on environment, the plugin extensions can't affect other features
-
- Indent files properly - Fix signup page changing lambda to proc - Create the needed plugin's hotspots - Fix academic_info attributes update - Fix hotspot to work in edit page
-
(ActionItem3102) - placed the tab for lattes on the proffile and add the validation for it - included lattes parser to the profile tab. - informations of lattes curriculum formated and syncronized with database Signed-off-by: Jose Pedro <1jpsneto@gmail.com> Signed-off-by: Thiago Kairala <thiagor.kairala@gmail.com> Signed-off-by: Ana Paula Vargas <anapaulavnoronha@gmail.com> Signed-off-by: Leandro Veloso <leandrovelosorodrigues@gmail.com>
-
Fix members listing There is a problem in environments when listing profile members: No Method Error 'map' for #<Arel::Nodes::SqlLiteral> This problem is related to a 'count' being executed in a query with 'includes'. See merge request !392
-
Functional tests are still broken, so not re-enabling them for now. Signed-off-by: Junior Silva <juniorsilva1001@gmail.com> Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
05 Dec, 2014
2 commits
03 Dec, 2014
3 commits
-
This reverts commit b7d12e5b7316324cfb2481dc6b42f1a0e104c096.
01 Dec, 2014
4 commits