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

5 commits

3331bbc7 Implemented the administrator task notification option Browse Dir »

Carlos Purificação
2015-07-01 16:28:48 -0300
9549e2e0 Merge branch 'processed_tasks' into production Browse Dir »

Victor Costa
2015-07-01 10:43:50 -0300
47e76e0b Small fix on list of processed tasks Browse Dir »

Victor Costa
2015-07-01 10:43:28 -0300
0cc41947 Merge branch 'processed_tasks' into production ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/tasks_controller.rb
	app/views/tasks/processed.html.erb
	test/functional/tasks_controller_test.rb
```
Victor Costa
2015-07-01 10:22:39 -0300
0abe320c Refactor processed task filter Browse Dir »

Victor Costa
2015-07-01 10:18:46 -0300

30 Jun, 2015

7 commits

334c1ebd Filter processed tasks by who closes it Browse Dir »

Victor Costa
2015-06-30 15:09:27 -0300
c0bd7efb Merge branch 'processed_tasks' into production Browse Dir »

Victor Costa
2015-06-30 11:54:24 -0300
e92fc4ac Filter processed tasks by who closes it Browse Dir »

Victor Costa
2015-06-30 11:52:05 -0300
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

ef4c95d1 Merge branch 'processed_tasks' into production Browse Dir »

Victor Costa
2015-06-29 17:16:45 -0300
ac25637b Small change on processed tasks view Browse Dir »

Victor Costa
2015-06-29 17:16:31 -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

3 commits

556c20c3 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-25 17:04:29 -0300
83c8e2dc Search category with an autocomplete ... Browse Dir »
```
(ActionItem3149)
```
Braulio Bhavamitra
2015-06-25 17:04:29 -0300
df75ad3f 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-25 17:04:28 -0300

23 Jun, 2015

1 commit

5911b3bf Revert "Disable piwik" ... Browse Dir »
```
This reverts commit 82fc99e4c9a1001771a94c5a585944b2cb9001e3.
```
Victor Costa
2015-06-23 16:15:48 -0300

20 Jun, 2015

1 commit

672dc28b products: fix typo in javascript_include_tag Browse Dir »

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

19 Jun, 2015

1 commit

82fc99e4 Disable piwik Browse Dir »

Victor Costa
2015-06-19 09:02:54 -0300

18 Jun, 2015

5 commits

d65a2fb4 Merge branch 'email_template' into production Browse Dir »

Evandro Jr
2015-06-18 14:52:40 -0300
b12ffc48 Fix for strings Browse Dir »

Evandro Jr
2015-06-18 14:51:53 -0300
9dfdd02b Merge branch 'email_template' into production Browse Dir »

Evandro Jr
2015-06-18 14:48:45 -0300
845e9613 Make strings translateable Browse Dir »

Evandro Jr
2015-06-18 14:47:42 -0300
f93c29c5 Fix not found page Browse Dir »

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

17 Jun, 2015

10 commits

53c76729 content-viewer: use lead instead of straight abstract Browse Dir »

Rodrigo Souto
2015-06-17 15:19:07 -0300

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

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
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
82d3ed8e Merge branch 'ai3150' into 'master' ... Browse Dir »
```
Set current profile and add name and email to user_data

http://noosfero.org/Development/ActionItem3150

See merge request !228
```
Braulio Bhavamitra
2015-06-17 16:28:26 +0000
1910a1d6 Send profile data on user data Browse Dir »

Braulio Bhavamitra
2015-06-17 13:24:20 -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