Charles Oliveira / noosfero

10 Feb, 2014

2 commits

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
1d8eeefb Merge branch 'noosfero_0.46.0' Browse Dir »

Rodrigo Souto
2014-02-10 22:13:58 -0300

29 Jan, 2014

4 commits

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

Rodrigo Souto
2014-01-29 18:02:08 -0300
66707ca9 profile-design-tests: add new ProductCategoriesBlock to enterprises block Browse Dir »

Rodrigo Souto
2014-01-29 18:01:15 -0300
4f784bd7 template-tests: add is_template to fix templates tests Browse Dir »

Rodrigo Souto
2014-01-29 18:00:18 -0300

79d66909 comment: remove comment_as_thread method ... Browse Dir »

This method was removed by ca5ebf95375cd5dbb80a047dc79f4c31e36df899
and was mistakenly included on this merge
4ad91064632c8c1f5483a559d158d96b93e1a3c6 due to this fix
70c90e476a2a263639d13654564b8ea9db30a911. Also its tests weren't
removed.

2014-01-29 20:32:15 +0000

28 Jan, 2014

6 commits

25018e09 macro: fix attributes after nokogiri change and write some tests Browse Dir »

Rodrigo Souto
2014-01-28 21:34:24 +0000
6cb08f2f Merge commit 'refs/merge-requests/366' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/366

Conflicts:
	INSTALL
	script/install-dependencies/debian-squeeze.sh
```
Rodrigo Souto
2014-01-28 16:45:47 -0300
5e853854 person-test: remove unnecessary tests Browse Dir »

Rodrigo Souto
2014-01-28 18:51:13 +0000
a42fb86d unit_test: correct misspelled words on person_test ... Browse Dir »
```
ActionItem1011
```
Ana Losnak
2014-01-28 18:42:18 +0000
eb5062af profile_editor: add extra optional fields for person ... Browse Dir »
```
Signed-off-by: Ana Losnak <analosnak@gmail.com>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>

ActionItem1011
```
Ana Losnak
2014-01-28 18:42:02 +0000
caf8c081 Merge branch 'AI2786-like' of https://gitlab.com/participa/noosfero into partici… ... Browse Dir »
```
…pa/noosfero-AI2786-like
```
Rodrigo Souto
2014-01-28 14:44:47 +0000

23 Jan, 2014

5 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

297b3b72 Fixing AI2897 problems: ... Browse Dir »

-Changed update_attribute to setting the attribute then 'save!'
-Removed some whitespaces
-The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb.

(ActionItem2897)

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

2014-01-23 16:28:03 -0200

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
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

20 Jan, 2014

2 commits

362d23e0 Move to vote plugin all modifications on core related to vote_fu ... Browse Dir »
```
(ActionItem2786)
```
Victor Costa
2014-01-20 18:44:17 -0300
bf559b5f box: pass holder class as type for extra blocks hotspot ... Browse Dir »
```
(ActionItem2958)
```
Rodrigo Souto
2014-01-20 19:21:05 +0000

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

2 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