Charles Oliveira / noosfero

18 Jun, 2015

1 commit

f93c29c5 Fix not found page Browse Dir »

Victor Costa
2015-06-18 14:27:50 -0300

17 Jun, 2015

15 commits

410b9cba Fix event warning Browse Dir »

Victor Costa
2015-06-17 22:30:29 -0300
21adb295 Merge branch 'api' into production Browse Dir »

Victor Costa
2015-06-17 20:36:28 -0300
33d70c93 Article Following - initial version ... Browse Dir »
```
Conflicts:

	app/models/article.rb
```
Carlos Purificação
2015-06-17 18:38:36 -0300
404d7620 Article Following - initial version ... Browse Dir »
```
Conflicts:

	app/models/article.rb
```
Carlos Purificação
2015-06-17 18:30:50 -0300
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
8f14851f Merge branch 'change_start_and_end_date_to_datetime' into production ... Browse Dir »
```
Conflicts:
	app/views/cms/_event.html.erb
```
Evandro Jr
2015-06-17 14:21:47 -0300
a522623b Adds support to time (HH:MM) in Events Browse Dir »

Evandro Jr
2015-06-17 13:52:09 -0300
cbe76440 Merge branch 'email_template' into production Browse Dir »

Victor Costa
2015-06-17 13:11:01 -0300
6ab04f0c Fix task mailer content type for templates Browse Dir »

Victor Costa
2015-06-17 13:10:50 -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
2df11dd7 Improve layout of email templates list Browse Dir »

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

16 Jun, 2015

10 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
a7adb70b Merge branch 'ai3217' into 'master' ... Browse Dir »
```
Expire LocationBlock cache on profile's location change

http://noosfero.org/Development/ActionItem3217

See merge request !259
```
Braulio Bhavamitra
2015-06-16 17:23:51 +0000
97829943 Search category with an autocomplete ... Browse Dir »
```
(ActionItem3149)
```
Braulio Bhavamitra
2015-06-16 14:05:29 -0300
97c7bad1 Add last update column on cms listing ... Browse Dir »
```
Conflicts:
	app/views/cms/_view_items.html.erb
	config/locales/en.yml
```
Braulio Bhavamitra
2015-06-16 11:42:46 -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

5 commits

208ec37b display-article: use proper way to fetch thumbnail Browse Dir »

Rodrigo Souto
2015-06-12 14:40:53 -0300

dbea8847 Refactor deprecated code for date to use rails method ... Browse Dir »

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2015-06-12 13:33:36 -0300

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

a349d8fa edit-article: move escaped body to fix save and edit feature Browse Dir »

Rodrigo Souto
2015-06-12 12:35:37 -0300

11 Jun, 2015

6 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

512dd39f cms-controller-test: fix edit for rss Browse Dir »

Rodrigo Souto
2015-06-11 16:25:58 -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

2c72cbbf Handle access denied to not logged user properly Browse Dir »

Arthur Esposte
2015-06-11 14:21:45 -0300
944722f4 Merge branch 'raw-html-article-edit' into 'master' ... Browse Dir »
```
raw-html-article: escape body before rendering on edit

See merge request !557
```
Larissa Reis
2015-06-11 12:52:52 +0000

08 Jun, 2015

2 commits

97e657da organizations: remove mistaken enabled? method Browse Dir »

Rodrigo Souto
2015-06-08 15:54:52 -0300
3ce0f54e Merge branch 'master' into production Browse Dir »

Victor Costa
2015-06-08 10:46:33 -0300