Charles Oliveira / noosfero

08 Jul, 2015

1 commit

071efeec Merge branch 'task_taggable' into production Browse Dir »

Michel Felipe
2015-07-08 18:19:24 -0300

07 Jul, 2015

1 commit

71adef25 updating submodules Browse Dir »

Leandro Santos
2015-07-07 07:56:58 -0300

06 Jul, 2015

3 commits

933d3771 Merge branch 'email_template' into production ... Browse Dir »
```
Conflicts:
	app/models/article.rb
	test/functional/tasks_controller_test.rb
```
Victor Costa
2015-07-06 17:03:26 -0300
8a4dc901 Choose email template when accept a task Browse Dir »

Victor Costa
2015-07-06 17:00:43 -0300
95274446 Added public method 'addIcon' to Task module in tasks.js Browse Dir »

Michel Felipe
2015-07-06 12:13:23 -0300

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

25 Jun, 2015

2 commits

83c8e2dc Search category with an autocomplete ... Browse Dir »
```
(ActionItem3149)
```
Braulio Bhavamitra
2015-06-25 17:04:29 -0300
6f885f13 Fix JS that was trying to return something null ... Browse Dir »
```
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Gabriela Navarro
2015-06-25 17:04:28 -0300

20 Jun, 2015

1 commit

bfa27a7b asset-pipeline: add missed selectordie from _javascripts.html.erb Browse Dir »

Braulio Bhavamitra
2015-06-20 22:21:56 -0300

19 Jun, 2015

1 commit

f7e0bbf3 themes/base/style.css: remove invalid CSS declaration ... Browse Dir »
```
This was breaking the asset pipeline for me when running in production
mode
```
Antonio Terceiro
2015-06-19 18:19:22 -0300

17 Jun, 2015

6 commits

c055f168 Merge branch 'tokeninput-dont-focus-on-init' into 'master' ... Browse Dir »

tokeninput: don't focus on init to avoid page scroll down

This happens for example on /admin/features with feature members_whitelist_enabled
with one member added, the page will load and scroll to token input

See merge request !594

2015-06-17 23:01:26 +0000

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

11bca1cb Merge branch 'view-comments' into 'master' ... Browse Dir »
```
application-js: encapsulate dom element on jQuery before calling hide()

See merge request !556
```
Braulio Bhavamitra
2015-06-17 16:17:51 +0000
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

3 commits

364e52a3 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	lib/noosfero/plugin.rb
```
Victor Costa
2015-06-16 18:16:44 -0300
97829943 Search category with an autocomplete ... Browse Dir »
```
(ActionItem3149)
```
Braulio Bhavamitra
2015-06-16 14:05:29 -0300
d215b232 Option to choose template to send email to members Browse Dir »

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

15 Jun, 2015

1 commit

21759b79 Fix JS that was trying to return something null ... Browse Dir »
```
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Gabriela Navarro
2015-06-15 20:49:15 +0000

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

3 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

57ac92af Fix tests ... Browse Dir »

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

2015-06-11 14:21:45 -0300

09 Jun, 2015

1 commit

e37b3e2f tokeninput: don't focus on init to avoid page scroll down ... Browse Dir »
```
This happens for example on /admin/features with feature members_whitelist_enabled
with one member added, the page will load and scroll to token input
```
Braulio Bhavamitra
2015-06-09 10:29:42 -0300

08 Jun, 2015

2 commits

d51e10ba File pushed by mistake Browse Dir »

Evandro Jr
2015-06-08 19:03:06 -0300
c10c9a67 community_track: fix recursive comment count Browse Dir »

Evandro Jr
2015-06-08 16:44:24 -0300

05 Jun, 2015

2 commits

3c460089 updating submodules Browse Dir »

Leandro Santos
2015-06-05 10:36:10 -0300
d7d222b8 Merge branch 'task_taggable' into production Browse Dir »

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