NoosferoGov / noosfero

03 Oct, 2016

2 commits

1da65470 Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging Browse Dir »

Victor Costa
2016-10-03 09:40:40 -0300
87ccdfde Merge branch 'master' into staging Browse Dir »

Victor Costa
2016-10-03 09:03:51 -0300

12 Sep, 2016

2 commits

9131021b updating plugins po files Browse Dir »

Leandro Santos
2016-09-12 16:40:49 -0300
11b5dfe9 updating po files Browse Dir »

Leandro Santos
2016-09-12 15:58:33 -0300

23 Aug, 2016

1 commit

5c074179 fix merge conflit Browse Dir »

Leandro Santos
2016-08-23 09:37:37 -0300

11 Aug, 2016

1 commit

6eb736e0 Remove TinyMce, RawHTML and Textile article types and create the possibility to … ... Browse Dir »
```
…choose wich editor will be used to create new text articles
```
Leandro Santos
2016-08-11 16:23:44 -0300

04 Aug, 2016

2 commits

82444d71 Merge branch 'master' into staging Browse Dir »

Leandro Santos
2016-08-04 14:44:43 -0300
2276f138 CommunityTrack: avoid html parse in body and lead tracks and steps Browse Dir »

Leandro Santos
2016-08-04 14:31:48 -0300

17 May, 2016

1 commit

71faccf7 Merge branch 'master' into staging ... Browse Dir »
```
Conflicts:
	app/views/shared/not_found.html.erb
```
Victor Costa
2016-05-17 13:22:32 -0300

16 May, 2016

1 commit

776ca7bc html_safe: Always return button_bar value to template Browse Dir »

Braulio Bhavamitra
2016-05-16 11:47:10 -0300

05 May, 2016

1 commit

701dd380 Merge branch 'master' into staging Browse Dir »

Leandro Santos
2016-05-05 13:23:27 -0300

27 Apr, 2016

1 commit

37dd81ce Fix top_ancestor of root categories ... Browse Dir »
```
The root categories are created with "blank" as ancestry, not with nil.
And should return itself when calling "top_ancestor".
```
Daniela Feitosa
2016-04-27 13:23:15 +0000

11 Apr, 2016

1 commit

29151d66 merging with master Browse Dir »

Leandro Santos
2016-04-11 22:05:29 -0300

08 Apr, 2016

1 commit

9f4a8f6a Drop deprecated finders Browse Dir »

Braulio Bhavamitra
2016-04-08 19:16:18 -0300

07 Apr, 2016

1 commit

cd68aebb Merge branch 'master_community_track' into 'master' ... Browse Dir »

fixes community track plugin

Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
Signed-off-by: Gustavo Jaruga <darkshades@gmail.com>
Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Victor Costa <vfcosta@gmail.com>

See merge request !816

2016-04-07 15:26:18 +0000

06 Apr, 2016

2 commits

cc5fdb28 Add subtitle field to blocks ... Browse Dir »

Add subtitle support to the following core blocks:
* my_network
* profile_search
* categories
* highlights
* slideshow
* article
* blog_archives
* featured_products
* feed_reader
* link_list
* location
* products
* profile_list
* raw_html
* recent_documents
* tags

Add subtitle support to the following plugins blocks:
* community_track: track_list
* container_block: container
* context_content: context_content
* display_content: display_content_block
* event: event
* gallery_block: gallery_block
* organization_ratings: organization_ratings_block
* people_block: people_base
* profile_members_headlines: headlines
* recent_content: recent_content_block
* relevant_content: relevant_content_block
* site_tour: tour
* sniffer: interests_block

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

2016-04-06 12:40:44 -0300

adb6d89d Refactoring for community_track plugin ... Browse Dir »
```
- Remove html from community_track models
- Extracts update_categories to categories helper
```
Marcos Pereira
2016-04-06 09:45:37 -0300

05 Apr, 2016

1 commit

11a81060 fixes community track plugin ... Browse Dir »

Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
Signed-off-by: Gustavo Jaruga <darkshades@gmail.com>
Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Victor Costa <vfcosta@gmail.com>

2016-04-05 18:08:28 -0300

24 Mar, 2016

1 commit

ed6f20bb fix merge with master conflit Browse Dir »

Leandro Santos
2016-03-24 16:23:23 -0300

18 Mar, 2016

1 commit

80b720d8 Removes date field format customization ... Browse Dir »
```
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
```
Gabriel Silva
2016-03-18 12:47:21 +0000

22 Jan, 2016

2 commits

4f7a8626 Merge branch 'master' into production Browse Dir »

Victor Costa
2016-01-22 15:14:54 -0300
d761fc80 community_track: fix seed setting Browse Dir »

Victor Costa
2016-01-22 14:25:07 -0300

21 Jan, 2016

1 commit

2ebc7cc4 community_track plugin: fix failing test ... Browse Dir »

Due to how will_paginate 3.0 works, we need to actually load the
paginated collection data by querying it as an array before calling
size() with not arguments directly on it.

2016-01-21 17:35:50 -0200

20 Jan, 2016

1 commit

8b709bd0 community_track: use assert_in_delta with DateTime ... Browse Dir »
```
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
```
Lucas Kanashiro
2016-01-20 15:48:42 -0200

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

12 Nov, 2015

1 commit

e74f65a7 Merge branch 'next' Browse Dir »

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

03 Nov, 2015

3 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
ba65e5b7 Merge branch 'master' into next Browse Dir »

Leandro Santos
2015-11-03 14:46:01 -0300

30 Oct, 2015

1 commit

262ebd29 Update translation files ... Browse Dir »
```
$ rake updatepo
```
Antonio Terceiro
2015-10-30 17:37:13 -0200

13 Oct, 2015

1 commit

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