26 Aug, 2015
1 commit
21 Aug, 2015
2 commits
-
This reverts commit d8c77643e546e5e82306aa6756cdf9931e008cc2, reversing changes made to 950a07082d85808991b63c99f0c30386af945a86.
19 Aug, 2015
2 commits
12 Aug, 2015
1 commit
10 Aug, 2015
3 commits
-
Besides, allow session to hold a value for after signup redirection
-
that's usually the default behaviour nowadays so that users don't need to relogin after a browser restart
06 Aug, 2015
1 commit
24 Jul, 2015
1 commit
12 Jun, 2015
1 commit
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
11 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>
13 May, 2015
1 commit
-
Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@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> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
16 Apr, 2015
1 commit
27 Mar, 2015
1 commit
-
This reverts commit 82742464704b48dce6337fa31610da3db7a6bce4. This commit broke searches pagination when using solr
26 Mar, 2015
2 commits
25 Mar, 2015
2 commits
22 Mar, 2015
1 commit
19 Mar, 2015
1 commit
10 Mar, 2015
1 commit
01 Mar, 2015
1 commit
-
@scope will load all data from environment with there is crash on search, consuming many resources on server
13 Feb, 2015
2 commits
-
Allow admins to define the number of news on portal See merge request !470
-
Private profile pages When the profile is private, some pages are still shown if using the URL. For example, pages like agenda and contact email. We added a before_filter to make sure that doesn't happen. See merge request !459
12 Feb, 2015
1 commit
09 Feb, 2015
1 commit
-
- Create tests for private and invisible communities using the privace methods - Executing filters for events and contact pages in private profiles Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
06 Feb, 2015
1 commit
-
Conflicts: public/stylesheets/application.css
03 Feb, 2015
4 commits
-
Conflicts: db/schema.rb
-
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
-
This feature allows organizations to invite people and users to request friendship from other users from the network instead of only through email. Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br> Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
02 Feb, 2015
1 commit
27 Jan, 2015
3 commits
-
Conflicts: public/javascripts/application.js public/stylesheets/application.css
21 Jan, 2015
1 commit
15 Jan, 2015
1 commit
-
Also changed message to be easier to translate