Software Publico / Noosfero

20 Oct, 2012

1 commit

ac098d93 Adding blocks whitelist for receive dropped draggable elements Browse Dir »

Daniel Cunha
2012-10-20 17:27:28 -0300

07 Oct, 2012

1 commit

fc8557c3 Merge commit 'refs/merge-requests/213' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/213

Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/view_page.rhtml
	lib/noosfero/plugin.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/comment_test.rb

2012-10-07 01:08:23 -0300

01 Oct, 2012

1 commit

5fb09b51 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	po/pt/noosfero.po
	public/javascripts/application.js
```
Antonio Terceiro
2012-10-01 01:33:21 -0300

11 Sep, 2012

2 commits

cbc821f2 Merge commit 'refs/merge-requests/216' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/216

Conflicts:
	debian/changelog
	etc/noosfero/varnish-noosfero.vcl
	lib/noosfero.rb
```
Daniela Feitosa
2012-09-11 17:38:00 -0300
d570dc44 Properly update UI after comment removal/spam mark ... Browse Dir »
```
ActionItem2306
```
Antonio Terceiro
2012-09-11 16:01:09 -0300

06 Sep, 2012

2 commits

fc679164 Don't crash with a non existant (old) facet Browse Dir »

Braulio Bhavamitra
2012-09-06 15:28:25 -0300
001518e4 Enable map view with category filter search Browse Dir »

Braulio Bhavamitra
2012-09-06 09:05:47 -0300

05 Sep, 2012

1 commit

f4012a36 Merge branch 'stable' Browse Dir »

Antonio Terceiro
2012-09-05 16:13:20 -0300

04 Sep, 2012

1 commit

f25bd3ac Add functions to check multiple and map search conditions Browse Dir »

Braulio Bhavamitra
2012-09-04 19:19:04 +0000

27 Aug, 2012

1 commit

575c695e [tolerance-time] Moving method to ApplicationHelper Browse Dir »

Rodrigo Souto
2012-08-27 18:32:35 +0000

24 Aug, 2012

1 commit

cbac61f7 Merge branch 'master' into antispam ... Browse Dir »
```
Conflicts:
	lib/noosfero/plugin/context.rb
	lib/noosfero/plugin/manager.rb
	test/unit/plugin_manager_test.rb
```
Antonio Terceiro
2012-08-24 11:49:39 -0300

21 Aug, 2012

4 commits

acfbc228 Merge branch 'master' into antispam Browse Dir »

Antonio Terceiro
2012-08-21 15:50:43 -0300

d323bd53 Merge commit 'refs/merge-requests/181' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/181

Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/models/person.rb
	app/views/enterprise_registration/basic_information.rhtml
	lib/noosfero/plugin.rb
	public/stylesheets/application.css
	test/unit/person_test.rb
	test/unit/profile_test.rb

2012-08-21 15:06:48 -0300

117cdd09 Merge branch 'master' into tolerance-time ... Browse Dir »

Conflicts:
	app/helpers/application_helper.rb
	app/views/content_viewer/_article_toolbar.rhtml
	test/functional/content_viewer_controller_test.rb

2012-08-21 17:35:27 +0000

45c48c56 [tolerance-time] Hotspot to expire or remove article and comment buttons Browse Dir »

Rodrigo Souto
2012-08-21 14:20:15 -0300

20 Aug, 2012

1 commit

2382a965 UI to mark comments as SPAM ... Browse Dir »

Plus a small enhancements on the existing UI for comments: turned the
"delete" button into a text-only label in the bottom, instead of an
annoying icon that shows up when you pass the mouse over the comment
balloon.

ActionItem2306

2012-08-20 17:33:16 -0300

19 Aug, 2012

1 commit

a1ac0fb5 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	db/schema.rb
```
Daniela Feitosa
2012-08-19 23:49:20 -0300

17 Aug, 2012

1 commit

706f2ff6 Merge commit 'refs/merge-requests/208' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/208
```
Daniela Feitosa
2012-08-17 15:59:24 +0000

15 Aug, 2012

2 commits

65fdd587 Makes the comment box in wall grow ... Browse Dir »

  I did a little refactor in the already existent script to
  limited_text_area so the part that grows the textarea can be reused
  elsewhere, e.g. the comment box in the wall.

  Since I was modifying the limited_text_area function again, I re-did
  here the fix to the bug in Chrome browsers where the textarea would
  grow with every key press. So this merge request also fix the
  ActionItem2288.

(ActionItem2405)

2012-08-15 09:22:31 -0300

e62c8255 Fixed cancel button on "New content" on search_contents_menu ... Browse Dir »
```
It was opening with lightbox but the cancel button was a colorbox button

(ActionItem2415)
```
Daniela Feitosa
2012-08-15 00:46:09 -0300

08 Aug, 2012

2 commits

6ffa3e97 Removed template option when environment doesn't have any ... Browse Dir »
```
(ActionItem2378)
```
Daniela Feitosa
2012-08-08 14:34:14 -0300

2b429040 Removed link from templates option ... Browse Dir »

The templates are not visible, so new user won't be able to see them
Also styling the checkbox "is_template" on profile edition

(ActionItem2378)

2012-08-08 10:02:22 -0300

07 Aug, 2012

2 commits

bac11992 [multiples-templates] Fixing redirect action and template_id param Browse Dir »

Rodrigo Souto
2012-08-07 22:51:33 -0300
0b85c950 [multiple-templates] Listing available templates on profile creation ... Browse Dir »
```
(ActionItem2378)
```
Rodrigo Souto
2012-08-07 22:51:32 -0300

31 Jul, 2012

2 commits

af8ef285 Removed capital from second word on filters Browse Dir »

Daniela Feitosa
2012-07-31 19:08:50 -0300
fe4f32cf Replaced lightbox to colorbox on New conten link ... Browse Dir »
```
(ActionItem2382)
```
Daniela Feitosa
2012-07-31 18:09:43 -0300

23 Jul, 2012

1 commit

cff8cccd Removed duplicated browse_content_menu Browse Dir »

Daniela Feitosa
2012-07-23 06:32:24 -0300

20 Jul, 2012

1 commit

824e34a2 Removed lightbox message that page was not loaded Browse Dir »

Daniela Feitosa
2012-07-20 07:41:20 -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

2 commits

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

2468db59 Merge branch 'merge-requests/173' into solr Browse Dir »

Daniela Feitosa
2012-07-18 05:48:36 -0300

17 Jul, 2012

1 commit

3ba61699 Avoiding repetition of code ... Browse Dir »
```
Created a method for button to remove qualifiers

(ActionItem2374)
```
Daniela Feitosa
2012-07-17 10:41:07 -0300

05 Jul, 2012

1 commit

87a67734 Including a helper method for using token_input Browse Dir »

Rodrigo Souto
2012-07-05 17:52:44 -0300

22 Jun, 2012

1 commit

cb35a9eb Merge branch '0.37-rc2' into AI1826 ... Browse Dir »
```
Conflicts:
	test/unit/article_test.rb
```
Daniela Feitosa
2012-06-22 14:08:34 -0300

21 Jun, 2012

2 commits

de2b84de Added alias: browse_#{type}_menu to search_#{type}_menu ... Browse Dir »
```
We don't want to break others themes
```
Daniela Feitosa
2012-06-21 13:34:04 -0300
03c856bb Merge commit 'refs/merge-requests/173' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/173
```
Daniela Feitosa
2012-06-21 13:33:25 -0300

26 May, 2012

1 commit

420c09be Merge branch 'master' of git://gitorious.org/noosfero/noosfero into merge_req_25-05 ... Browse Dir »
```
Conflicts:
	INSTALL
	test/unit/article_test.rb
```
Rafael Martins
2012-05-26 16:49:54 +0000

24 May, 2012

1 commit

92e9abd2 Merging stoa features (basic, signup and invitation) ... Browse Dir »
```
Conflicts:
	test/functional/account_controller_test.rb
```
Rodrigo Souto
2012-05-24 14:55:19 -0300

22 May, 2012

1 commit

e1a0da01 Restrict altBeautify fix and disabled searches Browse Dir »

Braulio Bhavamitra
2012-05-22 18:56:09 +0000

20 May, 2012

1 commit

cae48f79 Merge remote-tracking branch 'noosfero/master' into solr-searches ... Browse Dir »
```
Conflicts:
	app/views/layouts/_javascript.rhtml
	features/step_definitions/noosfero_steps.rb
	features/support/paths.rb
```
Braulio Bhavamitra
2012-05-20 18:38:41 +0000