Thiago Ribeiro / Noosfero

17 Jan, 2014

1 commit

4ad91064 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	test/unit/comment_test.rb
```
Rodrigo Souto
2014-01-17 18:08:25 +0000

16 Jan, 2014

1 commit

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

2d698f0b Fix jquery xss issue Browse Dir »

Victor Costa
2014-01-15 15:06:44 +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

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

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

16 Dec, 2013

1 commit

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

24 Nov, 2013

1 commit

e9867fe1 Replaced link_to_remote by link_to ... Browse Dir »
```
the method link_to_remote is deprecated on Rails 3

(ActionItem2899)
```
Daniela Feitosa
2013-11-24 05:22:47 +0000

14 Oct, 2013

1 commit

44627b4a use anti_spam plugin in suggest_articles ... Browse Dir »
```
ActionItem2691
```
Lucas Melo
2013-10-14 19:29:05 +0000

07 Oct, 2013

1 commit

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

Conflicts:
	app/controllers/public/catalog_controller.rb
```
Rodrigo Souto
2013-10-07 16:28:47 -0300

27 Sep, 2013

1 commit

817df70a Correct `#user .logged-in` ids and icons ... Browse Dir »

* The env admin link and the user pannel had the same controlpanel id.
* The user icon is now recovered.
* The #manage-enterprises icons was croped.

Closes ActionItem2817

2013-09-27 14:56:04 -0300

19 Sep, 2013

1 commit

fec8c9a7 Merge commit 'refs/merge-requests/295' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/295
```
Rodrigo Souto
2013-09-19 15:30:45 -0300

29 Jul, 2013

1 commit

deee26e0 Fix: "Post a comment" button was disappearing ... Browse Dir »
```
(ActionItem2742)
```
Daniela Feitosa
2013-07-29 03:56:57 +0000

17 Jul, 2013

3 commits

874e1575 Merge branch 'merge-requests/344' into stable ... Browse Dir »
```
g wrong happens with comment creation

Conflicts:
	public/javascripts/comment_form.js
```
Rodrigo Souto
2013-07-17 03:44:20 -0300
1b2a4981 comment counter should not update is somenthing wrong happens with comment creation Browse Dir »

Leandro Nunes dos Santos
2013-07-17 03:42:47 -0300
630d2384 Merge branch 'stable' Browse Dir »

Rodrigo Souto
2013-07-17 02:04:04 -0300

16 Jul, 2013

3 commits

6c4293c4 Merge commit 'refs/merge-requests/325' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/325
```
Rodrigo Souto
2013-07-16 22:34:56 -0300
f36e4843 Fixing comments counter ... Browse Dir »
```
Fixing the js method and also correcting the controller orders to
calculate the total count.
```
Rodrigo Souto
2013-07-16 21:23:08 -0300
f31f2d99 comment counter should not update is somenthing wrong happens with comment creation Browse Dir »

Leandro Nunes dos Santos
2013-07-16 15:50:57 -0300

08 Jul, 2013

3 commits

2e7d2cf5 changing the position of the comment actions and adding hotspot for comment plugins Browse Dir »

Leandro Nunes dos Santos
2013-07-08 18:48:09 -0300
b3f8c189 displaying send comment button after save a new comment Browse Dir »

Leandro Nunes dos Santos
2013-07-08 17:52:03 -0300
4505dc33 display send a comment button after reply a comment Browse Dir »

Leandro Nunes dos Santos
2013-07-08 11:00:29 -0300

01 Jul, 2013

1 commit

bff5794a fixing comment creation/reply bugs Browse Dir »

Victor Costa
2013-07-01 09:52:37 -0300

28 Jun, 2013

3 commits

935ff6bc mergin with ActionItem2562 Browse Dir »

Leandro Nunes dos Santos
2013-06-28 09:31:28 -0300
7989a4c7 merging with stable Browse Dir »

Leandro Nunes dos Santos
2013-06-28 09:13:53 -0300
1ed7d9c3 fixing creation of comment Browse Dir »

Victor Costa
2013-06-28 09:11:14 -0300

27 Jun, 2013

1 commit

8f42e790 merging with stable Browse Dir »

Leandro Nunes dos Santos
2013-06-27 10:05:35 -0300

31 May, 2013

1 commit

d46b83c6 chat.js: escape html tags in messages ... Browse Dir »
```
ActionItem2682
```
Lucas Melo
2013-05-31 12:56:19 -0300

29 May, 2013

1 commit

2249f490 Makes price details to work with "other costs" ... Browse Dir »
```
closes ActionItem2519
```
Aurélio A. Heckert
2013-05-29 15:50:37 -0300

15 May, 2013

1 commit

1f808a1c show menu items after the user clicks on menu Browse Dir »

Victor Costa
2013-05-15 10:54:44 -0300

10 May, 2013

1 commit

cfb0d900 Fixed chat ... Browse Dir »

- Syntax error on chat
- Reviewed INSTALL.chat
- Added function to update the list of users online on main window

(ActionItem2667)

2013-05-10 18:02:38 +0000

09 May, 2013

1 commit

7d51ce8b Merge commit 'refs/merge-requests/298' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/298

Added html_safe that was missing on the block_helper new method

Conflicts:
	app/views/box_organizer/_highlights_block.rhtml
	test/unit/application_helper_test.rb

2013-05-09 15:36:19 -0300

17 Apr, 2013

1 commit

527ee379 Merge branch 'stable' ... Browse Dir »

Basically html_safe in some places that the stable branch had.

Conflicts:
	app/models/article_block.rb
	app/models/tags_block.rb

2013-04-17 17:12:26 -0300

15 Apr, 2013

1 commit

4221949b Replacing prototype with jQuery on the loading method Browse Dir »

Rodrigo Souto
2013-04-15 17:05:41 -0300

11 Apr, 2013

1 commit

dc107520 adding a menu to display comment actions Browse Dir »

Victor Costa
2013-04-11 13:55:46 -0300

10 Apr, 2013

1 commit

d100def5 Improving colorbox window size defaults Browse Dir »

Aurélio A. Heckert
2013-04-10 14:25:18 -0300

26 Mar, 2013

1 commit

03d33e49 Fixed test: comment.feature Browse Dir »

Rodrigo Souto
2013-03-26 19:36:37 +0000

22 Mar, 2013

1 commit

c806d821 Adding "My Communities" to the user menu ... Browse Dir »
```
ActionItem1030
```
Visita
2013-03-22 17:38:35 -0300