Charles Oliveira / noosfero

17 Jun, 2015

6 commits

d91cb9dd Merge branch 'production' of gitlab.com:participa/noosfero into production Browse Dir »

Evandro Jr
2015-06-17 14:28:09 -0300
bc5ce53f Merge branch 'production' of gitlab.com:participa/noosfero into production ... Browse Dir »
```
Conflicts:
	app/views/cms/_event.html.erb
```
Evandro Jr
2015-06-17 14:27:04 -0300
122ef265 Merge branch 'email_template' into production Browse Dir »

Victor Costa
2015-06-17 14:24:37 -0300
f55f3ef9 Add new permission to manage email templates Browse Dir »

Victor Costa
2015-06-17 14:23:54 -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
77d9cc0a Revert "Merge branch 'change_start_and_end_date_to_datetime' into production" ... Browse Dir »
```
This reverts commit dca569a4b682f150e8e9e3116ea7b14843651e44, reversing
changes made to 364e52a3cfbc1b6a0943d99e31dba1880e1111fa.
```
Victor Costa
2015-06-17 11:00:26 -0300

16 Jun, 2015

7 commits

dca569a4 Merge branch 'change_start_and_end_date_to_datetime' into production Browse Dir »

Evandro Jr
2015-06-16 18:18:28 -0300
364e52a3 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	lib/noosfero/plugin.rb
```
Victor Costa
2015-06-16 18:16:44 -0300
0d9bdbdf Select task rejection email from template Browse Dir »

Victor Costa
2015-06-16 18:13:59 -0300
5cdd7db7 folder: let word wrap work (do not short filenames) ... Browse Dir »
```
This also removes short_filename as it is now unused
```
Braulio Bhavamitra
2015-06-16 17:19:04 -0300
a602848f adds start time, end time and presenter Browse Dir »

Evandro Jr
2015-06-16 16:45:17 -0300
bff21134 Define multiple types for email templates Browse Dir »

Victor Costa
2015-06-16 15:10:16 -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

e083ea4a A new model to store email templates Browse Dir »

Victor Costa
2015-06-15 17:17:39 -0300

12 Jun, 2015

2 commits

b8629708 Add date format option for articles from the environment ... Browse Dir »

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>

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

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

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

2540b45c Fix tests related to privacity ... Browse Dir »

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>

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