17 Nov, 2015
1 commit
-
Conflicts: Gemfile Rakefile app/controllers/box_organizer_controller.rb app/controllers/my_profile/tasks_controller.rb app/controllers/public/profile_controller.rb app/mailers/user_mailer.rb app/models/article.rb app/models/person.rb app/models/product_category.rb app/models/task.rb config/application.rb config/routes.rb lib/acts_as_having_settings.rb lib/noosfero/api/entities.rb lib/noosfero/api/helpers.rb lib/noosfero/api/session.rb lib/noosfero/api/v1/articles.rb lib/noosfero/api/v1/contacts.rb lib/noosfero/api/v1/search.rb lib/noosfero/api/v1/users.rb test/functional/tasks_controller_test.rb test/unit/api/articles_test.rb test/unit/api/helpers_test.rb test/unit/api/people_test.rb test/unit/api/search_test.rb test/unit/api/session_test.rb test/unit/api/users_test.rb test/unit/person_notifier_test.rb test/unit/task_test.rb vendor/plugins/access_control/lib/acts_as_accessible.rb
12 Nov, 2015
1 commit
10 Nov, 2015
1 commit
-
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> See merge request !709
13 Oct, 2015
3 commits
-
Signed-off-by: Victor Costa <vfcosta@gmail.com> Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br> Conflicts: app/controllers/my_profile/profile_design_controller.rb app/helpers/boxes_helper.rb app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb public/stylesheets/application.css test/functional/environment_design_controller_test.rb test/functional/profile_design_controller_test.rb
02 Oct, 2015
1 commit
01 Oct, 2015
1 commit
30 Sep, 2015
1 commit
29 Sep, 2015
3 commits
26 Sep, 2015
1 commit
-
Keeped controllers/views structure
22 Sep, 2015
1 commit
15 Sep, 2015
3 commits
-
For some reason, tinymce is not working on production environment. After some investigation, we discovered that it wasn't working on production due to the compression of tinymce.min.js. After using the non-minified version, the problem was solved. We also upgraded to 4.2.5.
11 Sep, 2015
3 commits
08 Sep, 2015
1 commit
05 Sep, 2015
1 commit
-
- Order members by name - Removed white spaces - Changed strings to be translated - Renamed div id and test - Adjust ul tag members - Fixed plugin dependency Signed-off-by: Omar Junior <omarroinuj@gmail.com> Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Vitor Barbosa <vitormga15@gmail.com> Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
04 Sep, 2015
1 commit
01 Sep, 2015
1 commit
28 Aug, 2015
2 commits
27 Aug, 2015
1 commit
19 Aug, 2015
1 commit
-
Conflicts: Gemfile app/models/profile.rb plugins/shopping_cart/lib/shopping_cart_plugin.rb plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb plugins/shopping_cart/po/de/shopping_cart.po plugins/shopping_cart/po/es/shopping_cart.po plugins/shopping_cart/po/fr/shopping_cart.po plugins/shopping_cart/po/hy/shopping_cart.po plugins/shopping_cart/po/pt/shopping_cart.po plugins/shopping_cart/po/ru/shopping_cart.po plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb plugins/shopping_cart/views/cart.html.erb plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
13 Aug, 2015
2 commits
10 Aug, 2015
3 commits
-
Besides, allow session to hold a value for after signup redirection
28 Jul, 2015
1 commit
25 Jul, 2015
2 commits
24 Jul, 2015
1 commit
23 Jul, 2015
1 commit
-
- first it breaks selenium tests because it hides the original select and replaces it with its own thing. - second, IMO is is too much overhead to add a style that (again IMO) is not even that better than the default select widget in Firefox.
20 Jul, 2015
1 commit
17 Jul, 2015
1 commit
