Omar Junior / Noosfero

08 Jul, 2014

1 commit

f468e3c4 Use tokeninput to edit members whitelist Browse Dir »

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

16 Mar, 2014

2 commits

1c950250 Revert part of the last commit in order to not remove the EnvironmentStatisticsBlock ... Browse Dir »

- EnvironmentStatisticsBlock was marked as DEPRECATED, it will be
  removed in the next Noosfero release, see ActionItem3045

Thanks for the tip Daniela Feitosa ;)

(ActionItem2851)

2014-03-16 22:49:21 -0300

c3453051 Make a plugin to display statistics from Environment and Profiles ... Browse Dir »

- Removed EnvironmentStatisticsBlock from core. Environment's admins
  should enable the statistics block for its environment

Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
Signed-off-by: Victor Costa <vfcosta@gmail.com>

(ActionItem2851)

2014-03-16 20:48:37 -0300

13 Mar, 2014

1 commit

f835862a Avoid crash when try to remove unexistent profile ... Browse Dir »
```
(ActionItem3021)
```
Daniela Feitosa
2014-03-13 19:22:06 +0000

12 Mar, 2014

3 commits

d0cd6046 Addded cucumber test ... Browse Dir »

-Added tests for ban user
-Added also tests for activate/deactivate users
-Added also tests for set admin role

(ActionItem3021)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>

2014-03-12 17:27:37 +0000

2915c278 Add confirm message for ban, activate/deactivate ... Browse Dir »

(ActionItem3021)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>

2014-03-12 16:49:56 +0000

377d910b ban_user: Creating ban button and ban method in user controller ... Browse Dir »
```
(ActionItemAI3021)

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
```
David Silva
2014-03-12 16:49:56 +0000

07 Mar, 2014

1 commit

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

Conflicts:
	app/controllers/my_profile/profile_themes_controller.rb
	test/unit/comment_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2014-03-07 13:17:54 +0000

11 Feb, 2014

2 commits

c51270d7 users-controller: default filter to all_users ... Browse Dir »
```
(ActionItem2995)
```
Rodrigo Souto
2014-02-11 23:28:10 +0000
f8b1f66d users-controller: order users by name ... Browse Dir »
```
Also adding a new assert helper to test the order of a collection
without assuming all elements inside it.

(ActionItem2996)
```
Rodrigo Souto
2014-02-11 23:27:45 +0000

23 Jan, 2014

1 commit

b0874b74 Allow the admin users to change the environment theme on the admin panel. Browse Dir »

Eduardo Tourinho Edington
2014-01-23 16:23:02 -0200

02 Jan, 2014

1 commit

57843514 Merge remote branch 'unb-gama-mes/ActionItem2910-OrderFeaturesAlphabetically' Browse Dir »

Daniela Feitosa
2014-01-02 04:40:19 +0000

16 Dec, 2013

1 commit

a8ef1884 users-controller: refactor index action Browse Dir »

Rodrigo Souto
2013-12-16 04:26:10 -0300

13 Dec, 2013

1 commit

d747ca15 features_admin: Sort features list alphabetically on admin control panel. ... Browse Dir »
```
(ActionItem2910)

Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Rafael de Souza Queiroz <querafael@live.com>
```
Marcos Ramos
2013-12-13 19:49:22 -0200

19 Nov, 2013

1 commit

f4ebf2ab fixing functional tests of users controller Browse Dir »

Leandro Nunes dos Santos
2013-11-19 09:27:48 -0300

12 Nov, 2013

1 commit

3e453e44 Allow admins to activate and deactivate environment users. Browse Dir »

Eduardo Tourinho Edington
2013-11-12 16:43:38 -0300

08 Nov, 2013

1 commit

d09c5df5 Allow admins to set and reset admin role on environment users. ... Browse Dir »
```
Allow admins to activate and deactivate environment users.
```
Eduardo Tourinho Edington
2013-11-08 16:30:34 -0300

10 Jun, 2013

1 commit

36d9601b provide interface to manage trusted sites ... Browse Dir »
```
ActionItem2675
```
Lucas Melo
2013-06-10 16:03:56 -0300

07 May, 2013

1 commit

b2a0c431 Merge branch 'master' into pluginize-solr ... Browse Dir »
```
Conflicts:
	app/models/article.rb
	app/views/layouts/application-ng.rhtml
	lib/noosfero/plugin.rb
	script/noosfero-plugins
```
Rodrigo Souto
2013-05-07 13:36:10 -0300

24 Apr, 2013

1 commit

1451d7e5 Merge commit 'refs/merge-requests/259' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/259

Conflicts:
	app/controllers/admin/environment_design_controller.rb
```
Rodrigo Souto
2013-04-24 21:36:25 -0300

20 Apr, 2013

1 commit

2d5abd83 mergin with master Browse Dir »

root
2013-04-20 21:31:06 -0300

17 Apr, 2013

1 commit

527ee379 Merge branch 'stable' ... Browse Dir »

Basically html_safe in some places that the stable branch had.

Conflicts:
	app/models/article_block.rb
	app/models/tags_block.rb

2013-04-17 17:12:26 -0300

05 Apr, 2013

2 commits

0085fd49 Adding missing require to csv Browse Dir »

Rodrigo Souto
2013-04-05 16:01:33 -0300
7c6b674e Apply admin/users_controller::index() optimization to stable ... Browse Dir »
```
ActionItem2217
```
Visita
2013-04-05 16:08:33 -0300

18 Mar, 2013

1 commit

67e8ceed Merge branch 'master' into pluginize-solr Browse Dir »

Rodrigo Souto
2013-03-18 21:16:54 -0300

15 Mar, 2013

1 commit

eee333db Adding option to add TagsBlock on environment through interface Browse Dir »

Rodrigo Souto
2013-03-15 20:55:17 +0000

13 Mar, 2013

1 commit

0c1d441e Fixing some funcitonal tests and moving solr server start to plugin Browse Dir »

Rodrigo Souto
2013-03-13 21:14:16 +0000

05 Mar, 2013

1 commit

0fb41209 Removing solr from region tests ... Browse Dir »
```
Also removing region unit tests that are already being done in the
functional test.
```
Rodrigo Souto
2013-03-05 16:32:16 -0300

27 Feb, 2013

1 commit

5954b097 Concentrating find_by_contents on application controller Browse Dir »

Rodrigo Souto
2013-02-27 20:29:56 -0300

15 Jan, 2013

1 commit

af3c320b adding hotspots to make possible add other blocks Browse Dir »

Leandro Nunes dos Santos
2013-01-15 14:06:26 -0300

24 Oct, 2012

1 commit

95080411 Merge branch 'master' into language-selection ... Browse Dir »
```
Conflicts:
	app/helpers/forms_helper.rb
	app/models/box.rb
	app/views/box_organizer/edit.rhtml
	db/schema.rb
	test/unit/box_test.rb
```
Rodrigo Souto
2012-10-24 20:04:13 +0000

01 Oct, 2012

1 commit

5fb09b51 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	po/pt/noosfero.po
	public/javascripts/application.js
```
Antonio Terceiro
2012-10-01 01:33:21 -0300

05 Sep, 2012

1 commit

67c6ec49 Forces users xml file to be downloaded ... Browse Dir »

  Forces the users xml file to be downloaded instead of parsed by the
  browser, which was a little annoying if the xml was too big since
  the browser would want to load it all.

(ActionItem2284)

2012-09-05 10:37:06 -0300

24 Aug, 2012

1 commit

e7b563e6 [language-selection] Available languages interface and params treatment Browse Dir »

Rodrigo Souto
2012-08-24 19:52:44 +0000

09 Aug, 2012

1 commit

c87d05b5 Small changes on licenses ... Browse Dir »

   * Licenses only can be removed with method 'post'
   * Fixing truncate calls to stop displaying deprecation warnings
   * Added buttons to add a new license and to go back to admin panel
   * Added new db/schema

(ActionItem2379)

2012-08-09 00:16:26 -0300

08 Aug, 2012

1 commit

3e98d8f0 Merge commit 'refs/merge-requests/187' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/187

Conflicts:
	app/models/environment.rb
	public/stylesheets/application.css
	test/factories.rb
	test/fixtures/roles.yml
	test/unit/article_test.rb
```
Daniela Feitosa
2012-08-08 16:15:14 -0300

07 Aug, 2012

2 commits

bac11992 [multiples-templates] Fixing redirect action and template_id param Browse Dir »

Rodrigo Souto
2012-08-07 22:51:33 -0300
00dacfc2 [multiple-templates] Manage templates views and controllers ... Browse Dir »
```
(ActionItem2378)
```
Rodrigo Souto
2012-08-07 22:51:32 -0300

18 Jul, 2012

1 commit

68a4fe77 [licenses] Adding controllers and views for licenses management ... Browse Dir »
```
(ActionItem2379)
```
Rodrigo Souto
2012-07-18 11:23:25 -0300

03 Apr, 2012

1 commit

b814464f ActionItem 2287: Create, edit and assign roles Browse Dir »

Caio Almeida
2012-04-03 01:21:54 -0300