Thiago Ribeiro / Noosfero

02 Apr, 2014

2 commits

845ae13e minor: removing empty lines and trailing whitespaces Browse Dir »

Rodrigo Souto
2014-04-02 20:18:43 +0000
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

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

20 Mar, 2014

1 commit

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

18 Mar, 2014

1 commit

edc5d4c5 Translate layout template strings Browse Dir »

Braulio Bhavamitra
2014-03-18 17:49:36 -0300

31 Jan, 2014

1 commit

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

Conflicts:
	app/views/content_viewer/view_page.rhtml
```
Rodrigo Souto
2014-01-31 16:37:47 -0300

23 Jan, 2014

2 commits

b9d5a64e Remove trailing whitespaces and fix identation Browse Dir »

Rodrigo Souto
2014-01-23 20:03:00 -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

21 Jan, 2014

2 commits

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

Conflicts:
	app/models/block.rb
	public/designs/icons/tango/style.css
	test/unit/block_test.rb
```
Rodrigo Souto
2014-01-21 16:45:31 -0300

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

18 Jan, 2014

1 commit

658ecf81 Trying to make it prettier :) Browse Dir »

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

16 Jan, 2014

1 commit

0a577775 join_button: added class to style join button ... Browse Dir »
```
(ActionItem2844)
```
Daniela Feitosa
2014-01-16 17:25:24 +0000

08 Jan, 2014

1 commit

2c251ae8 join_button: Join/Leave/Login Button ... Browse Dir »

- Added buttons at members block.
- Added checkbox to show or not the buttons on the community members.
- Removed the render button "enter/leave" when the checkbox that enables the button is unchecked
- Adjusted style CSS and display button
- Added cucumber and unit tests.
- Removed some spaces.
- There are two cucumber tests that wasn't done by the our team that fail if you don't use selenium. The files are publish_article.feature line 20 and search_enterprises.feature line 33 and we didn't modify them.

(ActionItem2844)

Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>

2014-01-08 14:38:27 +0000

07 Jan, 2014

1 commit

c9eccb09 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	db/schema.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-07 14:38:59 +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

15 Dec, 2013

1 commit

bd528256 Renaming template from leftfooter to leftbottom ... Browse Dir »
```
(ActionItem2847)
```
Daniela Feitosa
2013-12-15 02:48:30 +0000

14 Dec, 2013

1 commit

209daf25 Merge remote branch 'unb-gama/AI2847-template_leftfooter' into AI2847 Browse Dir »

Daniela Feitosa
2013-12-14 16:30:12 +0000

12 Dec, 2013

1 commit

6cc3ecdd Merge commit 'refs/merge-requests/410' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/410
```
Rodrigo Souto
2013-12-12 18:00:41 -0300

20 Nov, 2013

1 commit

83fd2007 Change the Content Management form to allow the reset of the profile's homepage. Browse Dir »

Leandro Nunes dos Santos
2013-11-20 17:13:40 -0300

19 Nov, 2013

1 commit

9dfe5a7c Merge branches 'ActionItem2882' and 'ActionItem2882_merge' into ActionItem2882_merge Browse Dir »

Leandro Nunes dos Santos
2013-11-19 10:08:16 -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

25 Oct, 2013

1 commit

12e3330a Create a new template "Left bar and Footer" ... Browse Dir »
```
Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
Signed-off-by: Valessio Brito <contato@valessiobrito.com.br>
```
Valessio Brito
2013-10-25 20:25:39 -0200

27 Sep, 2013

1 commit

817df70a Correct `#user .logged-in` ids and icons ... Browse Dir »

* The env admin link and the user pannel had the same controlpanel id.
* The user icon is now recovered.
* The #manage-enterprises icons was croped.

Closes ActionItem2817

2013-09-27 14:56:04 -0300

19 Sep, 2013

2 commits

0d6a8190 Merge commit 'refs/merge-requests/316' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/316

Conflicts:
	app/helpers/blog_helper.rb
```
Rodrigo Souto
2013-09-19 17:40:33 -0300
fec8c9a7 Merge commit 'refs/merge-requests/295' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/295
```
Rodrigo Souto
2013-09-19 15:30:45 -0300

04 Sep, 2013

1 commit

067a2a2d articles, profiles: stop using ajax for some logged-in stuff Browse Dir »

Lucas Melo
2013-09-04 14:28:34 -0300

12 Jul, 2013

1 commit

102605b5 [comments-refactor-review] Avoiding comment_form background color change Browse Dir »

Rodrigo Souto
2013-07-12 21:32:16 -0300

11 Jul, 2013

2 commits

b3806ad2 Adding name config for templates Browse Dir »

Rodrigo Souto
2013-07-11 16:56:58 -0300
2f737f2c Transforming nobars into nosidebars Browse Dir »

Rodrigo Souto
2013-07-11 16:56:22 -0300

04 Jul, 2013

1 commit

dd55c842 Clone blocks Browse Dir »

Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso
2013-07-04 22:14:54 +0000

17 Jun, 2013

1 commit

a83e415d Product Catalog and Product Categories Block styles ... Browse Dir »
```
ActionItem896
```
Aurélio A. Heckert
2013-06-17 18:37:06 -0300

23 May, 2013

1 commit

9bb8c5e2 Add nobars template layout Browse Dir »

Braulio Bhavamitra
2013-05-23 17:26:59 -0300

09 May, 2013

1 commit

12e28e82 Remove IE6 suport and CSS loading from Tango theme Browse Dir »

Aurélio A. Heckert
2013-05-09 16:46:06 -0300

08 May, 2013

1 commit

825c88ca Create FilePresenter infra ... Browse Dir »

The idea is never to give a Upload File to a view. That must
always work with a File Presenter providing overwrite methods
and specific views/partials.

ActionItem2373

2013-05-08 01:13:11 -0300

22 Mar, 2013

1 commit

c806d821 Adding "My Communities" to the user menu ... Browse Dir »
```
ActionItem1030
```
Visita
2013-03-22 17:38:35 -0300

08 Nov, 2012

1 commit

c90b8e63 Highlight the products in listing ... Browse Dir »
```
(ActionItem2439)
```
Joenio Costa
2012-11-08 21:26:22 +0000

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

20 Oct, 2012

2 commits

73a75da0 Adding CommunitiesBlock, EnterprisesBlock, FriendsBlock and PeopleBlock to acceptable blocks Browse Dir »

Daniel Cunha
2012-10-20 17:27:28 -0300
61abd4ff Adding LinkListBlock to acceptable center blocks Browse Dir »

Daniel Cunha
2012-10-20 17:27:28 -0300