Charles Oliveira / noosfero

16 Dec, 2014

5 commits

c11afdc5 Merge branch 'disable_assets_search_categories' into stable Browse Dir »

Victor Costa
2014-12-16 17:16:51 -0300
3f8af204 Consider disabled assets at category search Browse Dir »

Victor Costa
2014-12-16 17:16:32 -0300

2aace982 Merge branch 'AI3279-block_store' into stable ... Browse Dir »

Conflicts:
	app/controllers/box_organizer_controller.rb
	app/controllers/my_profile/profile_design_controller.rb
	app/helpers/layout_helper.rb

2014-12-16 13:21:30 -0300

76b22ac6 Fix tests for box_design Browse Dir »

Victor Costa
2014-12-16 12:52:11 -0300

dfad044a Merge branch 'master' into AI3279-block_store ... Browse Dir »

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/admin/environment_design_controller.rb
	app/helpers/layout_helper.rb
	app/models/block.rb
	script/quick-start

2014-12-16 10:19:11 -0300

11 Dec, 2014

1 commit

04ae2fd2 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-12-11 16:25:22 -0300

08 Dec, 2014

1 commit

ea021e7f curriculum_lattes_plugin: fixed functionals tests Browse Dir »

Daniela Feitosa
2014-12-08 20:10:02 -0300

20 Nov, 2014

2 commits

fb92dd6e Merge branch 'fix_role_edition' into stable Browse Dir »

Victor Costa
2014-11-20 11:37:58 -0300

f6e59824 Fix environment role edition ... Browse Dir »

An environment role has permissions for both environment and profile but
edition page was displaying only environment permissions.

2014-11-20 10:29:21 -0300

03 Nov, 2014

5 commits

77ee15d0 Merge branch 'fix_lazy_queries' into stable Browse Dir »

Victor Costa
2014-11-03 16:02:30 -0300
e6fdb803 Fix manage products test Browse Dir »

Victor Costa
2014-11-03 16:02:12 -0300
1fbe212f Merge branch 'rails3_chat' into stable Browse Dir »

Victor Costa
2014-11-03 12:55:41 -0300
0563c2a2 Disable failing tests from chat Browse Dir »

Victor Costa
2014-11-03 12:55:14 -0300
67d07fd9 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-11-03 11:17:56 -0300

31 Oct, 2014

1 commit

1aa32327 Fix broken functional tests Browse Dir »

Antonio Terceiro
2014-10-31 14:29:11 -0200

23 Oct, 2014

1 commit

f2eb9480 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-10-23 11:27:12 -0300

22 Oct, 2014

3 commits

ad4f98b3 Merge branch 'stable' ... Browse Dir »

Conflicts:
	app/helpers/profile_helper.rb
	app/views/content_viewer/_article_toolbar.rhtml
	app/views/profile/_common.rhtml
	app/views/profile/_organization_profile.rhtml
	app/views/profile/_person_profile.rhtml
	db/schema.rb
	public/stylesheets/application.css

2014-10-22 21:39:49 -0300

0f01bf09 Added article tags list on profiles Browse Dir »

Daniela Feitosa
2014-10-22 18:42:24 -0300
e7e132e7 Fix: profile_controller tests Browse Dir »

Daniela Feitosa
2014-10-22 19:11:34 +0000

21 Oct, 2014

1 commit

6a6171ef Merge branch 'fix_report_abuse' into stable Browse Dir »

Victor Costa
2014-10-21 08:19:13 -0300

20 Oct, 2014

1 commit

2cbd78d6 Fix report abuse Browse Dir »

Victor Costa
2014-10-20 16:45:09 -0300

30 Sep, 2014

1 commit

2efb80a2 Merge branch 'master' into rails3_stable ... Browse Dir »
```
Conflicts:
	Gemfile
	Gemfile.lock
```
Victor Costa
2014-09-30 12:06:48 -0300

26 Sep, 2014

4 commits

03614d52 fix functional tests that fail without notification emails Browse Dir »

Antonio Terceiro
2014-09-26 13:43:26 -0300
70359d29 ProfileEditorController: fix test that sends email Browse Dir »

Antonio Terceiro
2014-09-26 13:42:21 -0300
8d2e48e9 ProfileController: fix fragile tests Browse Dir »

Antonio Terceiro
2014-09-26 13:42:04 -0300
fa694deb Merge branch 'master' into rails3_stable Browse Dir »

Victor Costa
2014-09-26 13:29:29 -0300

24 Sep, 2014

1 commit

d9f771c3 Fix broken test Browse Dir »

Antonio Terceiro
2014-09-24 15:02:10 -0300

22 Sep, 2014

1 commit

9804917f Merge branch 'master' into rails3_stable ... Browse Dir »
```
Conflicts:
	Gemfile
	Gemfile.lock
	lib/tasks/gettext.rake
	test/unit/dates_helper_test.rb
```
Victor Costa
2014-09-22 16:38:12 -0300

15 Sep, 2014

1 commit

8ee125a8 signup_image_upload: Add image on user signup ... Browse Dir »

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-09-15 15:56:21 -0300

12 Sep, 2014

2 commits

b759d641 AccountControllerTest: fix assumptions on call to User.data_hash Browse Dir »

Antonio Terceiro
2014-09-12 10:49:09 -0300
d3ade277 ChatController: fix assumption about default avatar Browse Dir »

Antonio Terceiro
2014-09-12 10:41:09 -0300

05 Sep, 2014

1 commit

3a320e4b Merge branch 'rails3-custom_fields' into rails3_stable Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-09-05 17:08:13 -0300

02 Sep, 2014

1 commit

181fc268 Check whitelist members only if environment is restricted ... Browse Dir »
```
(ActionItem3191)
```
Joenio Costa
2014-09-02 12:17:24 -0300

01 Sep, 2014

2 commits

eda464a0 fixing test because EnvironmentStatisticsBlock was removed Browse Dir »

Leandro Santos
2014-09-01 12:17:04 -0300
37fcaf75 mergin with master Browse Dir »

Leandro Santos
2014-09-01 11:28:55 -0300

29 Aug, 2014

1 commit

7d5483f1 Merge branch 'master' into rails3_stable ... Browse Dir »
```
Conflicts:
	app/helpers/layout_helper.rb
	db/schema.rb
```
Victor Costa
2014-08-29 11:35:34 -0300

27 Aug, 2014

1 commit

914ea967 Removing EnvironmentStatisticsBlock from core ... Browse Dir »
```
PeopleBlock plugin overrides the EnvironmentStatisticsBlock

(ActionItem3045)
```
Joenio Costa
2014-08-27 20:41:41 -0300

26 Aug, 2014

1 commit

01c0f483 adding some functional tests ... Browse Dir »
```
also:
* keep the tip about separate tags by comma
* include the css in the header page to have cache

(ActionItem3280)
```
Joenio Costa
2014-08-26 18:01:28 -0300

25 Aug, 2014

1 commit

888d94d7 Merge branches 'master' and 'AI3279-block_store' into AI3279-block_store Browse Dir »

Leandro Santos
2014-08-25 17:55:03 -0300

19 Aug, 2014

1 commit

29490ac8 Merge branch 'AI3220_proposals' into rails3_stable Browse Dir »

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