Thiago Ribeiro / Noosfero

30 Mar, 2014

4 commits

54cb54e7 Find available plugins looking in the plugins directory ... Browse Dir »
```
(ActionItem3070)
```
Joenio Costa
2014-03-30 18:26:28 -0300
e0543b02 Merge branch 'rails235' into AI3037-block_filter_user Browse Dir »

Joenio Costa
2014-03-30 11:48:06 -0300
76f04045 Use select instead of radio button to choose display options ... Browse Dir »
```
(ActionItem3037)
```
Joenio Costa
2014-03-30 14:45:31 +0000
4252db49 Search articles from portal on env link list block ... Browse Dir »
```
Also fixed visualization on firefox (the trash icon was in the second
line)

(ActionItem2582)
```
Daniela Feitosa
2014-03-30 04:20:25 +0000

28 Mar, 2014

3 commits

1cad9339 Revert "Added a filter to display blocks depending on user" ... Browse Dir »

This reverts commit 22d3d9d34034136b344cd6b58270a6b49bf61dbd.

Conflicts:
	public/stylesheets/application.css
	test/functional/environment_design_controller_test.rb

2014-03-28 14:36:59 -0300

a289d28a Link_List_Block_Improvements: Merge request corrections ... Browse Dir »
```
(ActionItem2582)

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
```
Fabio Teixeira
2014-03-28 09:19:37 -0300

b15b9498 Link_List_Block_Improvements: Add Drag and Drop and auto-complete to LinkListBlock ... Browse Dir »

(ActionItem2582)

- Changed link list html structure from table to ul/li
- Added image that indicates draggable area
- Added Drag and Drop javascript
- Added button that delete the link
- Added auto complete to Address field
- Corrected syntax error on token_helper

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>

2014-03-28 09:19:37 -0300

26 Mar, 2014

4 commits

75e83af7 Merge branch 'rails235' into AI3037-block_filter_user ... Browse Dir »
```
Conflicts:
	public/stylesheets/application.css
	test/functional/environment_design_controller_test.rb
	test/unit/block_test.rb
```
Joenio Costa
2014-03-26 11:01:19 -0300
79818886 Merge remote branch 'gitlab/noosfero_0.47.0' into rails235 Browse Dir »

Daniela Feitosa
2014-03-26 10:23:12 +0000
424e7b63 Merge branch 'stable' into noosfero_0.47.0 Browse Dir »

Daniela Feitosa
2014-03-26 10:20:21 +0000

fe3ebd1c Added pagination on events ... Browse Dir »

agenda_improvements: Changed the limit to show the events

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>

(ActionItem3048)

2014-03-26 10:17:05 +0000

25 Mar, 2014

1 commit

beb5c6e4 Merge branch 'AI3046-fix_clone_block' into rails235 Browse Dir »

Joenio Costa
2014-03-25 21:07:09 -0300

20 Mar, 2014

3 commits

9c9e90ee Merge branch 'master' of https://gitlab.com/noosfero/noosfero into merging Browse Dir »

Rodrigo Souto
2014-03-20 11:55:03 -0300
68426a08 Merge branch 'master' into AI2694-network_activity_email Browse Dir »

Joenio Costa
2014-03-20 11:41:07 -0300

6e10728c Merge branch 'stable' ... Browse Dir »

Conflicts:
	app/views/themes/index.rhtml
	db/schema.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	test/unit/person_test.rb

2014-03-20 10:58:42 -0300

19 Mar, 2014

2 commits

c19a7b46 content-viewer: remove obsolete test Browse Dir »

Rodrigo Souto
2014-03-19 22:05:19 +0000
8bef50d2 search-optimizations: fix broken tests Browse Dir »

Rodrigo Souto
2014-03-19 17:15:36 +0000

18 Mar, 2014

1 commit

a91ba23d Removed unused method ... Browse Dir »
```
Also included tests for meta tags and removed not-needed tests

(ActionItem2610)
```
Daniela Feitosa
2014-03-18 18:40:07 +0000

17 Mar, 2014

3 commits

645f9328 Merge branch 'master' into AI2694-network_activity_email Browse Dir »

Joenio Costa
2014-03-17 20:14:21 -0300
88b02d90 Fix cloning blocks at environment_design ... Browse Dir »
```
(ActionItem3046)
```
Victor Costa
2014-03-17 13:53:01 -0300
b12c55b3 Merge branch 'AI3015-fix_profile_controller' Browse Dir »

Daniela Feitosa
2014-03-17 00:01:53 +0000

16 Mar, 2014

5 commits

040b05e2 Merge branch 'master' of gitlab.com:noosfero/noosfero Browse Dir »

Joenio Costa
2014-03-16 22:50:53 -0300

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

a3a68964 Merge branch 'AI3015-fix_profile_controller' of https://gitlab.com/participa/noo… ... Browse Dir »
```
…sfero into AI3015-fix_profile_controller
```
Daniela Feitosa
2014-03-16 23:41:55 +0000
031e5bd1 Fixed failing tests ... Browse Dir »
```
test/functional/application_controller_test.rb
test/functional/profile_themes_controller_test.rb
```
Daniela Feitosa
2014-03-16 22:50:45 +0000

13 Mar, 2014

3 commits

da22d0c8 Merge branch 'master' into AI2928-categories Browse Dir »

Joenio Costa
2014-03-13 18:21:41 -0300
a72fb5dd Better styles for default layout and small improvements in the UI ... Browse Dir »
```
(ActionItem2928)
```
Joenio Costa
2014-03-13 18:20:39 -0300
f835862a Avoid crash when try to remove unexistent profile ... Browse Dir »
```
(ActionItem3021)
```
Daniela Feitosa
2014-03-13 19:22:06 +0000

12 Mar, 2014

1 commit

22d3d9d3 Added a filter to display blocks depending on user Browse Dir »

Victor Costa
2014-03-12 15:00:58 -0300

10 Mar, 2014

1 commit

1dfa6f09 Merge branch 'master' into AI2928-categories Browse Dir »

Joenio Costa
2014-03-10 10:10:22 -0300

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

20 Feb, 2014

2 commits

f099dfa6 Remove unused method (profile_info) from profile_controller ... Browse Dir »
```
(ActionItem3015)
```
Victor Costa
2014-02-20 15:45:55 -0300
61af39c0 Merge branch 'master_colivre' into AI2694-network_activity_email ... Browse Dir »
```
Conflicts:
	test/unit/person_test.rb
```
Victor Costa
2014-02-20 10:55:47 -0300

13 Feb, 2014

2 commits

a8a8780b themes-controller-test: add test to sort themes Browse Dir »

Rodrigo Souto
2014-02-13 22:41:31 -0300
781ee37c themes-controller-test: test themes are not duplicated when allowed by the envir… ... Browse Dir »
```
…onment and by the user
```
Rodrigo Souto
2014-02-13 22:41:25 -0300

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

10 Feb, 2014

1 commit

09db6ba7 Merge branch 'AI2897-environment_theme' of https://gitlab.com/unb-gama/noosfero … ... Browse Dir »
```
…into unb-gama/noosfero-AI2897-environment_theme
```
Rodrigo Souto
2014-02-10 22:15:25 -0300

29 Jan, 2014

1 commit

480247c5 catalog-tests: fix per page value and remove obsolete test Browse Dir »

Rodrigo Souto
2014-01-29 18:02:08 -0300