Charles Oliveira / noosfero

18 Dec, 2015

3 commits

d3b5575c api: fix ambiguity with children_count in article search Browse Code »

Victor Costa
2015-12-18 13:31:01 -0300
3a07ccbb Remove file added by mistake Browse Code »

Victor Costa
2015-12-18 09:49:38 -0300
8d9a57db Merge branch 'master' into staging ... Browse Code »
```
Conflicts:
	Rakefile
```
Victor Costa
2015-12-18 09:35:11 -0300

17 Dec, 2015

2 commits

738d396b api: apply article filters in search method Browse Code »

Victor Costa
2015-12-17 10:01:15 -0300

7e575db7 Merge branch 'api_articles_grandchildren' into 'staging' ... Browse Code »

API - New endpoint: Get grandchildren of a article

Added new endpoint to get all **grandchildren** of a specific article. The URI of this endpoint is: `:id/children/:child_id/children`

See merge request !6

2015-12-17 10:46:20 -0200

16 Dec, 2015

12 commits

9e3e94b3 responsive: remove empty conflicting file Browse Code »

Braulio Bhavamitra
2015-12-16 19:58:27 -0300
4cf430e9 Merge branch 'staging' into api_articles_grandchildren ... Browse Code »
```
Conflicts:
	lib/noosfero/api/v1/search.rb
```
Victor Costa
2015-12-16 17:44:18 -0300
7a56a75e api: added param 'has_children' into search article endpoint Browse Code »

Michel Felipe
2015-12-16 17:40:51 -0300
8ebfe266 Merge branch 'login-captcha' into 'staging' ... Browse Code »
```
Login captcha

Merge previous repository with staging

See merge request !7
```
Victor Costa
2015-12-16 17:36:38 -0200
553a5c2f Merge branch 'staging' into login-captcha Browse Code »

Victor Costa
2015-12-16 15:09:00 -0300
2ba09a89 Remove debug code Browse Code »

Victor Costa
2015-12-16 15:04:26 -0300
a0944909 Merged login-captcha with staging Browse Code »

Carlos Purificação
2015-12-16 15:04:26 -0300
e6801b9c cucumber: set rails_env to cucumber instead of test Browse Code »

Rodrigo Souto
2015-12-16 14:09:04 -0300
eaa94bb4 Add ruby version conf Browse Code »

Victor Costa
2015-12-16 13:38:23 -0300
f79ff688 Remove redundant load of plugins' rake tasks Browse Code »

Arthur Esposte
2015-12-16 12:51:00 -0300
c58ea4db Update proposals_discussion plugin Browse Code »

Victor Costa
2015-12-16 11:13:04 -0300
b698d268 Update proposals_discussion plugin Browse Code »

Victor Costa
2015-12-16 10:03:56 -0300

15 Dec, 2015

13 commits

d9561154 Replace interpolation by full strings Browse Code »

Daniela Feitosa
2015-12-15 21:42:55 -0300
788ad817 Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging Browse Code »

Victor Costa
2015-12-15 18:13:50 -0300
c24579c4 Update pairwise plugin Browse Code »

Victor Costa
2015-12-15 18:13:38 -0300
8f432858 Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging Browse Code »

Leandro Santos
2015-12-15 18:05:07 -0300
0881f908 remove feedback hardcoded code Browse Code »

Leandro Santos
2015-12-15 18:04:48 -0300
302b8afb Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging Browse Code »

Victor Costa
2015-12-15 17:50:59 -0300
c8fa463d Update proposals_discussion plugin Browse Code »

Victor Costa
2015-12-15 17:50:49 -0300
cf372b23 fix logic of equivalent assertion for arrays with same size and elements duplicated Browse Code »

Leandro Santos
2015-12-15 16:59:28 -0300
f88ca472 cucumber: ensure rails_env is test if not passed Browse Code »

Rodrigo Souto
2015-12-15 15:31:19 -0300
ef4af465 Article visibility options meaning are now clearer Browse Code »

Daniela Feitosa
2015-12-15 14:09:20 -0300

568d29ce Merge branch 'xss_terminate_custom_options' into 'master' ... Browse Code »

Fix XSS terminate removing custom attributes for Macros

Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>

See merge request !748

2015-12-15 17:01:04 +0000

e09406fd adding insight submodule plugin Browse Code »

Leandro Santos
2015-12-15 13:38:09 -0300
67ed6ad5 Update proposals discussion plugin Browse Code »

Victor Costa
2015-12-15 09:53:52 -0300

14 Dec, 2015

6 commits

7816909c Merge branch 'limit_email_notification_width' into 'master' ... Browse Code »

Fix: width of table on notification emails

When articles with big images were displayed, the width of the table was
overflowing the content

See merge request !747

2015-12-14 21:34:32 +0000

2f6a334d api: paginate article search Browse Code »

Victor Costa
2015-12-14 18:27:18 -0300

fcce10fe Fix XSS terminate removing custom attributes for Macros ... Browse Code »

Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>

2015-12-14 18:24:57 -0200

643884a9 Fix merge Browse Code »

Victor Costa
2015-12-14 17:23:39 -0300
ec7bb260 Fix: width of table on notification emails ... Browse Code »
```
When articles with big images were displayed, the width of the table was
overflowing the content
```
Daniela Feitosa
2015-12-14 15:42:42 -0300
ba70edb6 Update proposals_discussion plugin Browse Code »

Victor Costa
2015-12-14 09:57:54 -0300

12 Dec, 2015

4 commits

9c680ef2 enterprise: Use has_many for #product_categories Browse Code »

Braulio Bhavamitra
2015-12-12 14:46:34 -0300
6f2734cd assert_equivalent: fix typo (enum -> norm) ... Browse Code »
```
See https://travis-ci.org/noosfero/noosfero/jobs/96468167
```
Braulio Bhavamitra
2015-12-12 14:45:39 -0300
9a000264 Remove binary contents add by mistake Browse Code »

Braulio Bhavamitra
2015-12-12 14:33:01 -0300
d79e1da5 shopping_cart: fix functional and selenium tests Browse Code »

Braulio Bhavamitra
2015-12-12 14:24:57 -0300