Charles Oliveira / noosfero

19 Nov, 2015

1 commit

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

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

13 Oct, 2015

1 commit

878b67a8 merging with master Browse Dir »

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

19 Aug, 2015

1 commit

121912b3 Merge branch 'shopping-cart-with-orders-and-delivery-plugins' ... Browse Dir »

Conflicts:
	Gemfile
	app/models/profile.rb
	plugins/shopping_cart/lib/shopping_cart_plugin.rb
	plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
	plugins/shopping_cart/po/de/shopping_cart.po
	plugins/shopping_cart/po/es/shopping_cart.po
	plugins/shopping_cart/po/fr/shopping_cart.po
	plugins/shopping_cart/po/hy/shopping_cart.po
	plugins/shopping_cart/po/pt/shopping_cart.po
	plugins/shopping_cart/po/ru/shopping_cart.po
	plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb
	plugins/shopping_cart/views/cart.html.erb
	plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
	plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb

2015-08-19 13:05:49 -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

1 commit

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

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

14 Jun, 2015

1 commit

7391983a Add loading overlay js/css Browse Dir »

Braulio Bhavamitra
2015-06-14 17:32:45 -0300

11 Jun, 2015

1 commit

b49fa908 Adding bigger icons when displaying folders ... Browse Dir »
```
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
```
André Guedes
2015-06-11 16:43:09 -0300

05 Jun, 2015

1 commit

d7d222b8 Merge branch 'task_taggable' into production Browse Dir »

Leandro Santos
2015-06-05 08:38:13 -0300

03 Jun, 2015

1 commit

60772912 Refactor in tasks.js to create a singleton 'Task', show success icon after save … ... Browse Dir »
```
…each tag and tasks.css changes
```
Michel Felipe
2015-06-03 18:00:43 -0300

12 May, 2015

2 commits

ea5d6c29 merging with master Browse Dir »

Leandro Santos
2015-05-12 21:45:22 -0300

f82f1955 Add new layout template with 4 boxes ... Browse Dir »

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>

2015-05-12 13:15:35 -0300

08 May, 2015

1 commit

201327e1 Created tests for the new controller and added images ... Browse Dir »
```
	Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
```
André Guedes
2015-05-08 16:13:55 -0300

24 Feb, 2015

1 commit

0531c6a2 merging with master Browse Dir »

Leandro Santos
2015-02-24 11:37:25 -0300

04 Feb, 2015

1 commit

60262a33 Merge branch 'master' into stable ... Browse Dir »

Conflicts:
	app/controllers/public/search_controller.rb
	app/models/profile.rb
	app/views/cms/edit.html.erb
	public/stylesheets/application.css

2015-02-04 13:02:40 -0300

16 Dec, 2014

2 commits

db0dabfe Preview images for highlights block Browse Dir »

Victor Costa
2014-12-16 10:54:07 -0300
e42898b8 Add some icons to block store ... Browse Dir »
```
Icons provided by AurelioAHeckert
```
Victor Costa
2014-12-16 10:23:55 -0300

22 Aug, 2014

1 commit

9796d5e3 refactoring block store to make images path available for plugins and themes Browse Dir »

Leandro Santos
2014-08-22 18:36:47 -0300

19 Aug, 2014

2 commits

ad11e627 removing image of old position Browse Dir »

Leandro Santos
2014-08-19 09:27:25 -0300
ca5457e9 changing position of layout position indication Browse Dir »

Leandro Santos
2014-08-19 09:20:48 -0300

18 Aug, 2014

2 commits

b7823262 Merge branch 'master' into stoa ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/cms_controller.rb
	db/schema.rb
```
Rodrigo Souto
2014-08-18 12:31:32 -0300
0e391d12 Merge branch 'master' into AI3279-block_store Browse Dir »

Leandro Santos
2014-08-18 12:04:17 -0300

28 Jul, 2014

1 commit

6101e639 fix zoom image bug: upgrade fancybox version ... Browse Dir »

(ActionItem3193)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>

2014-07-28 15:32:52 -0400

22 Jul, 2014

2 commits

852b5dff [template-welcome-page] Add new icon for control-panel button Browse Dir »

Rodrigo Souto
2014-07-22 11:13:54 -0300
9ec2cf52 improve feature to add or move blocks Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-07-22 10:55:11 -0300

28 Mar, 2014

1 commit

b15b9498 Link_List_Block_Improvements: Add Drag and Drop and auto-complete to LinkListBlock ... Browse Dir »

(ActionItem2582)

- Changed link list html structure from table to ul/li
- Added image that indicates draggable area
- Added Drag and Drop javascript
- Added button that delete the link
- Added auto complete to Address field
- Corrected syntax error on token_helper

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>

2014-03-28 09:19:37 -0300

25 Dec, 2012

1 commit

f8df6354 Revert "Assets moved from the public and adapted to Rails 3 standard" ... Browse Dir »
```
This reverts commit 86d4d6669bb21fd220f6a2d0d0b2ad0e27954ed7.
```
Antonio Terceiro
2012-12-25 16:40:55 -0300

23 Dec, 2012

1 commit

822d4f60 Merge branch 'master' into rails3 Browse Dir »

Antonio Terceiro
2012-12-23 22:10:31 -0300

03 Dec, 2012

1 commit

53d8ceb4 Merge branch 'merge-requests/248' into redemoinho ... Browse Dir »
```
Conflicts:
	lib/noosfero/plugin/settings.rb
	test/unit/plugin_settings_test.rb
```
Rodrigo Souto
2012-12-03 13:34:00 -0300

15 Nov, 2012

1 commit

a65d1a58 More enhancements on signup screen ... Browse Dir »
```
Changed strings to be more clear to user
Changed colors of images
```
Daniela Feitosa
2012-11-15 19:47:34 -0200

08 Nov, 2012

1 commit

c90b8e63 Highlight the products in listing ... Browse Dir »
```
(ActionItem2439)
```
Joenio Costa
2012-11-08 21:26:22 +0000

06 Nov, 2012

1 commit

86d4d666 Assets moved from the public and adapted to Rails 3 standard Browse Dir »

Rafael Manzo
2012-11-06 14:17:56 -0200

21 Aug, 2012

1 commit

5853fd51 UI to mark comments as ham ... Browse Dir »

Additionally, I have made the "Mark as SPAM" and "Remove" links in the
page view comment listing work through AJAX, so that now it is much more
practical to remove comments or mark them as spam.

ActionItem2306

2012-08-21 15:43:11 -0300

20 Jul, 2012

1 commit

78a0bcf5 Merge branch 'master' into AI2371 ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/cms_controller.rb
```
Antonio Terceiro
2012-07-20 15:02:12 -0300

19 Jul, 2012

1 commit

75524307 Merging AI1826 with master ... Browse Dir »

Conflicts:
	app/models/article.rb
	app/models/profile.rb
	app/models/uploaded_file.rb
	public/javascripts/application.js
	public/stylesheets/application.css
	test/unit/article_test.rb
	test/unit/category_finder_test.rb
	test/unit/enterprise_test.rb

2012-07-19 09:19:22 -0300

18 Jul, 2012

1 commit

91bf3f94 Some enhancements on solr ... Browse Dir »

Removed whitespaces
Recovered schema.rb without plugins fields
Included info about solr support of multitenancy on solr.yml.dist

2012-07-18 10:38:00 -0300

15 Jun, 2012

1 commit

cad471df Enhancements on text editor sidebar - first take ... Browse Dir »
```
ActionItem2371
```
Antonio Terceiro
2012-06-15 17:54:54 -0300

17 May, 2012

2 commits

e3f53121 Adjusting when there is just one column Browse Dir »

Caio Almeida
2012-05-17 00:58:32 -0300
03ef06e4 Wall fixes after review Browse Dir »

Caio Almeida
2012-05-17 00:58:28 -0300