AvaliaSPB-beta / noosfero

30 Nov, 2015

1 commit

d26eed6e Merge branch 'staging' into staging_rails4 ... Browse Dir »

Conflicts:
	app/helpers/forms_helper.rb
	app/views/cms/edit.html.erb
	lib/noosfero/api/entities.rb
	lib/noosfero/api/v1/comments.rb
	lib/noosfero/api/v1/search.rb
	test/unit/api/search_test.rb

2015-11-30 09:21:14 -0300

19 Nov, 2015

2 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
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

16 Nov, 2015

1 commit

a86306b1 New feature archive articles to avoid create comments, associate children articles and perform votes Browse Dir »

Michel Felipe
2015-11-16 16:48:41 -0300

03 Nov, 2015

2 commits

b8bc9b1d Merge branch 'next' into staging Browse Dir »

Leandro Santos
2015-11-03 17:54:16 -0300
f7761e0d Merge branch 'master' into rails4 Browse Dir »

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

28 Oct, 2015

1 commit

329fd763 blog: fixes duplication of blog image cover in blog page ... Browse Dir »
```
Fixes #150
```
Larissa Reis
2015-10-28 18:21:36 -0300

13 Oct, 2015

1 commit

878b67a8 merging with master Browse Dir »

Leandro Santos
2015-10-13 15:52:57 -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
edcc1305 Uses modal instead of deprecated colorbox Browse Dir »

Larissa Reis
2015-10-02 12:50:23 -0300

11 Sep, 2015

1 commit

ee8fd9e4 Merge branch 'noosfero' into rails4 Browse Dir »

Braulio Bhavamitra
2015-09-11 00:12:02 -0300

04 Sep, 2015

1 commit

41536a31 Merge branch 'master' into staging Browse Dir »

Victor Costa
2015-09-04 14:34:46 -0300

02 Sep, 2015

1 commit

04576c7e Fix clone article behavior ... Browse Dir »

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Omar Júnior <omarroinuj@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Vítor Barbosa <vitornga15@gmail.com>

2015-09-02 14:53:57 -0300

28 Aug, 2015

2 commits

c686ddb2 Merge branch 'noosfero' into rails4 Browse Dir »

Braulio Bhavamitra
2015-08-28 21:10:27 -0300
1ed260f3 Merge branch 'master' into staging Browse Dir »

Leandro Santos
2015-08-28 18:11:21 -0300

27 Aug, 2015

1 commit

840e77eb Added option to configure if preview in posts will be displayed Browse Dir »

Daniela Feitosa
2015-08-27 01:46:38 +0000

24 Aug, 2015

1 commit

cd3b5fda Fix images url on gallery when Noosfero's under subdirectory ... Browse Dir »
```
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
```
Tallys Martins
2015-08-24 05:47:29 -0300

13 Aug, 2015

2 commits

eb070c85 fixing conflit with master Browse Dir »

Leandro Santos
2015-08-13 17:44:13 -0300
5cc216ef Merge branch 'noosfero' into rails4 Browse Dir »

Braulio Bhavamitra
2015-08-13 14:38:45 -0300

12 Aug, 2015

1 commit

d168d5b8 Merge branch 'master' into article_datetime Browse Dir »

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

10 Aug, 2015

1 commit

5d003955 Use standard method for RSS-feed icon ... Browse Dir »
```
Move icon to the icon theme structure (awesome also have an icon for
this)
```
dtygel
2015-08-10 19:27:46 -0300

06 Aug, 2015

1 commit

c4d4eae3 Remove interpolation from translatable strings ... Browse Dir »
```
Also added test/unit/i18n_test.rb which will warn us if any others pop
up.
```
Antonio Terceiro
2015-08-06 18:47:21 -0300

04 Aug, 2015

1 commit

a7f039c7 Merge branch 'empty-folder-view' into 'master' ... Browse Dir »
```
folder: #empty? is emptying #children (probably a rails bug)

See merge request !637
```
Antonio Terceiro
2015-08-04 19:20:13 +0000

01 Aug, 2015

1 commit

f8dbcc7c rails4: use data-confirm to work with new rails.js Browse Dir »

Braulio Bhavamitra
2015-08-01 18:26:56 -0300

28 Jul, 2015

2 commits

049d7ae3 folder: fix empty subfolder view ... Browse Dir »
```
It seems #empty? is emptying #children (probably a rails bug)
```
Braulio Bhavamitra
2015-07-28 13:39:23 -0300
ee2c8e33 addthis: only show for public pages Browse Dir »

Braulio Bhavamitra
2015-07-28 12:37:47 -0300

25 Jul, 2015

1 commit

ef70a151 mergin with article_datetime branch Browse Dir »

Leandro Santos
2015-07-25 11:10:04 -0300

24 Jul, 2015

2 commits

e881f6c1 Adapting views and helpers to datime format Browse Dir »

Leandro Santos
2015-07-24 18:27:24 -0300
0e75f1c2 rails4: fix remaining funcionals tests Browse Dir »

Braulio Bhavamitra
2015-07-24 17:55:22 -0300

03 Jul, 2015

1 commit

ea468c0e Merge branch 'block-admin-mail' into production ... Browse Dir »
```
Conflicts:
	app/models/event.rb
	app/models/profile.rb
	po/fr/noosfero.po
```
Victor Costa
2015-07-03 10:45:54 -0300

17 Jun, 2015

3 commits

53c76729 content-viewer: use lead instead of straight abstract Browse Dir »

Rodrigo Souto
2015-06-17 15:19:07 -0300

5ddb93d8 Improved event display layout ... Browse Dir »

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-06-17 15:19:06 -0300

5ee24034 Refactoring article content visualization ... Browse Dir »

  - Added image label
  - Added image to article body
  - Changed some minor positioning

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fábio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-06-17 15:19:06 -0300

16 Jun, 2015

1 commit

364e52a3 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	lib/noosfero/plugin.rb
```
Victor Costa
2015-06-16 18:16:44 -0300

12 Jun, 2015

2 commits

208ec37b display-article: use proper way to fetch thumbnail Browse Dir »

Rodrigo Souto
2015-06-12 14:40:53 -0300

769eb2c5 Add new visualization option for blog posts. ... Browse Dir »

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2015-06-12 13:03:20 -0300

11 Jun, 2015

1 commit

bbcc0618 Improvments on folder visualization ... Browse Dir »

- Refactoring CSS to better display folder itens
- Creating method to display uploaded file names with extension in upper
  case

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-06-11 16:43:09 -0300

08 Jun, 2015

1 commit

3ce0f54e Merge branch 'master' into production Browse Dir »

Victor Costa
2015-06-08 10:46:33 -0300