03 Jul, 2015
1 commit
-
Conflicts: app/models/event.rb app/models/profile.rb po/fr/noosfero.po
20 Jun, 2015
1 commit
17 Jun, 2015
2 commits
-
application-js: encapsulate dom element on jQuery before calling hide() See merge request !556
-
Conflicts: Gemfile public/proposal-app public/stylesheets/application.css
16 Jun, 2015
2 commits
-
Conflicts: lib/noosfero/plugin.rb
15 Jun, 2015
1 commit
-
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
02 Jun, 2015
1 commit
28 May, 2015
1 commit
-
* try to reconnect if connection fails * fix ordering * reconnect if connection is lost but user status is not offline * remove some anchors * keep track of buddies order on the client * tweak notification to work on chromium * respect async request order * focus on window when notification clicked * deal with window visibility * add chat-buttons * fix recent_conversations * fix sorting and join room on opening * remove obsolete code * adjusting indentation (sorry but I needed too...) * fix load_conversation * return identifier as key on avatars action * fix typo * add timeout to notification * deal properly with offline messages * fix notification sound * clear unread after loading conversation on background * ignore message from room * add unread messages counter on chat-label * as for notification permission as soon as the chat connects * add profile_info_action to open chat * using jid to save message instead of identifier * add profile_info_action to open chat * as for notification permission as soon as the chat connects * add unread messages counter on chat-label Squashed and Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
21 May, 2015
1 commit
-
Conflicts: app/views/content_viewer/_article_toolbar.html.erb
19 May, 2015
2 commits
12 May, 2015
2 commits
23 Apr, 2015
1 commit
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