Charles Oliveira / noosfero

07 Jul, 2014

1 commit

cd9f3f94 Merge branch 'AI3133-email_article_to_community_members' into rails3_stable ... Browse Code »
```
Conflicts:
	app/views/content_viewer/_article_toolbar.rhtml
```
Victor Costa
2014-07-07 10:53:47 -0300

03 Jul, 2014

4 commits

6416c696 Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-07-03 17:58:29 -0300
af6238af Merge branch 'master' into rails3 Browse Code »

Victor Costa
2014-07-03 17:58:13 -0300
318eef83 edit-article-feature: fix selenium tests ... Browse Code »
```
Was necessary to include "should see" on the links before following them
in order for the test to work.
```
Rodrigo Souto
2014-07-03 15:33:18 +0000
8196cacf comment-feature: remove useless test ... Browse Code »
```
The test wasn't testing the order at all.
```
Rodrigo Souto
2014-07-03 14:22:07 +0000

01 Jul, 2014

1 commit

07f66267 comments: fix sort comments ... Browse Code »
```
ActionItem3185
```
Rodrigo Souto
2014-07-01 21:23:06 +0000

30 Jun, 2014

4 commits

14f170ac Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-06-30 16:20:58 -0300
5d152dc4 rails3: fix inclusion of theme's js Browse Code »

Victor Costa
2014-06-30 16:20:36 -0300
3192fbdc Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-06-30 11:52:13 -0300
fb090c19 Merge branch 'master' into rails3 Browse Code »

Victor Costa
2014-06-30 11:51:13 -0300

27 Jun, 2014

5 commits

2a264586 Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-06-27 15:15:38 -0300
56a0d4fa rails3: fix people_block translation Browse Code »

Victor Costa
2014-06-27 15:15:15 -0300
db82bf4c clickable-images-feature: simulate hover to display zoom link Browse Code »

Rodrigo Souto
2014-06-27 15:15:03 +0000
c8372b95 Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-06-27 10:15:35 -0300
0f4a925e rails3: fix people_block plugin Browse Code »

Victor Costa
2014-06-27 10:15:17 -0300

26 Jun, 2014

22 commits

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

Leandro Santos
2014-06-26 17:21:29 -0300
0de5286e Merge branches 'rails3' and 'rails3_AI3033-serpro_integration' into rails3_AI3033-serpro_integration Browse Code »

Leandro Santos
2014-06-26 17:20:32 -0300
4b62288d updating with rails3 branch Browse Code »

Leandro Santos
2014-06-26 17:20:06 -0300
804762ae Merge branches 'rails3' and 'rails3_stable' into rails3_stable Browse Code »

Leandro Santos
2014-06-26 17:13:41 -0300
a20452cd removing assert_local_files_reference from test helper and its references. These… ... Browse Code »
```
… tests does not make sense
```
Leandro Santos
2014-06-26 17:13:10 -0300
01efcccd Merge branch 'rails3' of gitlab.com:participa/noosfero into rails3 Browse Code »

Leandro Santos
2014-06-26 16:48:40 -0300
15b2009b fixing conflit Browse Code »

Leandro Santos
2014-06-26 16:48:31 -0300
bc15cd15 Update schema timestamp Browse Code »

Rodrigo Souto
2014-06-26 19:47:58 +0000
f052db05 display_content: include profile when list items Browse Code »

Victor Costa
2014-06-26 16:45:43 -0300

36bf2baf Merge branch 'AI3171-categories_block_bug' into 'master' ... Browse Code »

Ai3171 categories block bug

This MR fix the problem that makes feature/categories_block.feature cucumber/selenium test fails.

Detailed description: http://noosfero.org/Development/ActionItem3171

2014-06-26 19:27:50 +0000

ca21945c add require false to mocha gem to avoid lots of unexpected invocation Browse Code »

Leandro Santos
2014-06-26 16:12:11 -0300
84645da3 Typo fix Browse Code »

Rodrigo Souto
2014-06-26 18:47:16 +0000
e387ff00 Merge branch 'content_viewer_refactoring' of https://gitlab.com/arthurmde/noosfe… ... Browse Code »
```
…ro into arthurmde/noosfero-content_viewer_refactoring
```
Rodrigo Souto
2014-06-26 18:40:26 +0000
4bb32eac user-mailer: move mailer views to correct folder ... Browse Code »
```
ActionItem3174
```
Rodrigo Souto
2014-06-26 18:37:56 +0000
131e0932 rails3: fix encoding Browse Code »

Victor Costa
2014-06-26 15:27:04 -0300
aa29773a Not display administration link to common users ... Browse Code »
```
ActionItem3173
```
Rodrigo Souto
2014-06-26 18:04:47 +0000
8175d7fb Merge branch 'master' of gitlab.com:noosfero/noosfero Browse Code »

Rodrigo Souto
2014-06-26 17:03:37 +0000
879fcd99 stoa-plugin: use file relative path on install Browse Code »

Rodrigo Souto
2014-06-26 13:06:39 -0300
46ea1799 Merge remote-tracking branch 'larissa/stoa-plugin-rails3' into larissa-stoa-plugin-rails3 Browse Code »

Rodrigo Souto
2014-06-26 12:53:27 -0300
24bc3c87 removing html validation to remove tidy dependency. This library is not mantaine… ... Browse Code »
```
…d anymore. Otherwise there is more effectively method to validate html nowadays
```
Leandro Santos
2014-06-26 12:40:43 -0300
892f430c removing eventmachine from Gemfile.lock and adding mocha lib to Gemfile test group Browse Code »

Leandro Santos
2014-06-26 12:02:35 -0300
4659ac66 Merge branch 'master' into rails3 ... Browse Code »
```
Conflicts:
	app/models/person.rb
```
Victor Costa
2014-06-26 11:22:38 -0300

24 Jun, 2014

3 commits

00cf38bc Merge branch 'AI3147-edit_profile_bug' into 'master' ... Browse Code »

AI3147 edit profile bug

Added support for mass-assignment for all of person's, community's and enterprise's fields.

Before this, if a environment admin enabled all fields on the fields environment page, you got an error when trying to edit a profile.

The Action Item was created at: http://noosfero.org/Development/ActionItem3147

2014-06-24 18:03:09 +0000

0d740187 profile_editor: added mass-assign support for enterprise fields ... Browse Code »
```
Added mass-assign support for all enterprise's field that are configurable on
the fields environment page.

(ActionItem3147)
```
Daniel
2014-06-24 14:39:07 -0300
eeafd08c profile_editor: added mass-assign support for community fields ... Browse Code »
```
Added mass-assign support for all community's field that are configurable on
the fields environment page.

(ActionItem3147)
```
Daniel
2014-06-24 14:22:43 -0300