Omar Junior / Noosfero

21 Feb, 2014

1 commit

6b9f92b5 Don't show p if empty Browse Dir »

Braulio Bhavamitra
2014-02-21 13:21:04 -0300

11 Feb, 2014

1 commit

e066c0a5 Merge branch 'ai2961' into 'stable' ... Browse Dir »
```
Remove extra div close tag on location block

http://noosfero.org/Development/ActionItem2961
```
Rodrigo Souto
2014-02-11 01:45:54 +0000

20 Jan, 2014

3 commits

9967acdc Remove extra div close tag Browse Dir »

Braulio Bhavamitra
2014-01-20 20:04:22 -0300
a1813557 cms-edit: move article.js include to the bottom of the file Browse Dir »

Rodrigo Souto
2014-01-20 17:00:41 -0300
c3105ac9 article-lead: move js to separate file ... Browse Dir »
```
article.js was being included twice.

(ActionItem2956)
```
Rodrigo Souto
2014-01-20 16:59:17 -0300

17 Jan, 2014

2 commits

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

Joenio Costa
2014-01-17 09:56:15 -0300

16 Jan, 2014

7 commits

0a187954 Merge branch 'master' of https://gitlab.com/noosfero/noosfero Browse Dir »

Rodrigo Souto
2014-01-16 18:20:31 -0300
757bfb50 Merge branch 'AI2844' Browse Dir »

Daniela Feitosa
2014-01-16 17:35:52 +0000
0a577775 join_button: added class to style join button ... Browse Dir »
```
(ActionItem2844)
```
Daniela Feitosa
2014-01-16 17:25:24 +0000
d7c27610 link-list-block-view: fix default target value Browse Dir »

Rodrigo Souto
2014-01-16 17:14:27 +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
a4267385 Merge branch 'track-fixes' Browse Dir »

Rodrigo Souto
2014-01-16 16:06:09 +0000
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

7 commits

fa207812 Adding css class "title" back to 'editing block' window ... Browse Dir »
```
(ActionItem2923)
```
Joenio Costa
2014-01-15 22:26:30 -0300
4cb862a0 Merge remote-tracking branch 'participa/AI2923-block_name_in_edit_mode' into next Browse Dir »

Joenio Costa
2014-01-15 22:17:14 -0300
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
6e9b3b36 Fix xss issue at body_classes Browse Dir »

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

13 Jan, 2014

1 commit

91dd26a2 Merge branch 'next' into AI2914-main_block_options Browse Dir »

Joenio Costa
2014-01-13 17:07:46 -0300

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>