Thiago Ribeiro / Noosfero

07 Mar, 2014

4 commits

019bbf17 add infra to embed track block Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-03-07 16:24:40 -0300
91c78592 add infra to embed track block Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-03-07 16:24:09 -0300
705a8ec6 add infra to embed feature Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-03-07 16:22:33 -0300

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

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

13 Feb, 2014

1 commit

a38702e3 Merge branch 'ai2992' of https://gitlab.com/brauliobo/noosfero into brauliobo/noosfero-ai2992 Browse Dir »

Rodrigo Souto
2014-02-13 22:05:32 -0300

12 Feb, 2014

1 commit

10ab44f4 Sort theme listing Browse Dir »

Braulio Bhavamitra
2014-02-12 14:35:58 -0300

11 Feb, 2014

4 commits

c51270d7 users-controller: default filter to all_users ... Browse Dir »
```
(ActionItem2995)
```
Rodrigo Souto
2014-02-11 23:28:10 +0000
f8b1f66d users-controller: order users by name ... Browse Dir »
```
Also adding a new assert helper to test the order of a collection
without assuming all elements inside it.

(ActionItem2996)
```
Rodrigo Souto
2014-02-11 23:27:45 +0000
27ef9853 Don't duplicate themes Browse Dir »

Braulio Bhavamitra
2014-02-11 18:06:18 -0300

712b5f51 Merge branch 'ai2977' into 'stable' ... Browse Dir »

Don't render layout for javascript format

This is the default behaviour for Rails when rendering .js.erb files. Check http://stackoverflow.com/questions/4060300/when-rendering-js-erb-file-it-renders-layout-with-the-javascript-is-it-a-bug

2014-02-11 02:36:16 +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

05 Feb, 2014

1 commit

15080d64 Don't render layout for javascript format ... Browse Dir »

This is the default behaviour for Rails when rendering .js.erb files.
Check
http://stackoverflow.com/questions/4060300/when-rendering-js-erb-file-it-renders-layout-with-the-javascript-is-it-a-bug

2014-02-05 12:11:39 -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

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

4 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
cf94bc1e container_block: do not show its boxes at add_block view Browse Dir »

Victor Costa
2014-01-23 13:56:21 -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

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

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