Charles Oliveira / noosfero

08 Aug, 2014

21 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
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

3 commits

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

Leandro Santos
2014-08-06 11:12:01 -0300
43924df5 fixing conflit Browse Code »

Leandro Santos
2014-08-06 11:10:32 -0300
3275c783 add hook for gitlab projects Browse Code »

Leandro Santos
2014-08-06 11:03:07 -0300

05 Aug, 2014

2 commits

5d182131 fix typo Browse Code »

Antonio Terceiro
2014-08-05 11:34:03 -0300

7bc084d6 debian-wheezy.sh: use download.noosfero.org ... Browse Code »

This fixes the creation of development environments after
people.debian.org started redirecting to https. Also, it needed to be
done anyway since we want to self-host our stuff at nooosfero.org

2014-08-05 11:11:33 -0300

04 Aug, 2014

4 commits

b8bcd24b Remove merge artifact added by mistake Browse Code »

Antonio Terceiro
2014-08-04 17:04:56 -0300
be6c3d11 re-add dependency on rest-client ... Browse Code »
```
Now make sure it will be installed together with the Debian package
```
Antonio Terceiro
2014-08-04 16:49:42 -0300

d8a41cb3 script/quick-start: run bundle in local mode ... Browse Code »

This will avoid downloading dependencies from rubygems.org behind your
back when you are using dependencies from Debian+Noosfero APT
repository.

2014-08-04 15:21:34 -0300

04971f7f Remove unused dependency Browse Code »

Antonio Terceiro
2014-08-04 15:19:18 -0300

01 Aug, 2014

3 commits

cab02175 serpro_integration: fix jenkins integration Browse Code »

Victor Costa
2014-08-01 15:14:27 -0300
944c01f8 Merge remote-tracking branch 'origin/rails3' Browse Code »

Antonio Terceiro
2014-08-01 10:01:36 -0300
1a4eb038 Merge branch 'AI3254-product_info_bug' into 'master' ... Browse Code »
```
Ai3254 product info bug

Fixing rails 3 bug -> https://noosfero.org/Development/ActionItem3254

See merge request !283
```
Antonio Terceiro
2014-08-01 12:52:53 +0000

31 Jul, 2014

6 commits

ed1cf4da Add attr_accessible to basic product informations attributes ... Browse Code »
```
(ActionItem3254)
```
Arthur Esposte
2014-07-31 17:08:22 -0300

52eced61 Merge branch 'AI3023-translucent-notice-ballon' into 'master' ... Browse Code »

Ai3023 translucent notice ballon

Usability issue:

When I login, logout or do any operation that returns a massage on the notice div, I can't click on the element behind.

See merge request !236

2014-07-31 19:46:54 +0000

d66e2c41 Merge branch 'AI3252-product_categories_block_bug' into 'master' ... Browse Code »
```
Ai3252 product categories block bug

Fixing ArgumentError in Profile_editor#index bug: https://noosfero.org/Development/ActionItem3252

See merge request !282
```
Antonio Terceiro
2014-07-31 19:17:17 +0000
94ec3b40 Merge branch 'AI3244_limit_block_item' into 'master' ... Browse Code »
```
Ai3244 limit block item

Fixing AI -> http://noosfero.org/Development/ActionItem3244

See merge request !277
```
Antonio Terceiro
2014-07-31 19:16:50 +0000
ecf1da40 Merge branch 'AI3249-redirecion_attr_bug' into 'master' ... Browse Code »
```
Ai3249 redirecion attr bug

Fixing rails 3 bug: http://noosfero.org/Development/ActionItem3249

See merge request !274
```
Antonio Terceiro
2014-07-31 18:39:32 +0000

5fd21cea Merge branch 'AI3193-zoom_image_bug' into 'master' ... Browse Code »

Ai3193 zoom image bug

Fixing rails 3 bug: http://noosfero.org/Development/ActionItem3193

We've just upgraded the fancybox version from 1.3.4 to 2.1.5

See merge request !270

2014-07-31 18:37:35 +0000