Charles Oliveira / noosfero

02 Apr, 2014

3 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

48038fc5 Merge branch 'stable' into noosfero_0.47.0 ... Browse Dir »

Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/categories_block.feature
	po/eo/noosfero.po
	po/es/noosfero.po
	po/it/noosfero.po
	test/unit/block_test.rb

2014-04-02 19:40:37 +0000

01 Apr, 2014

1 commit

67f6ebd9 content-viewer-controller: user_is_a_bot consider possible empty user_agent Browse Dir »

Rodrigo Souto
2014-04-01 18:30:30 +0000

26 Mar, 2014

2 commits

84503cc0 view-page: do not count hits on bot access ... Browse Dir »
```
(ActionItem3063)
```
Rodrigo Souto
2014-03-26 19:00:38 +0000

fe3ebd1c Added pagination on events ... Browse Dir »

agenda_improvements: Changed the limit to show the events

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>

(ActionItem3048)

2014-03-26 10:17:05 +0000

19 Mar, 2014

2 commits

dbb81838 extracted repeated code to a method Browse Dir »

Daniela Feitosa
2014-03-19 14:55:51 +0000

964df626 Merge branch 'signup_redirect_improvements' into 'master' ... Browse Dir »

Signup Redirect Improvements

Add environment feature for choosing where to redirect the user after signup. The options are the same as the ones for the login redirection options existing today.

This feature takes in consideration that the usar may have to follow a confirmation URL recieved by eletronic mail.

2014-03-19 14:56:00 +0000

16 Mar, 2014

1 commit

a3a68964 Merge branch 'AI3015-fix_profile_controller' of https://gitlab.com/participa/noo… ... Browse Dir »
```
…sfero into AI3015-fix_profile_controller
```
Daniela Feitosa
2014-03-16 23:41:55 +0000

14 Mar, 2014

3 commits

bec2b3cd bug_fix: redirection_after_login feature now works when ... Browse Dir »
```
allow_change_of_redirection is disabled.

(ActionItem2998)
```
Daniel
2014-03-14 20:03:25 -0300
b461081b admin_features: Add redirection options after signup when confirmation ... Browse Dir »
```
email is enabled.

(ActionItem2998)

Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
```
Daniel
2014-03-14 20:03:16 -0300
88f4efc5 admin_features: Add support for selecting where to redirect users after ... Browse Dir »
```
signup.

(ActionItem2998)

Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
```
Daniel
2014-03-14 20:02:49 -0300

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

20 Feb, 2014

2 commits

1221eda4 versions-diff: included js to radio_button control and adjusts on look-and-feel ... Browse Dir »
```
AI2822
```
Junior Silva
2014-02-20 19:56:28 -0300
f099dfa6 Remove unused method (profile_info) from profile_controller ... Browse Dir »
```
(ActionItem3015)
```
Victor Costa
2014-02-20 15:45:55 -0300

10 Feb, 2014

1 commit

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

30 Jan, 2014

1 commit

2253cc66 diff-article-versions: display differences between two article versions ... Browse Dir »
```
AI2822
```
Junior Silva
2014-01-30 17:59:39 -0300

24 Jan, 2014

1 commit

0597ba64 Merge remote-tracking branch 'danifeitosa/AI2822-fixes' into article-version ... Browse Dir »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
	db/schema.rb
```
Junior Silva
2014-01-24 18:14:16 -0300

23 Jan, 2014

1 commit

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

79890fca article-version: versioned_article: using diff to show differences between versions of article ... Browse Dir »
```
AI2822
```
Junior Silva
2014-01-21 16:12:57 -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

5 commits

8e720312 Replacing rev by version Browse Dir »

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

17 Jan, 2014

1 commit

20c5b0d1 Changing tests to check diff posts and using strings instead files Browse Dir »

Junior Silva
2014-01-17 18:43:11 -0300

15 Jan, 2014

3 commits

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