15 Jun, 2015
1 commit
-
Conflicts: lib/noosfero/plugin.rb test/unit/article_test.rb test/unit/person_test.rb
12 Jun, 2015
1 commit
10 Jun, 2015
1 commit
02 Jun, 2015
1 commit
01 Jun, 2015
1 commit
28 May, 2015
3 commits
-
* removing one level of includes in apache conf * be verbose about apache config update * chat_message should not be created without "from" or "to" * the database table indexes is "from_id / to_id" not "from / to"
-
* 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>
-
…he template it is changed on all users that follow that template. Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
22 May, 2015
1 commit
19 May, 2015
1 commit
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>
12 May, 2015
1 commit
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
10 Apr, 2015
1 commit
16 Mar, 2015
1 commit
-
See merge request !481
27 Feb, 2015
1 commit
26 Feb, 2015
1 commit
-
- created 'secret' attribute for profiles - redefined scope for secret communities Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Filipe Ribeiro <firibeiro77@live.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
25 Feb, 2015
2 commits
-
This reverts commit 025643a62df719a6cfe63f5927d45585d655a1da.
24 Feb, 2015
2 commits
23 Feb, 2015
1 commit
11 Feb, 2015
1 commit
10 Feb, 2015
2 commits
-
Use materialized path for parents lookup http://noosfero.org/Development/ActionItem2809 See merge request !7
03 Feb, 2015
2 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
02 Feb, 2015
1 commit
30 Jan, 2015
2 commits
27 Jan, 2015
2 commits
-
Allow external feed with big addresses Fix: PG::StringDataRightTruncation: ERRO: valor é muito longo para tipo character varying(255) : UPDATE "external_feeds" SET "enabled" = 't', "fetched_at" = NULL, "address" = 'http://www.mncr.org.br/search_rss?advanced_search=True&SearchableText=&Subject_usage%3Aignore_empty=operator%3Aand&pt_toggle=%23&portal_type%3Alist=Document&portal_type%3Alist=Event&portal_type%3Alist=File&portal_type%3Alist=Google+Video&portal_type%3Alist=News+Item&created%3Alist%3Adate=1970%2F02%2F01&created_usage=range%3Amin&Creator=&sort_on=created&b_size%3Aint=30&submit=Buscar', "updated_at" = '2015-01-05 12:15:29.155544' WHERE "external_feeds"."id" = 993 activerecord (3.2.21) lib/active_record/connection_adapters/postgresql_adapter.rb:1163:in `async_exec' See merge request !429
22 Jan, 2015
2 commits
18 Sep, 2014
1 commit
12 Sep, 2014
1 commit
11 Sep, 2014
1 commit
-
Conflicts: AUTHORS app/controllers/public/content_viewer_controller.rb debian/changelog lib/noosfero.rb po/de/noosfero.po po/eo/noosfero.po po/es/noosfero.po po/fr/noosfero.po po/hy/noosfero.po po/it/noosfero.po po/noosfero.pot po/pt/noosfero.po po/ru/noosfero.po
08 Sep, 2014
1 commit
-
Conflicts: app/controllers/application_controller.rb app/controllers/my_profile/memberships_controller.rb app/controllers/public/account_controller.rb app/helpers/application_helper.rb app/helpers/layout_helper.rb app/helpers/token_helper.rb app/views/account/signup.html.erb app/views/layouts/_javascript.html.erb db/schema.rb test/functional/application_controller_test.rb
27 Aug, 2014
1 commit
-
PeopleBlock plugin overrides the EnvironmentStatisticsBlock (ActionItem3045)
18 Aug, 2014
1 commit
-
Conflicts: app/controllers/my_profile/cms_controller.rb db/schema.rb
14 Aug, 2014
1 commit
-
(ActionItem2915)