Charles Oliveira / noosfero

23 Nov, 2015

2 commits

a3937f82 Fix task mailer tests Browse Dir »

Victor Costa
2015-11-23 16:36:21 -0300
56f3aee2 api: better support to choose returned fields Browse Dir »

Victor Costa
2015-11-23 16:36:08 -0300

17 Nov, 2015

1 commit

92fbfd94 Merge branch 'master_rails4' into staging ... Browse Dir »

Conflicts:
	Gemfile
	Rakefile
	app/controllers/box_organizer_controller.rb
	app/controllers/my_profile/tasks_controller.rb
	app/controllers/public/profile_controller.rb
	app/mailers/user_mailer.rb
	app/models/article.rb
	app/models/person.rb
	app/models/product_category.rb
	app/models/task.rb
	config/application.rb
	config/routes.rb
	lib/acts_as_having_settings.rb
	lib/noosfero/api/entities.rb
	lib/noosfero/api/helpers.rb
	lib/noosfero/api/session.rb
	lib/noosfero/api/v1/articles.rb
	lib/noosfero/api/v1/contacts.rb
	lib/noosfero/api/v1/search.rb
	lib/noosfero/api/v1/users.rb
	test/functional/tasks_controller_test.rb
	test/unit/api/articles_test.rb
	test/unit/api/helpers_test.rb
	test/unit/api/people_test.rb
	test/unit/api/search_test.rb
	test/unit/api/session_test.rb
	test/unit/api/users_test.rb
	test/unit/person_notifier_test.rb
	test/unit/task_test.rb
	vendor/plugins/access_control/lib/acts_as_accessible.rb

2015-11-17 09:23:22 -0300

13 Nov, 2015

6 commits

42b3475d Merge branch 'master' of gitlab.com:noosfero/noosfero Browse Dir »

Leandro Santos
2015-11-13 14:35:58 -0300

bd70a538 Merge branch 'fix_image_cache_key' into 'master' ... Browse Dir »

Fix cache_key expiration on image uploaded in articles

Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>

See merge request !717

2015-11-13 17:16:19 +0000

67589517 Fix cache_key expiration on image uploaded in articles ... Browse Dir »
```
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
```
Thiago Ribeiro
2015-11-13 14:57:32 -0200
1e537056 add test for user api Browse Dir »

Marcos Pereira
2015-11-13 10:57:23 -0300
0ac23124 api: fixes to merge api to rails 4 ... Browse Dir »
```
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
```
Rodrigo Souto
2015-11-13 10:57:23 -0300

b164af65 API improvements: ... Browse Dir »

- Add several endpoints
- Add some API documentation
- Fix plugins API hotspot

Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Leandro Nunes dos Santos <leandronunes@gmail.com>
Signed-off-by: Evandro Junior <evandrojr@gmail.com>
Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>
Signed-off-by: Caio SBA <caio@colivre.coop.br>
Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com>
Signed-off-by: Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
Signed-off-by: Aurelio A. Heckert <aurelio@colivre.coop.br>
Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
Signed-off-by: Marcelo Júnior <maljunior@gmail.com>
Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
Signed-off-by: Larissa Reis <larissa@colivre.coop.br>
Signed-off-by: ABNER SILVA DE OLIVEIRA <abner.oliveira@serpro.gov.br>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Simião Carvalho <simiaosimis@gmail.com>
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>

2015-11-13 10:57:23 -0300

12 Nov, 2015

2 commits

fd06f939 adapting tests to use nokogiri correctly Browse Dir »

Leandro Santos
2015-11-12 17:38:03 -0300
e74f65a7 Merge branch 'next' Browse Dir »

Leandro Santos
2015-11-12 16:32:29 -0300

05 Nov, 2015

3 commits

678f0e26 Merge branch 'master' into rails4 Browse Dir »

Antonio Terceiro
2015-11-05 15:11:22 -0200
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

03 Nov, 2015

1 commit

f7761e0d Merge branch 'master' into rails4 Browse Dir »

Antonio Terceiro
2015-11-03 15:57:40 -0200

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

3 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

1b6f9e37 Merge branch 'noosfero' into rails4 Browse Dir »

Braulio Bhavamitra
2015-10-07 11:10:13 -0300
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

03 Oct, 2015

1 commit

36a91335 Merge branch 'noosfero' into rails4 Browse Dir »

Braulio Bhavamitra
2015-10-03 08:44:26 -0300

02 Oct, 2015

3 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

2015-10-02 21:43:33 -0300

f09b8e4e Merge branch 'master' of https://gitlab.com/noosfero/noosfero into rails4 Browse Dir »

Braulio Bhavamitra
2015-10-02 17:12:37 -0300
56400709 avoid html double escape ... Browse Dir »
```
This is already handled on rails 3.

Fix #62
```
Rodrigo Souto
2015-10-02 11:27:36 -0300

01 Oct, 2015

1 commit

8cb63032 Merge branch 'redemoinho-improvements' into noosfero Browse Dir »

Braulio Bhavamitra
2015-10-01 10:02:32 -0300

30 Sep, 2015

1 commit

d66aa24c merging with master Browse Dir »

Leandro Santos
2015-09-30 20:12:05 -0300

29 Sep, 2015

1 commit

b62774ed Merge branch 'noosfero' into redemoinho-improvements Browse Dir »

Braulio Bhavamitra
2015-09-29 20:39:19 -0300