Charles Oliveira / noosfero

19 Nov, 2015

6 commits

46549f70 Merge branch 'master_rails3' into staging ... Browse Dir »
```
Conflicts:
	app/models/article.rb
	app/models/comment.rb
```
Victor Costa
2015-11-19 17:27:30 -0300
fdc0a304 Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging Browse Dir »

Victor Costa
2015-11-19 17:21:21 -0300

1e0c5046 Merge branch 'api-article-archived' into 'staging' ... Browse Dir »

API - Article archived endpoints verification

Was added on Grape API, archived article `Rails Validation Exceptions` and verification `Hits` article counter. News unit tests was created to check this situations.

**Obs:** Please, check the merge request !2 before this

See merge request !4

2015-11-19 18:19:40 -0200

a1a1a821 Merge branch 'master_rails3' into staging Browse Dir »

Victor Costa
2015-11-19 17:15:03 -0300
2020d549 Fix resend activation code for users Browse Dir »

Victor Costa
2015-11-19 11:00:12 -0300
5b923237 Avoid count hits and add comments in archived articles. Added to new unit tests and translated msg Browse Dir »

Michel Felipe
2015-11-19 08:53:14 -0300

18 Nov, 2015

3 commits

f56d5e71 Changes in endpoints to verify archived article validation Browse Dir »

Michel Felipe
2015-11-18 14:53:46 -0300
6cee467c api: method to resend activation code Browse Dir »

Victor Costa
2015-11-18 10:54:06 -0300
b29e7d78 Add method to resend activation code Browse Dir »

Victor Costa
2015-11-18 10:53:42 -0300

17 Nov, 2015

1 commit

2287ee28 Do not return private token when user is inactive Browse Dir »

Victor Costa
2015-11-17 10:07:33 -0300

16 Nov, 2015

2 commits

7fe25f4d Fix unit test in api search Browse Dir »

Victor Costa
2015-11-16 16:51:30 -0300
b69e4d6a Remove trailing spaces Browse Dir »

Victor Costa
2015-11-16 16:27:43 -0300

05 Nov, 2015

2 commits

80800e40 Change feed published metho to consider it's parent privacy Browse Dir »

Arthur Esposte
2015-11-05 10:52:52 +0000
e3817276 Fix article visibility in creation ... Browse Dir »
```
* It fix the private feed creation problem
* Closes #148

Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
```
Arthur Esposte
2015-11-05 10:41:35 +0000

04 Nov, 2015

2 commits

5e592c20 fix merge conflit Browse Dir »

Leandro Santos
2015-11-04 08:50:06 -0300
ae133d6f access comments through profile author Browse Dir »

Leandro Santos
2015-11-04 08:45:32 -0300

28 Oct, 2015

2 commits

2409576d adding article entities attributes Browse Dir »

Leandro Santos
2015-10-28 15:59:41 -0300
a78018eb adding person fields in entities Browse Dir »

Leandro Santos
2015-10-28 15:38:33 -0300

27 Oct, 2015

2 commits

8c6c49ca return vote_count and comments_count attributes from person profile Browse Dir »

Leandro Santos
2015-10-27 18:38:15 -0300
ce08b7cc should filter person fieldws return by fields parameters Browse Dir »

Leandro Santos
2015-10-27 15:15:36 -0300

14 Oct, 2015

2 commits

9bca97e7 fix unit tests Browse Dir »

Leandro Santos
2015-10-14 14:46:13 -0300
3a3d6875 get the current user even private token is expired Browse Dir »

Leandro Santos
2015-10-14 14:03:30 -0300

13 Oct, 2015

3 commits

e0a87b2f merging with next Browse Dir »

Leandro Santos
2015-10-13 16:14:37 -0300
878b67a8 merging with master Browse Dir »

Leandro Santos
2015-10-13 15:52:57 -0300

66c7b785 Block store: improve usability of adding/moving blocks ... Browse Dir »

Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>

Conflicts:
	app/controllers/my_profile/profile_design_controller.rb
	app/helpers/boxes_helper.rb
	app/helpers/layout_helper.rb
	app/views/layouts/_javascript.html.erb
	public/stylesheets/application.css
	test/functional/environment_design_controller_test.rb
	test/functional/profile_design_controller_test.rb

2015-10-13 13:10:58 -0300

08 Oct, 2015

3 commits

0fa27860 Merge branch 'fix_highlight_block' into 'master' ... Browse Dir »
```
Fix highlights_block error on add Noosfero.root

@danielafeitosa, can you review this merge request?

See merge request !701
```
Daniela Feitosa
2015-10-08 14:51:50 +0000
74a61295 Fix highlights_block error on add Noosfero.root ... Browse Dir »
```
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
```
Luciano Prestes
2015-10-08 16:46:33 +0200
8ac3abc1 Fix and add tests for show requestor email on AddMember task Browse Dir »

Luciano Prestes
2015-10-08 16:33:34 +0200

07 Oct, 2015

2 commits

a4d115e7 Show email of requestor in AddMember task ... Browse Dir »

Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>

2015-10-07 19:34:08 +0200

92476194 Merge branch 'comment-encode' into 'master' ... Browse Dir »
```
avoid html double escape

This is already handled on rails 3.
Fix #64

See merge request !687
```
Antonio Terceiro
2015-10-07 13:53:05 +0000

06 Oct, 2015

1 commit

70d40ab5 Fix image address in highlightBlock when in subdir ... Browse Dir »

Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Signed-off-by: Simião Carvalho <simiaosimis@gmail.com>
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>

Closes merge request !688

2015-10-06 15:23:49 -0300

02 Oct, 2015

2 commits

e2feaba3 Fixes test after spread button change to modal api ... Browse Dir »

Fixes test broken after changing spread button to use modal api. Also
removes colorbox class that I forgot to remove in previous commit, since
now we are using modal api. For reference see commit:
edcc13059b31341eb78e58079ac2322f1142f206