01 Jul, 2015
3 commits
-
Conflicts: app/controllers/my_profile/tasks_controller.rb app/views/tasks/processed.html.erb test/functional/tasks_controller_test.rb
29 Jun, 2015
2 commits
-
Conflicts: public/stylesheets/tasks.css
17 Jun, 2015
3 commits
-
Conflicts: Gemfile public/proposal-app public/stylesheets/application.css
16 Jun, 2015
3 commits
-
Conflicts: lib/noosfero/plugin.rb
12 Jun, 2015
3 commits
-
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
-
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
3 commits
-
Signed-off-by: André Guedes <andrebsguedes@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
-
Signed-off-by: André Guedes <andrebsguedes@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
08 Jun, 2015
1 commit
05 Jun, 2015
3 commits
03 Jun, 2015
10 commits
-
…each tag and tasks.css changes
-
Set profile to nil rather than delete the key so the nil value will take precedence over the value stored in request object.
02 Jun, 2015
2 commits
01 Jun, 2015
1 commit
30 May, 2015
2 commits
28 May, 2015
4 commits
-
Plugins can set aditional html options like id, class or data attributes for control panel buttons.
-
* 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>
-
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: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>
