Omar Junior / Noosfero

23 Jan, 2014

3 commits

4b01e9da Merge remote-tracking branch 'danielbucher/sub_organizations_improvements' into … ... Browse Dir »
```
…sub_organizations_improvements
```
Joenio Costa
2014-01-23 22:03:46 -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
8625b2c8 fix: catalog configuration only for enterprises ... Browse Dir »
```
(ActionItem896)
```
Daniela Feitosa
2014-01-23 16:37:40 +0000

22 Jan, 2014

4 commits

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

Conflicts:
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
```
Rodrigo Souto
2014-01-22 22:03:11 +0000
8caf11c4 product-categories-block: add 'catalog_only' option and define it as default Browse Dir »

Rodrigo Souto
2014-01-22 20:20:34 +0000
f7c88798 block: add support for custom display modes for blocks Browse Dir »

Rodrigo Souto
2014-01-22 20:17:48 +0000
43535f4f boxes-helper: add params to context passed to the block Browse Dir »

Rodrigo Souto
2014-01-22 20:04:18 +0000

21 Jan, 2014

4 commits

764f2771 clone-block: replace enabled=false by display=:never Browse Dir »

Rodrigo Souto
2014-01-21 20:02:46 +0000
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
e59c8ae2 product-categories-block: not visible when products are disabled on the environment Browse Dir »

Rodrigo Souto
2014-01-21 19:34:30 +0000

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

2 commits

35d7a6af Checking if perrmission to view article before version Browse Dir »

Daniela Feitosa
2014-01-19 23:53:43 -0300
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

4 commits

8e720312 Replacing rev by version Browse Dir »

Daniela Feitosa
2014-01-18 21:11:45 +0000
d7da0420 Added methods to return data from specific version ... Browse Dir »
```
(ActionItem2822)
```
Daniela Feitosa
2014-01-18 16:32:20 +0000
bf80644c Add new template to display versioned article ... Browse Dir »
```
Also included revision number on cache key

Signed-off-by: Daniela Feitosa

(ActionItem2822)
```
Ana Losnak
2014-01-18 16:32:19 +0000

4ab1ad9c Add links to articles versions. ... Browse Dir »

(ActionItem2822)

Signed-off-by: Daniela Feitosa
Signed-off-by: Ana Losnak <analosnak@gmail.com>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>

2014-01-18 16:32:19 +0000

17 Jan, 2014

5 commits

4ad91064 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	test/unit/comment_test.rb
```
Rodrigo Souto
2014-01-17 18:08:25 +0000
6f8f36f0 cms-helper-tests: fix bug due to blog without profile Browse Dir »

Rodrigo Souto
2014-01-17 18:04:31 +0000

7bc0a2a4 sub_organizations_plugin: Add related organizations block ... Browse Dir »

The following improvements have been made:
  - Created action that displays sub-organization and
  super organizations of a given organization.
  - Created a block that display related organizations.
  - List mother organizations to person's membership if
  he/she is member of a sub-organization.

(ActionItem2499)
(ActionItem2825)

Signed-off-by: Arthur Del Esposte <athurmde@yahoo.com.br>
Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>

2014-01-17 14:43:37 -0200

0b31911b Make scope unions ... Browse Dir »
```
closes ActionItem2830
```
Aurélio A. Heckert
2014-01-17 11:25:35 -0200
b1bcaade Merge branch 'next' Browse Dir »

Joenio Costa
2014-01-17 09:56:15 -0300

16 Jan, 2014

3 commits

757bfb50 Merge branch 'AI2844' Browse Dir »

Daniela Feitosa
2014-01-16 17:35:52 +0000
496d5a24 join_button: removing footer content from model ... Browse Dir »
```
- leaving code to be displayed on views (MVC)

(ActionItem2844)
```
Daniela Feitosa
2014-01-16 16:50:52 +0000
2de692cd Merge remote branch 'unb-gama/AI2844-join_button' into AI2844 Browse Dir »

Daniela Feitosa
2014-01-16 02:27:37 +0000

15 Jan, 2014

3 commits

5187f433 Merge remote-tracking branch 'participa/AI2919-track_fixes' into track-fixes ... Browse Dir »
```
Conflicts:
	test/functional/cms_controller_test.rb
	test/unit/profile_test.rb
```
Rodrigo Souto
2014-01-15 16:44:17 -0300
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

b3fb1448 forum_use_terms: add user term to forums ... Browse Dir »

(ActionItem2513)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-01-15 00:40:00 +0000

13 Jan, 2014

9 commits

771a0594 Add missing unit tests for the MainBlock ... Browse Dir »
```
(ActionItem2914)
```
Joenio Costa
2014-01-13 22:38:32 -0300
c06aaf3e profile-test: remove unnecessary Article.destroy_all Browse Dir »

Rodrigo Souto
2014-01-13 22:02:24 +0000
d03ee57c forgot-password-integration-test: fix params format Browse Dir »

Rodrigo Souto
2014-01-13 21:55:17 +0000
88ba5f6e ProfileTest: compare array correctly Browse Dir »

Leandro Nunes dos Santos
2014-01-13 21:16:59 +0000
c719f4bd UserTest: avatar information could come in different url positions Browse Dir »

Leandro Nunes dos Santos
2014-01-13 21:06:52 +0000
d8427ca1 UsersController: make the functionals tests self contained Browse Dir »

Leandro Nunes dos Santos
2014-01-13 21:02:12 +0000
eb17fc65 The comments are not loadded by default on the wall anymore Browse Dir »

Leandro Nunes dos Santos
2014-01-13 20:46:24 +0000
78fffbce MailconfController: make the functionals tests self contained Browse Dir »

Leandro Nunes dos Santos
2014-01-13 20:36:50 +0000
d0894925 box-test: fix test due to method to_css_class_name improvement Browse Dir »

Rodrigo Souto
2014-01-13 18:31:38 +0000

10 Jan, 2014

1 commit

70c90e47 Fix: comments list when there is spam on thread ... Browse Dir »
```
(ActionItem2918)
```
Daniela Feitosa
2014-01-10 20:21:08 +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