NoosferoGov / noosfero

17 Aug, 2015

1 commit

856b15e1 fixing unit tests of ckeditor plugin Browse Dir »

Leandro Santos
2015-08-17 16:22:49 -0300

23 Jul, 2014

1 commit

10e3a093 Merge branch 'rails3' into rails3_stable Browse Dir »

Victor Costa
2014-07-23 16:46:56 -0300

22 Jul, 2014

1 commit

2c34624b external-feed: fix timezone issue in test Browse Dir »

Victor Costa
2014-07-22 12:49:15 -0300

17 Jul, 2014

2 commits

c3964d52 Merge branch 'AI3191-private_environment' into rails3_stable ... Browse Dir »
```
Conflicts:
	app/models/environment.rb
```
Victor Costa
2014-07-17 14:13:45 -0300
5fb014fc Merge branch 'rails3' into AI3191-private_environment ... Browse Dir »
```
Conflicts:
	app/models/environment.rb
	app/views/features/index.rhtml
```
Victor Costa
2014-07-17 14:07:15 -0300

09 Jul, 2014

1 commit

b047fb2a add ckeditor plugin Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-07-09 12:08:35 -0300

08 Jul, 2014

2 commits

14a2302f Add a option to enable whitelist in the environment Browse Dir »

Victor Costa
2014-07-08 09:36:10 -0300
f468e3c4 Use tokeninput to edit members whitelist Browse Dir »

Victor Costa
2014-07-08 09:08:40 -0300

07 Jul, 2014

1 commit

623a401d Allow only members in a whitelist to access an anvironment Browse Dir »

Victor Costa
2014-07-07 16:20:02 -0300

04 Jul, 2014

1 commit

abde9210 Added an option to make a environment private Browse Dir »

Victor Costa
2014-07-04 12:01:59 -0300

30 Jun, 2014

2 commits

3192fbdc Merge branch 'rails3' into rails3_stable Browse Dir »

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

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

26 Jun, 2014

4 commits

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

Leandro Santos
2014-06-26 17:21:29 -0300
4b62288d updating with rails3 branch Browse Dir »

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

Leandro Santos
2014-06-26 17:13:41 -0300
aa29773a Not display administration link to common users ... Browse Dir »
```
ActionItem3173
```
Rodrigo Souto
2014-06-26 18:04:47 +0000

24 Jun, 2014

3 commits

0d740187 profile_editor: added mass-assign support for enterprise fields ... Browse Dir »
```
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 Dir »
```
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
768db9b2 profile_editor: added mass-assign support for person's fields ... Browse Dir »
```
Added mass-assign support for all person's field that are configurable on
the fields environment page.

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

17 Jun, 2014

2 commits

e77ff7f1 Merge branch 'rails3' into rails3_stable Browse Dir »

Victor Costa
2014-06-17 10:41:19 -0300
23636102 fixing mass-assignment error in units tests ... Browse Dir »
```
(ActionItem3124)
```
Joenio Costa
2014-06-17 00:09:15 -0300

16 Jun, 2014

3 commits

5065dff0 Merge branch 'master' into AI3124-article_version Browse Dir »

Joenio Costa
2014-06-16 22:49:32 -0300
e936b0ae Allow 'rowspan' and 'colspan' in Noosfero's contents ... Browse Dir »
```
thanks Braulio!
```
Joenio Costa
2014-06-16 22:41:14 -0300
556c40eb Merge remote-tracking branch 'origin/master' Browse Dir »

Joenio Costa
2014-06-16 16:17:31 -0300

15 Jun, 2014

3 commits

c3d1e14e Revert "putting back all references to People, Member and Friends blocks" ... Browse Dir »
```
This reverts commit f8bd2430f86b0b6e3640e2662d1ca689a46ecb98.
```
Joenio Costa
2014-06-15 21:51:18 -0300
d5aef626 Added attr created_by on copy when approve article ... Browse Dir »
```
(ActionItem3097)
```
Daniela Feitosa
2014-06-15 14:48:46 +0000
9fc96fa9 load article's author only when necessary ... Browse Dir »
```
(ActionItem3097)
```
Leandro Santos
2014-06-15 14:35:04 +0000

14 Jun, 2014

1 commit

f8bd2430 putting back all references to People, Member and Friends blocks ... Browse Dir »
```
the PeopleBlock plugin that comes with these blocks is enabled by
default in any Noosfero's environment

(ActionItem2859)
```
Joenio Costa
2014-06-14 00:46:20 -0300

11 Jun, 2014

1 commit

ee205bd5 Merge branch 'rails3' into rails3_stable ... Browse Dir »
```
Conflicts:
	app/models/environment.rb
```
Victor Costa
2014-06-11 09:48:49 -0300

05 Jun, 2014

3 commits

f50ca7fd removing blocks from core Browse Dir »

Joenio Costa
2014-06-05 17:32:46 -0300

e6ca4fb7 Merge branch 'master' into AI2859-people_block ... Browse Dir »

Conflicts:
	app/controllers/admin/environment_design_controller.rb
	app/models/friends_block.rb
	app/models/members_block.rb
	test/functional/environment_design_controller_test.rb
	test/unit/members_block_test.rb

2014-06-05 15:57:38 -0300

303c546a Merge branch 'master' into AI3042-custom_signup_welcome Browse Dir »

Joenio Costa
2014-06-05 13:03:26 -0300

02 Jun, 2014

8 commits

b207e834 Merge branch 'rails235' Browse Dir »

Daniela Feitosa
2014-06-02 20:52:11 -0300
7f13e8f4 Merge branches 'rails3' and 'rails3_AI3033-serpro_integration' into rails3_AI3033-serpro_integration Browse Dir »

Leandro Santos
2014-06-02 19:37:33 -0300
05b6b386 merging with branch AI3033-serpro_integration of rails 2.3 Browse Dir »

Leandro Santos
2014-06-02 19:21:31 -0300
5db49e2c Merge branch 'rails3' into rails3_stable Browse Dir »

Victor Costa
2014-06-02 16:58:17 -0300
d67af7be Added more unit tests to grape api Browse Dir »

Victor Costa
2014-06-02 16:54:57 -0300
87dd6865 Merge branch 'rails3' into rails3_api Browse Dir »

Victor Costa
2014-06-02 16:24:22 -0300
c7edb005 make profile_editor_extras respond to procs properly ... Browse Dir »
```
Conflicts:
	app/views/profile_editor/edit.html.erb

(ActionItem3152)
```
Leandro Santos
2014-06-02 18:45:45 +0000
e927bd9d Fixed broken tests Browse Dir »

Daniela Feitosa
2014-06-02 02:51:33 +0000