NoosferoGov / noosfero

18 Jun, 2015

5 commits

4db503d6 new translantions Browse Code »

Evandro Jr
2015-06-18 14:15:48 -0300
140ce4f8 Merge branch 'api' into production Browse Code »

Victor Costa
2015-06-18 10:29:28 -0300
eced5f5b api: validate follower Browse Code »

Victor Costa
2015-06-18 10:29:09 -0300
ac1866da Merge branch 'api' into production Browse Code »

Victor Costa
2015-06-18 10:19:44 -0300
14c80590 api: validate follower Browse Code »

Victor Costa
2015-06-18 10:19:23 -0300

17 Jun, 2015

21 commits

410b9cba Fix event warning Browse Code »

Victor Costa
2015-06-17 22:30:29 -0300
2368cdb3 Merge branch 'api' into production Browse Code »

Victor Costa
2015-06-17 22:06:04 -0300
e1f5a612 api: fix article follow Browse Code »

Victor Costa
2015-06-17 22:05:53 -0300
88dd46f0 Merge branch 'api' into production Browse Code »

Victor Costa
2015-06-17 20:37:53 -0300
30c569f6 Fix followers count Browse Code »

Victor Costa
2015-06-17 20:37:41 -0300
21adb295 Merge branch 'api' into production Browse Code »

Victor Costa
2015-06-17 20:36:28 -0300
9a7a82c2 Returns the total followers for the article ... Browse Code »
```
Add a follower for the article
the commit message for your changes. Lines starting
```
Evandro Jr
2015-06-17 19:06:05 -0300
33d70c93 Article Following - initial version ... Browse Code »
```
Conflicts:

	app/models/article.rb
```
Carlos Purificação
2015-06-17 18:38:36 -0300
404d7620 Article Following - initial version ... Browse Code »
```
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 Code »

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

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

Victor Costa
2015-06-17 14:23:54 -0300
8f14851f Merge branch 'change_start_and_end_date_to_datetime' into production ... Browse Code »
```
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 Code »

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

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

Victor Costa
2015-06-17 13:10:50 -0300
966a6762 virtuoso: fix dependency Browse Code »

Victor Costa
2015-06-17 12:20:58 -0300
01a73fbc Merge branch 'email_template' into production ... Browse Code »
```
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 Code »
```
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 Code »

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

16 Jun, 2015

14 commits

dca569a4 Merge branch 'change_start_and_end_date_to_datetime' into production Browse Code »

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

Victor Costa
2015-06-16 18:13:59 -0300
4eb04441 Merge branch 'folder-with-full-filenames' into 'master' ... Browse Code »
```
folder: let word wrap work (do not short filenames)

See merge request !503
```
Braulio Bhavamitra
2015-06-16 20:34:13 +0000
5cdd7db7 folder: let word wrap work (do not short filenames) ... Browse Code »
```
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 Code »

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

Victor Costa
2015-06-16 15:10:16 -0300
53ccf362 Shorten index names Browse Code »

Braulio Bhavamitra
2015-06-16 15:02:32 -0300
a7adb70b Merge branch 'ai3217' into 'master' ... Browse Code »
```
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
b3d0fde2 Merge branch 'ai3149' into 'master' ... Browse Code »
```
Search category with an autocomplete

http://noosfero.org/Development/ActionItem3149

See merge request !227
```
Braulio Bhavamitra
2015-06-16 17:21:07 +0000
55dc89bc Merge branch 'ai3197' into 'master' ... Browse Code »
```
Speed up role assignments fetch

http://noosfero.org/Development/ActionItem3197

See merge request !252
```
Braulio Bhavamitra
2015-06-16 17:12:06 +0000
97829943 Search category with an autocomplete ... Browse Code »
```
(ActionItem3149)
```
Braulio Bhavamitra
2015-06-16 14:05:29 -0300
ee80381a Merge branch 'ai2982' into 'master' ... Browse Code »
```
Add column last update in the CMS file listings

http://noosfero.org/Development/ActionItem2982

See merge request !105
```
Braulio Bhavamitra
2015-06-16 14:45:41 +0000
97c7bad1 Add last update column on cms listing ... Browse Code »
```
Conflicts:
	app/views/cms/_view_items.html.erb
	config/locales/en.yml
```
Braulio Bhavamitra
2015-06-16 11:42:46 -0300