17 Jun, 2015
2 commits
-
Conflicts: Gemfile public/proposal-app public/stylesheets/application.css
16 Jun, 2015
3 commits
-
Conflicts: lib/noosfero/plugin.rb
-
(ActionItem3149)
15 Jun, 2015
1 commit
-
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
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
3 commits
-
Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
-
- Refactoring CSS to better display folder itens - Creating method to display uploaded file names with extension in upper case Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
-
- The loading bar was fixed to fix media_panel_upload broken tests - The noosfero_steps was fixed to get the first box(this was breaking when it was on the environment. Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
08 Jun, 2015
2 commits
05 Jun, 2015
2 commits
03 Jun, 2015
7 commits
-
…each tag and tasks.css changes
-
…each tag and tasks.css changes
-
…ike a tagger of tasks. jQuery plugin 'inputosaurus.js' was customize and a pull request was made in your github repo
02 Jun, 2015
2 commits
01 Jun, 2015
3 commits
-
Remove the 8 wrapper divs from the main content It is now replaced with a single div with class 'main-content'. This *might* break some old themes, but we need to start getting rid of these absurds at some point. See merge request !587
-
It is now replaced with a single div with class 'main-content'. This *might* break some old themes, but we need to start getting rid of these absurds at some point.
30 May, 2015
1 commit
28 May, 2015
5 commits
-
The mapLoad method is also more configurable now. Signed-off-by: Larissa Reis <larissa@colivre.coop.br>
-
* 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>
27 May, 2015
3 commits
-
Conflicts: public/stylesheets/tasks.css
-
Conflicts: app/controllers/my_profile/tasks_controller.rb app/views/tasks/_task.html.erb public/javascripts/tasks.js
26 May, 2015
4 commits
-
Conflicts: app/controllers/my_profile/tasks_controller.rb app/models/task.rb test/functional/tasks_controller_test.rb
21 May, 2015
1 commit
-
Conflicts: app/views/content_viewer/_article_toolbar.html.erb