Thiago Ribeiro / Noosfero

02 Apr, 2014

2 commits

a739edce Merge branch 'article-version' of https://gitlab.com/juniorsilva1001/noosfero in… ... Browse Dir »
```
…to juniorsilva1001/noosfero-article-version

Conflicts:
	app/views/content_viewer/versioned_article.rhtml
	db/schema.rb
	public/stylesheets/application.css
```
Rodrigo Souto
2014-04-02 19:52:23 +0000

48038fc5 Merge branch 'stable' into noosfero_0.47.0 ... Browse Dir »

Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/categories_block.feature
	po/eo/noosfero.po
	po/es/noosfero.po
	po/it/noosfero.po
	test/unit/block_test.rb

2014-04-02 19:40:37 +0000

28 Mar, 2014

1 commit

4825fe87 article-version: improvements in article versions navegability. Added buttons ... Browse Dir »
```
and warnings.
AI2822
```
Junior Silva
2014-03-28 18:39:43 -0300

26 Mar, 2014

1 commit

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

13 Mar, 2014

4 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
9a1bc7ba Merge branch 'AI3021-ban_user' of https://gitlab.com/unb-gama/noosfero into AI3021-ban_user Browse Dir »

Daniela Feitosa
2014-03-13 16:53:29 +0000
da3f1073 Removed inline style from table ... Browse Dir »
```
Also changed selenium tests to use defined steps

(ActionItem2962)
```
Daniela Feitosa
2014-03-13 15:42:41 +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

9a799cfa Merge branch 'AI2928-categories' of https://gitlab.com/participa/noosfero into AI2928-categories Browse Dir »

Joenio Costa
2014-03-12 10:57:35 -0300

11 Mar, 2014

1 commit

8e7fe1a5 Improved layout for categories selection ... Browse Dir »
```
(ActionItem2928)
```
Victor Costa
2014-03-11 17:33:42 -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

05 Mar, 2014

1 commit

ffbf0914 Merge branch 'AI2943_container_block_fixes' into 'stable' ... Browse Dir »
```
Ai2943 Container Block Fixes

Fix broken edition for container block with the new css for sideboxes view.
```
Daniela Feitosa
2014-03-05 17:53:53 +0000

03 Mar, 2014

1 commit

abdf6fab Moved style of elements to CSS file ... Browse Dir »
```
Also removed wrong class from link-title

(ActionItem2925)
```
Daniela Feitosa
2014-03-03 02:28:04 +0000

02 Mar, 2014

1 commit

5ff853b4 Merge branch 'AI2925-add_tittle_field_on_link_list_block' of https://gitlab.com/… ... Browse Dir »
```
…unb-gama/noosfero into AI2925-add_tittle_field_on_link_list_block

Conflicts:
	app/views/box_organizer/_link_list_block.rhtml
```
Daniela Feitosa
2014-03-02 13:38:51 +0000

20 Feb, 2014

1 commit

1221eda4 versions-diff: included js to radio_button control and adjusts on look-and-feel ... Browse Dir »
```
AI2822
```
Junior Silva
2014-02-20 19:56:28 -0300

11 Feb, 2014

1 commit

840db72a Merge branch 'ai2981' into 'stable' ... Browse Dir »
```
Don't let firefox show broken images name breaking layout

http://noosfero.org/Development/ActionItem2981
```
Rodrigo Souto
2014-02-11 01:53:51 +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

06 Feb, 2014

1 commit

7dcf447b Don't let firefox show broken images names breaking layout Browse Dir »

Braulio Bhavamitra
2014-02-06 13:06:15 -0300

28 Jan, 2014

1 commit

673c506c Merge commit 'refs/merge-requests/358' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/358
```
Rodrigo Souto
2014-01-28 16:21:18 +0000

27 Jan, 2014

1 commit

9e954d8c Merge branch 'master' into custom-forms ... Browse Dir »

Conflicts:
	plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
	po/pt/noosfero.po

2014-01-27 18:06:57 -0300

23 Jan, 2014

5 commits

3548b943 application-css: remove doubled style Browse Dir »

Rodrigo Souto
2014-01-23 20:02:32 -0300
6d7a0824 Merge remote-tracking branch 'dani/AI2822-fixes' into AI2822-fixes ... Browse Dir »
```
Conflicts:
	public/stylesheets/application.css
```
Rodrigo Souto
2014-01-23 19:15:27 -0300
6261e6cf add title field to link list block ... Browse Dir »
```
(ActionItem2925)
```
Francisco Marcelo A. Lima Júnior
2014-01-23 15:25:04 -0500
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
0f915d52 container_block: fix edition layout Browse Dir »

Victor Costa
2014-01-23 13:56:26 -0300

21 Jan, 2014

1 commit

0cddc2c3 Merge commit 'refs/merge-requests/337' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/337

Conflicts:
	app/controllers/public/catalog_controller.rb
	app/helpers/application_helper.rb
	app/helpers/catalog_helper.rb
	app/views/catalog/index.rhtml
	public/stylesheets/application.css

2014-01-21 15:41:30 -0300

19 Jan, 2014

1 commit

25f34b4d article_versions: list of versions on a new page ... Browse Dir »
```
- Added pagination to versions
- Treating access denied and not found

(ActionItem2822)
```
Daniela Feitosa
2014-01-19 21:44:03 +0000

18 Jan, 2014

2 commits

5cd25bf8 Reverting now is working ... Browse Dir »
```
Removed setting as versioned column
revert button is following the pattern
styling link-this-page

(ActionItem2822)
```
Daniela Feitosa
2014-01-18 20:41:04 +0000
658ecf81 Trying to make it prettier :) Browse Dir »

Daniela Feitosa
2014-01-18 16:32:20 +0000

15 Jan, 2014

1 commit

527a4b0d Moved logic from controller to model ... Browse Dir »
```
- Also included new db/schema
- Removed unused partial

(ActionItem2513)
```
Daniela Feitosa
2014-01-15 05:54:40 +0000

07 Jan, 2014

2 commits

c9eccb09 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	db/schema.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-07 14:38:59 +0000
6d8bb1e4 pending-tasks-counter: add css preference ... Browse Dir »
```
Also increasing margin by 1px.
```
Rodrigo Souto
2014-01-07 10:29:26 -0300

03 Jan, 2014

1 commit

894e8962 New way to categorize contents Browse Dir »

Victor Costa
2014-01-03 17:49:25 -0300

02 Jan, 2014

2 commits

49568a03 Fix: display number of boxes on profile_design ... Browse Dir »
```
(ActionItem2810)
```
Daniela Feitosa
2014-01-02 21:23:11 +0000
e4f22efb Merge remote branch 'unb-gama/AI2810-box_organizer' Browse Dir »

Daniela Feitosa
2014-01-02 21:21:07 +0000

18 Dec, 2013

1 commit

9238c40c Merge branch 'users-management' Browse Dir »

Rodrigo Souto
2013-12-18 18:40:51 -0300

16 Dec, 2013

1 commit

130acb98 Merge commit 'refs/merge-requests/387' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/387

Conflicts:
	app/helpers/application_helper.rb
	public/designs/themes/base/style.css
```
Rodrigo Souto
2013-12-16 15:36:30 -0300