Charles Oliveira / noosfero

12 Aug, 2014

5 commits

4887d77f Merge branch 'rails3_stable' of gitlab.com:participa/noosfero into rails3_stable Browse Code »

Victor Costa
2014-08-12 09:45:42 -0300
a995a51a Merge branch 'AI2915-category_color' into rails3_stable ... Browse Code »
```
Conflicts:
	app/helpers/application_helper.rb
```
Victor Costa
2014-08-12 09:45:04 -0300
2247304b community_track: add color to track name Browse Code »

Victor Costa
2014-08-12 09:44:07 -0300
53e85962 community_track: added background color to track card Browse Code »

Victor Costa
2014-08-12 09:44:07 -0300
2620604b Change the category color selection to use a colorpicker component. ... Browse Code »
```
The field display_color has turned into char(6) and stores the color rgb hex code.
(ActionItem2915)
```
Victor Costa
2014-08-12 09:44:00 -0300

11 Aug, 2014

10 commits

7db7ec2a Merge branches 'AI3268_template_management' and 'rails3_stable' into rails3_stable Browse Code »

Leandro Santos
2014-08-11 15:50:25 -0300
953ad391 remove reference to enterprise_template= method Browse Code »

Leandro Santos
2014-08-11 15:43:43 -0300
458348bf Merge branches 'AI3268_template_management' and 'rails3_stable' into rails3_stable Browse Code »

Leandro Santos
2014-08-11 15:21:28 -0300
c3b9486b Merge branches 'rails3' and 'AI3268_template_management' into AI3268_template_management Browse Code »

Leandro Santos
2014-08-11 14:24:19 -0300
e707aa99 Put the default template selected by default Browse Code »

Leandro Santos
2014-08-11 14:23:19 -0300
3b569fa2 Add set as default method for templates Browse Code »

Leandro Santos
2014-08-11 14:03:19 -0300
600d8e0f refactoring enterprise template management Browse Code »

Leandro Santos
2014-08-11 11:29:50 -0300
07e24499 refactoring community template management Browse Code »

Leandro Santos
2014-08-11 11:20:14 -0300
d8b65b46 Fix the use of exception notification Browse Code »

Victor Costa
2014-08-11 10:44:26 -0300
ce1288aa Merge branches 'rails3' and 'AI3268_template_management' into AI3268_template_management Browse Code »

Leandro Santos
2014-08-11 10:42:38 -0300

08 Aug, 2014

23 commits

5db13f32 Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-08-08 19:09:51 -0300
6005549e Merge branch 'master' into rails3 Browse Code »

Victor Costa
2014-08-08 19:09:21 -0300
b6c58a29 Set default tag context for article taggings Browse Code »

Victor Costa
2014-08-08 19:08:02 -0300

4240874a Merge branch 'AI2915-category_color' into rails3_stable ... Browse Code »

Conflicts:
	plugins/community_track/lib/community_track_plugin/track_helper.rb
	plugins/community_track/test/unit/community_track_plugin/track_helper_test.rb

2014-08-08 16:59:12 -0300

70dcb5e9 community_track: add color to track name Browse Code »

Victor Costa
2014-08-08 16:58:15 -0300
c8ce3566 community_track: added background color to track card Browse Code »

Victor Costa
2014-08-08 16:57:45 -0300
3b18ff42 Merge branch 'AI2915-category_color' into rails3_stable ... Browse Code »
```
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/categories_helper.rb
	db/migrate/20140807134625_change_category_display_color_to_string.rb
```
Victor Costa
2014-08-08 15:02:45 -0300
09811012 Added background color to track card Browse Code »

Victor Costa
2014-08-08 14:59:39 -0300
262426cb Change the category color selection to use a colorpicker component. ... Browse Code »
```
The field display_color has turned into char(6) and stores the color rgb hex code.
(ActionItem2915)
```
Victor Costa
2014-08-08 14:50:27 -0300
c4aa0587 Merge branch 'AI3269_link-article' into rails3_stable Browse Code »

Victor Costa
2014-08-08 13:53:34 -0300
f710300a Copy parent and highlighted attributes to link article Browse Code »

Victor Costa
2014-08-08 13:52:54 -0300
72cfd581 Merge branches 'rails3' and 'ActionItem3268_template_management' into ActionItem… ... Browse Code »
```
…3268_template_management
```
Leandro Santos
2014-08-08 13:08:15 -0300
b2083dec refactoring person template management Browse Code »

Leandro Santos
2014-08-08 13:06:57 -0300
8e391c43 Merge branch 'AI3269_link-article' into rails3_stable Browse Code »

Victor Costa
2014-08-08 12:40:53 -0300
3dda03d2 Added body and abstract to link article Browse Code »

Victor Costa
2014-08-08 12:40:37 -0300
5c1caa38 Merge branch 'AI3269_link-article' into rails3_stable Browse Code »

Victor Costa
2014-08-08 12:32:19 -0300
9913add2 Add custom edit page for link article Browse Code »

Victor Costa
2014-08-08 12:31:59 -0300

3bc3acc2 Fix version of eventmachine ... Browse Code »

The Debian package provided by the Noosfero repository reported 0.12.11
(which was never uploaded to rubygems.org), although it was actualy
0.12.10. A fixed packages was just made available.

This should fix stuff for people installing all the dependencies via
rubygems.

2014-08-08 12:11:45 -0300

c85446f9 Merge branch 'AI2915-category_color' into rails3_stable ... Browse Code »
```
Conflicts:
	app/helpers/application_helper.rb
```
Victor Costa
2014-08-08 12:02:46 -0300
3300e3ed Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-08-08 11:11:54 -0300
56f0dd6e Fix routes for base plugins Browse Code »

Victor Costa
2014-08-08 11:11:25 -0300
08c7da41 Merge branch 'AI3269_link-article' into rails3_stable Browse Code »

Victor Costa
2014-08-08 10:44:20 -0300
1dfcb26d Added a option to create a link when approve an article Browse Code »

Victor Costa
2014-08-08 10:30:28 -0300

07 Aug, 2014

1 commit

8f79b72d Change the category color selection to use a colorpicker component. ... Browse Code »
```
The field display_color has turned into char(6) and stores the color rgb hex code.
(ActionItem2915)
```
Victor Costa
2014-08-07 18:20:10 -0300

06 Aug, 2014

1 commit

e57b9392 Merge branches 'rails3_AI3033-serpro_integration' and 'rails3_stable' into rails3_stable Browse Code »

Leandro Santos
2014-08-06 11:12:01 -0300