Charles Oliveira / noosfero

03 Nov, 2014

1 commit

d2f53367 Fix span tag from chat Browse Dir »

Victor Costa
2014-11-03 15:40:01 -0300

21 Oct, 2014

1 commit

6a6171ef Merge branch 'fix_report_abuse' into stable Browse Dir »

Victor Costa
2014-10-21 08:19:13 -0300

20 Oct, 2014

2 commits

896b46c3 Merge branch 'master' into stable ... Browse Dir »

Conflicts:
	app/views/profile/_person_profile.html.erb
	app/views/shared/tiny_mce.html.erb
	public/javascripts/application.js
	public/javascripts/tinymce/js/tinymce/license.txt
	public/javascripts/tinymce/js/tinymce/plugins/compat3x/css/dialog.css
	public/javascripts/tinymce/js/tinymce/plugins/compat3x/utils/editable_selects.js
	public/javascripts/tinymce/jscripts/tiny_mce/langs/en.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/media.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/props.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/row.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/table.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
	public/javascripts/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
	public/javascripts/tinymce/jscripts/tiny_mce/tiny_mce.js
	public/javascripts/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
	public/javascripts/tinymce/jscripts/tiny_mce/tiny_mce_src.js
	public/stylesheets/application.css

2014-10-20 17:07:21 -0300

2cbd78d6 Fix report abuse Browse Dir »

Victor Costa
2014-10-20 16:45:09 -0300

07 Oct, 2014

1 commit

18aeacba Update to tinymce 4 Browse Dir »

Braulio Bhavamitra
2014-10-07 15:44:48 -0300

25 Aug, 2014

2 commits

7f7efef1 Merge branch 'rails3_chat' into rails3_stable Browse Dir »

Victor Costa
2014-08-25 12:19:23 -0300
41519b21 Small fixes on chat layout Browse Dir »

Victor Costa
2014-08-25 11:27:33 -0300

22 Aug, 2014

3 commits

2d72b68e Merge branch 'rails3_chat' into rails3_stable Browse Dir »

Victor Costa
2014-08-22 10:11:58 -0300
1e222c89 Fix layout for occupants for group chat Browse Dir »

Victor Costa
2014-08-22 10:03:17 -0300
5cbaf558 Improve html templates for chat components Browse Dir »

Victor Costa
2014-08-22 09:14:12 -0300

21 Aug, 2014

2 commits

f1a6c012 Merge branch 'rails3_chat' into rails3_stable Browse Dir »

Victor Costa
2014-08-21 18:45:25 -0300
10662c2c Chat improvement Browse Dir »

Victor Costa
2014-08-21 18:42:50 -0300

20 Aug, 2014

2 commits

0a1e0419 Added timeago.js to chat Browse Dir »

Victor Costa
2014-08-20 19:18:00 -0300
cfb9f8d8 Improve chat layout Browse Dir »

Victor Costa
2014-08-20 17:15:51 -0300

15 Aug, 2014

7 commits

4165dcf1 Merge branch 'rails3_chat' into rails3_stable Browse Dir »

Victor Costa
2014-08-15 17:53:23 -0300
7842d643 Fix group chat Browse Dir »

Victor Costa
2014-08-15 17:50:58 -0300
097fe2a7 Merge branch 'rails3_chat' into rails3_stable Browse Dir »

Victor Costa
2014-08-15 12:13:49 -0300
cec25930 Merge branch 'rails3' into rails3_stable ... Browse Dir »
```
Conflicts:
	db/schema.rb
	public/javascripts/application.js
```
Victor Costa
2014-08-15 12:10:31 -0300
a2d483ba Small fixes in chat ui Browse Dir »

Victor Costa
2014-08-15 11:55:46 -0300
35bf1408 Upgrade strophe.js to 1.1.3 Browse Dir »

Victor Costa
2014-08-15 09:32:54 -0300
1ead5508 Fix bosh service url Browse Dir »

Victor Costa
2014-08-15 09:15:48 -0300

14 Aug, 2014

2 commits

08b9e2b9 Small fixes for chat Browse Dir »

Victor Costa
2014-08-14 17:06:11 -0300
01c3bad8 Use xmpp_chat to render new chat layout Browse Dir »

Victor Costa
2014-08-14 09:47:36 -0300

11 Aug, 2014

1 commit

7ba54a9d Fix merge problems ... Browse Dir »

At least as far as unit tests are concerned. Still missing:

  - 1 failing test in ArticleTest
  - 1 failing test in PersonTest

2014-08-11 16:34:21 -0300

07 Aug, 2014

1 commit

34f8f4d7 Merge remote-tracking branch 'origin/stable' ... Browse Dir »

Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb

2014-08-07 14:20:39 -0300

21 Jul, 2014

1 commit

299cd80b Merge branch 'AI3211-fix_comment_list' into rails3_stable Browse Dir »

Victor Costa
2014-07-21 17:59:25 -0300

16 Jul, 2014

1 commit

a77b106c Fixing bug AI3206: saving profile categories Browse Dir »

Arthur Esposte
2014-07-16 12:02:21 -0300

10 Jul, 2014

2 commits

15ac76b8 Merge branch 'AI3160-fullscreen_for_article' into rails3_stable ... Browse Dir »
```
Conflicts:
	public/stylesheets/application.css
```
Victor Costa
2014-07-10 16:29:26 -0300
977157b9 Change tiny_mce fullscreen mode Browse Dir »

Victor Costa
2014-07-10 16:28:19 -0300

07 Jul, 2014

1 commit

bad8766a Update every old syntax of form_for and javascript_tag Browse Dir »

Rodrigo Souto
2014-07-07 11:59:05 -0300

05 Jul, 2014

1 commit

c2cbd96f Fixed text on user menu links to manage groups ... Browse Dir »

On languages that "My" is not translated the same way when used
with "enterprises" and "communities", the translations were wrong.

(ActionItem3190)

2014-07-05 00:35:36 +0000

30 Jun, 2014

1 commit

a910deb8 Added full screen mode for view and edit. Browse Dir »

Evandro Jr
2014-06-30 11:56:59 -0300

17 Jun, 2014

1 commit

21153d13 rails3: fix change image from profile Browse Dir »

Victor Costa
2014-06-17 12:22:11 -0300

05 Jun, 2014

1 commit

ac139797 Merge branch 'AI3158-icons-in-folder' into 'stable' ... Browse Dir »

Display missed icons on folder view

A small rewrite with more coherent names and context-able listing to make that thing to work.

http://noosfero.org/Development/ActionItem3158

2014-06-05 14:31:28 +0000

04 Jun, 2014

2 commits

526c04a9 Rename articles_list.rhtml to content_list.rhtml ... Browse Dir »
```
`content_list` is a more coherent name for listing things that are no exactily an article.

Completes ActionItem3158 changes
```
Aurélio A. Heckert
2014-06-04 18:48:39 -0300
f9a7c1f7 Makes folder listing context-able ... Browse Dir »
```
Also enables to correctly display icons
Closes ActionItem3158
```
Aurélio A. Heckert
2014-06-04 18:40:04 -0300

13 May, 2014

1 commit

a4611fd2 rails3: refactoring interface for category selection Browse Dir »

Victor Costa
2014-05-13 17:55:35 -0300

09 May, 2014

1 commit

66ec5b45 rails3: fix functional tests Browse Dir »

Victor Costa
2014-05-09 13:59:54 -0300

08 May, 2014

1 commit

7170c4c4 rails3: rename rhtml to html.erb Browse Dir »

Victor Costa
2014-05-08 14:34:45 -0300

06 May, 2014

1 commit

1182476c Merge branch 'rails235' into rails3 ... Browse Dir »

* rails235: (168 commits)
  L10n: support for custom locales
  enhancements: visualization of suggested usernames
  Allowing translation for url checking string
  Removed unnecessary lines on test
  Removed unit tests from functionals file
  Fixed html and test syntax
  Removed needless condition
  Fixed suggestions of usernames
  Test files should ends with "_test.rb"
  Added pagination on events_by_day on profile agenda
  Fix missing variable in funcional test
  Fix unit tests
  Change routes from embed controller
  Remove unused code
  Autocomplete fields on page load
  Blocks can returns a block of code to be evaluated
  Avoid randomness on tests
  comment-group-plugin: avoid randomness on tests
  community-track-plugin: fix tests by creating a profile with default boxes
  anti-spam-plugin-wrapper: ensure to load concrete wrappers
  ...

Conflicts:
	app/helpers/application_helper.rb
	app/models/comment.rb
	app/models/contact.rb
	app/models/event.rb
	app/models/mailing.rb
	app/models/organization.rb
	app/models/organization_mailing.rb
	app/models/pending_task_notifier.rb
	app/models/person.rb
	app/models/profile.rb
	app/models/scrap.rb
	app/models/task_mailer.rb
	app/models/user.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/profile_image.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/box_organizer/_link_list_block.rhtml
	app/views/box_organizer/edit.rhtml
	app/views/features/_manage_community_fields.rhtml
	app/views/features/_manage_enterprise_fields.rhtml
	app/views/features/_manage_person_fields.rhtml
	app/views/features/index.rhtml
	app/views/layouts/application-ng.rhtml
	app/views/users/_users_list.rhtml
	db/schema.rb
	features/forum.feature
	lib/feed_handler.rb
	lib/noosfero/plugin.rb
	plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	plugins/spaminator/lib/spaminator_plugin/mailer.rb
	test/functional/content_viewer_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/profile_design_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/contact_sender_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/environment_mailing_test.rb
	test/unit/mailing_test.rb
	test/unit/organization_mailing_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb
	test/unit/uploaded_file_test.rb
	vendor/plugins/action_tracker/lib/action_tracker_model.rb

2014-05-06 18:00:26 -0300