21 May, 2015
1 commit
-
Conflicts: app/views/content_viewer/_article_toolbar.html.erb
19 May, 2015
2 commits
12 May, 2015
2 commits
20 Apr, 2015
1 commit
13 Apr, 2015
2 commits
-
Conflicts: app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb
10 Apr, 2015
1 commit
19 Mar, 2015
2 commits
-
Conflicts: app/models/profile.rb app/views/profile_editor/edit.html.erb
17 Mar, 2015
1 commit
16 Mar, 2015
1 commit
27 Feb, 2015
1 commit
26 Feb, 2015
1 commit
25 Feb, 2015
1 commit
24 Feb, 2015
1 commit
22 Feb, 2015
1 commit
-
Colorbox was updated for the onCleanup callback
13 Feb, 2015
1 commit
-
See merge request !454
11 Feb, 2015
1 commit
06 Feb, 2015
2 commits
-
Conflicts: public/stylesheets/application.css
05 Feb, 2015
2 commits
04 Feb, 2015
1 commit
-
Conflicts: app/controllers/public/search_controller.rb app/models/profile.rb app/views/cms/edit.html.erb public/stylesheets/application.css
03 Feb, 2015
2 commits
-
Conflicts: app/controllers/my_profile/profile_editor_controller.rb app/helpers/search_helper.rb app/models/invitation.rb app/models/person.rb app/views/cms/view.html.erb app/views/templates/index.html.erb plugins/community_track/views/content_viewer/_step_item.html.erb test/functional/home_controller_test.rb test/unit/person_test.rb test/unit/profile_test.rb
02 Feb, 2015
1 commit
-
Conflicts: app/views/profile/_person_profile.html.erb
30 Jan, 2015
1 commit
-
Add the wait cursor when the user try to load comments http://noosfero.org/Development/ActionItem2947 See merge request !87
28 Jan, 2015
1 commit
27 Jan, 2015
1 commit
-
Conflicts: public/javascripts/application.js public/stylesheets/application.css
26 Jan, 2015
1 commit
21 Jan, 2015
1 commit
17 Jan, 2015
1 commit
16 Jan, 2015
1 commit
14 Jan, 2015
3 commits
-
Conflicts: public/javascripts/application.js
-
Conflicts: public/javascripts/application.js
-
Conflicts: public/javascripts/application.js
13 Jan, 2015
1 commit
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
09 Jan, 2015
1 commit