Charles Oliveira / noosfero

28 May, 2015

6 commits

fc18feab Adds sniffer plugin ... Browse Dir »
```
  A plugin to help enterprises find consumers and suppliers for their
  products
```
Larissa Reis
2015-05-28 23:46:13 -0300
46998fbb Remove default Brazil reference from google_maps.js ... Browse Dir »
```
The mapLoad method is also more configurable now.

Signed-off-by: Larissa Reis <larissa@colivre.coop.br>
```
Aurélio A. Heckert
2015-05-28 23:46:13 -0300

1c125da7 chat fixes and new features ... Browse Dir »

* 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>

2015-05-28 18:09:56 -0300

4c1e0c9f admin-panel: refactoring of manage organizations ... Browse Dir »

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>

2015-05-28 12:49:23 -0300

aa514668 Merge branch 'master' into production Browse Dir »

Victor Costa
2015-05-28 10:48:05 -0300
726cd88c Added field created_at above the task title on tasks list Browse Dir »

Michel Felipe
2015-05-28 10:35:23 -0300

27 May, 2015

3 commits

35dde2bd Merge branch 'task_taggable' into production ... Browse Dir »
```
Conflicts:
	public/stylesheets/tasks.css
```
Victor Costa
2015-05-27 16:36:40 -0300
cdd82a9c Merge branch 'task_responsible' into production ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/tasks_controller.rb
	app/views/tasks/_task.html.erb
	public/javascripts/tasks.js
```
Victor Costa
2015-05-27 16:27:22 -0300
50033fd3 Add responsible attribute to task Browse Dir »

Victor Costa
2015-05-27 16:23:00 -0300

26 May, 2015

4 commits

ce1c8afe Added tags widget on tasks list using inputosaurus jquery plugin Browse Dir »

Michel Felipe
2015-05-26 22:17:47 -0300
f4d896de Merge branch 'task_responsible' into production Browse Dir »

Victor Costa
2015-05-26 16:40:19 -0300
9c63de56 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/tasks_controller.rb
	app/models/task.rb
	test/functional/tasks_controller_test.rb
```
Victor Costa
2015-05-26 16:40:02 -0300
6a851713 Add responsible attribute to task Browse Dir »

Victor Costa
2015-05-26 16:18:07 -0300

21 May, 2015

1 commit

f8a595c3 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	app/views/content_viewer/_article_toolbar.html.erb
```
Victor Costa
2015-05-21 14:28:17 -0300

20 May, 2015

1 commit

7c9de6db forum: improved topic creation permissions configuration Browse Dir »

Rodrigo Souto
2015-05-20 18:50:05 -0300

19 May, 2015

2 commits

d66c3542 refactoring fullscreen url parameter activation Browse Dir »

Leandro Santos
2015-05-19 18:05:40 -0300
e152b3a2 Enables fullscreen view for article view and edit Browse Dir »

Evandro Junior
2015-05-19 17:51:26 -0300

12 May, 2015

12 commits

aef952f9 merging with serpro-context Browse Dir »

Leandro Santos
2015-05-12 21:56:34 -0300
ea5d6c29 merging with master Browse Dir »

Leandro Santos
2015-05-12 21:45:22 -0300
cc81e075 merging with master Browse Dir »

Leandro Santos
2015-05-12 18:12:03 -0300
97e6b3c1 updating submodule Browse Dir »

Leandro Santos
2015-05-12 18:09:02 -0300
8e131944 adding require-login-popup for actions that must be logged in to work Browse Dir »

Leandro Santos
2015-05-12 17:19:26 -0300
af08948e Infra to display login popup when not logged users click in a link Browse Dir »

Victor Costa
2015-05-12 17:19:26 -0300
49914a4d Remove unnecessary CSS ... Browse Dir »
```
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
```
Fabio Teixeira
2015-05-12 13:15:35 -0300
a942a1e4 Make box-2 stay align with box-4 ... Browse Dir »
```
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
```
Fabio Teixeira
2015-05-12 13:15:35 -0300
cd1a5cd2 Allow noosfero template system to use javascript ... Browse Dir »
```
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
```
Fabio Teixeira
2015-05-12 13:15:35 -0300
d82b1b03 Change blocks position ... Browse Dir »
```
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
```
Fabio Teixeira
2015-05-12 13:15:35 -0300

f82f1955 Add new layout template with 4 boxes ... Browse Dir »

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>

2015-05-12 13:15:35 -0300

f013c65a Fix Top and Left Bar bug, the Top Bar was in below ... Browse Dir »
```
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
```
Luciano Prestes
2015-05-12 13:15:35 -0300

08 May, 2015

2 commits

201327e1 Created tests for the new controller and added images ... Browse Dir »
```
	Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
```
André Guedes
2015-05-08 16:13:55 -0300

148b47c5 Added assign option to roles ... Browse Dir »

  Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
  Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
  Signed-off-by: André Bernardes <andrebsguedes@gmail.com>

2015-05-08 16:13:55 -0300

27 Apr, 2015

1 commit

ea03b2d7 Merge branch 'api' into stable ... Browse Dir »
```
Conflicts:
	test/unit/block_test.rb
```
Victor Costa
2015-04-27 19:54:43 -0300

24 Apr, 2015

3 commits

8a1f6b80 updating submodules Browse Dir »

Leandro Santos
2015-04-24 13:04:44 -0300
62b2efa9 Merge branch 'serpro-context' into stable Browse Dir »

Leandro Santos
2015-04-24 13:04:24 -0300
a7205a05 ProposalApp: updating submodule Browse Dir »

Leandro Santos
2015-04-24 13:03:51 -0300

23 Apr, 2015

1 commit

fc901fc8 Update proposal-app Browse Dir »

Victor Costa
2015-04-23 15:36:56 -0300

22 Apr, 2015

4 commits

82ab76ba report-abuse: use modal url instead of inline Browse Dir »

Rodrigo Souto
2015-04-22 17:15:55 -0300
cb9f5142 Revert "report-abuse: replace modal windwow by colorbox" ... Browse Dir »
```
Mistakenly replaced the correct way of doing modals by the old way.

This reverts commit ed63bab09a77c398c9228030a8ace0f11e9a6268.
```
Rodrigo Souto
2015-04-22 16:42:16 -0300
3e3b34fb Merge branch 'serpro-context' into stable Browse Dir »

Leandro Santos
2015-04-22 14:37:12 -0300
ed58fe02 ProposalAPp: updating submodule Browse Dir »

Leandro Santos
2015-04-22 14:22:37 -0300