Charles Oliveira / noosfero

03 Jul, 2015

1 commit

ea468c0e Merge branch 'block-admin-mail' into production ... Browse Dir »
```
Conflicts:
	app/models/event.rb
	app/models/profile.rb
	po/fr/noosfero.po
```
Victor Costa
2015-07-03 10:45:54 -0300

01 Jul, 2015

1 commit

06f96ca8 fix conflit with add_members_community Browse Dir »

Leandro Santos
2015-07-01 18:10:44 -0300

30 Jun, 2015

4 commits

3d9ba6b1 Merge branch 'processed_tasks' into production ... Browse Dir »
```
Conflicts:
	app/views/tasks/processed.html.erb
	public/stylesheets/tasks.css
```
Victor Costa
2015-06-30 11:34:19 -0300
6905648c Improve listing of processed tasks Browse Dir »

Victor Costa
2015-06-30 11:32:42 -0300
786d3c66 Merge branch 'processed_tasks' into production ... Browse Dir »
```
Conflicts:
	app/views/tasks/processed.html.erb
	public/stylesheets/tasks.css
```
Victor Costa
2015-06-30 10:52:31 -0300
e9c22c7f Improve listing of processed tasks Browse Dir »

Victor Costa
2015-06-30 10:35:35 -0300

29 Jun, 2015

6 commits

4d97466d Merge branch 'processed_tasks' into production Browse Dir »

Victor Costa
2015-06-29 17:25:05 -0300
013cb185 Improve processed tasks view Browse Dir »

Victor Costa
2015-06-29 17:24:30 -0300
4012f329 Merge branch 'processed_tasks' into production Browse Dir »

Victor Costa
2015-06-29 17:09:36 -0300
05361395 Improve processed tasks view Browse Dir »

Victor Costa
2015-06-29 17:09:23 -0300
4ac8b06a Merge branch 'processed_tasks' into production ... Browse Dir »
```
Conflicts:
	public/stylesheets/tasks.css
```
Victor Costa
2015-06-29 16:45:17 -0300
e21366f1 Improve listing of processed tasks Browse Dir »

Victor Costa
2015-06-29 16:42:56 -0300

17 Jun, 2015

4 commits

5ddb93d8 Improved event display layout ... Browse Dir »

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
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: Tallys Martins <tallysmartins@gmail.com>

2015-06-17 15:19:06 -0300

5ee24034 Refactoring article content visualization ... Browse Dir »

  - Added image label
  - Added image to article body
  - Changed some minor positioning

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fábio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-06-17 15:19:06 -0300

01a73fbc Merge branch 'email_template' into production ... Browse Dir »
```
Conflicts:
	Gemfile
	public/proposal-app
	public/stylesheets/application.css
```
Victor Costa
2015-06-17 11:01:44 -0300
2df11dd7 Improve layout of email templates list Browse Dir »

Victor Costa
2015-06-17 10:48:36 -0300

16 Jun, 2015

2 commits

364e52a3 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	lib/noosfero/plugin.rb
```
Victor Costa
2015-06-16 18:16:44 -0300
d215b232 Option to choose template to send email to members Browse Dir »

Victor Costa
2015-06-16 11:10:38 -0300

12 Jun, 2015

1 commit

769eb2c5 Add new visualization option for blog posts. ... Browse Dir »

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>

2015-06-12 13:03:20 -0300

11 Jun, 2015

2 commits

b49fa908 Adding bigger icons when displaying folders ... Browse Dir »
```
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
```
André Guedes
2015-06-11 16:43:09 -0300

bbcc0618 Improvments on folder visualization ... Browse Dir »

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

2015-06-11 16:43:09 -0300

05 Jun, 2015

1 commit

d7d222b8 Merge branch 'task_taggable' into production Browse Dir »

Leandro Santos
2015-06-05 08:38:13 -0300

03 Jun, 2015

1 commit

72ec6ae5 Refactor in tasks.js to create a singleton 'Task', show success icon after save … ... Browse Dir »
```
…each tag and tasks.css changes
```
Michel Felipe
2015-06-03 17:52:33 -0300

02 Jun, 2015

1 commit

b39a1a37 merging with master Browse Dir »

Leandro Santos
2015-06-02 14:15:49 -0300

01 Jun, 2015

1 commit

c5c42a0b chat window should be displayed on top of all Browse Dir »

Joenio Costa
2015-06-01 16:42:41 -0300

30 May, 2015

1 commit

eedb7167 Add responsible attribute to task Browse Dir »

Victor Costa
2015-05-30 22:07:24 -0300

28 May, 2015

4 commits

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

1 commit

35dde2bd Merge branch 'task_taggable' into production ... Browse Dir »
```
Conflicts:
	public/stylesheets/tasks.css
```
Victor Costa
2015-05-27 16:36:40 -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

20 May, 2015

1 commit

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

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

12 May, 2015

2 commits

ea5d6c29 merging with master Browse Dir »

Leandro Santos
2015-05-12 21:45:22 -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

08 May, 2015

1 commit

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

17 Apr, 2015

1 commit

ee4d9a08 Merge branch 'security-search' into stable Browse Dir »

Leandro Santos
2015-04-17 12:23:38 -0300