Thiago Ribeiro / Noosfero

28 Feb, 2014

1 commit

f15193c3 Merge branch 'ActionItem2909-SortUsersAlphabetically' of https://gitlab.com/unb-… ... Browse Dir »
```
…gama/noosfero into ActionItem2909-SortUsersAlphabetically
```
Daniela Feitosa
2014-02-28 22:09:05 +0000

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
bfaf1bdd Added hotspots for comments Browse Dir »

Daniela Feitosa
2014-02-10 10:13:28 +0000

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

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

23 Jan, 2014

3 commits

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

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

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

6 commits

8e720312 Replacing rev by version Browse Dir »

Daniela Feitosa
2014-01-18 21:11:45 +0000
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
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

16 Jan, 2014

1 commit

a4267385 Merge branch 'track-fixes' Browse Dir »

Rodrigo Souto
2014-01-16 16:06:09 +0000

15 Jan, 2014

6 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
6a3caadd sort_members: sort community members alphabetically in manage members and view all page ... Browse Dir »
```
(ActionItem2909)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
SIgned-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Arthur Del Esposte
2014-01-15 17:46:57 +0000
a96ba9e6 access_level: optimizing the search for members ... Browse Dir »
```
- Also fixed db/schema
(ActionItem2852)
```
Daniela Feitosa
2014-01-15 16:48:04 +0000
d1609c73 Merge remote branch 'unb-gama/AI2852-article_access_level' into AI2852 ... Browse Dir »
```
Conflicts:
	app/models/person.rb
	db/schema.rb
```
Daniela Feitosa
2014-01-15 12:44:00 +0000
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

09 Jan, 2014

1 commit

9f616e0b access_level: Custom permission for community users to access an article ... Browse Dir »

- Added a field on article new/edit to specify which users can access the article
- Added a relationship has_and_belongs_to_many between Article and Person
- Created a new table article_privacy_exceptions for has_and_belongs_to_many
- Added cucumber tests
- Added a new cucumber step to add a user to the exception users list

(ActionItem2852)

Signed-off-by: Alex de Souza <campelo.al1@gmail.com>
Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com>
Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>

2014-01-09 12:12:04 -0200

07 Jan, 2014

3 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

f7ebcca8 Do not build view_paths on each request ... Browse Dir »

Add plugin view paths at initialization.
Calling prepend_view_path on each request is too slow.

Do not include theme dir at view path.
Themes must use theme_include method to render rhtml files (instead of using render directly).
This avoids conflict of files with same name at different themes and reduces the amount of paths in view_paths.

2014-01-07 08:57:00 -0300

54df9315 Do not duplicate filters for plugins Browse Dir »

Victor Costa
2014-01-07 08:56:44 -0300

06 Jan, 2014

3 commits

3e8bfd50 application-helper: refactor gravatar logic Browse Dir »

Rodrigo Souto
2014-01-06 19:27:45 +0000
4ee05c1c Filter only profile related roles Browse Dir »

Larissa Reis
2014-01-06 15:55:20 -0300
ab843111 Merge remote-tracking branch 'larissa/filter-communities' into filter-communities ... Browse Dir »
```
Conflicts:
	test/functional/memberships_controller_test.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-06 17:56:58 +0000

02 Jan, 2014

1 commit

57843514 Merge remote branch 'unb-gama-mes/ActionItem2910-OrderFeaturesAlphabetically' Browse Dir »

Daniela Feitosa
2014-01-02 04:40:19 +0000

18 Dec, 2013

2 commits

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

Rodrigo Souto
2013-12-18 18:40:51 -0300
dc423036 Merge remote branch 'mine/stoa-change-password' Browse Dir »

Rodrigo Souto
2013-12-18 14:47:47 -0300

16 Dec, 2013

4 commits

9c082693 Merge commit 'refs/merge-requests/425' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/425
```
Rodrigo Souto
2013-12-16 16:57:22 -0300
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
55649101 application-controller: uncomment protected scope Browse Dir »

Rodrigo Souto
2013-12-16 04:34:33 -0300
a8ef1884 users-controller: refactor index action Browse Dir »

Rodrigo Souto
2013-12-16 04:26:10 -0300

13 Dec, 2013

1 commit

d747ca15 features_admin: Sort features list alphabetically on admin control panel. ... Browse Dir »
```
(ActionItem2910)

Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Rafael de Souza Queiroz <querafael@live.com>
```
Marcos Ramos
2013-12-13 19:49:22 -0200