Charles Oliveira / noosfero

30 Oct, 2014

2 commits

a0ef4f25 Merge branch 'fix_lazy_queries' into stable ... Browse Dir »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
```
Victor Costa
2014-10-30 15:31:52 -0300
b4435ba8 Added includes in models to prevent n+1 queries ... Browse Dir »
```
N+1 queries found with the help of bullet gem
```
Victor Costa
2014-10-30 15:24:16 -0300

29 Oct, 2014

4 commits

57753e00 Merge branch 'fix_tinymce_video' into stable Browse Dir »

Victor Costa
2014-10-29 18:56:47 -0300
34f4326d Allow trusted url without protocol for iframe in tinymce Browse Dir »

Victor Costa
2014-10-29 18:52:22 -0300
1354f6b9 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-10-29 13:57:23 -0300
7e1172c4 release.rake: actually delete pending release marker Browse Dir »

Antonio Terceiro
2014-10-29 14:44:24 -0200

28 Oct, 2014

2 commits

270d334b Add plugins migrations paths Browse Dir »

Braulio Bhavamitra
2014-10-28 14:31:46 -0300
cde58fc4 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-10-28 09:34:50 -0300

27 Oct, 2014

2 commits

6453e2a8 ci:smoke: revamp ... Browse Dir »
```
- provide sane defaults for $HEAD and $PREV_HEAD
- list commits since $PREV_HEAD
```
Antonio Terceiro
2014-10-27 18:22:31 -0200
ae0014f2 Add ci:smoke Rake task for CI environments ... Browse Dir »
```
Assumes the CI environment will export the sha1 of the head commit into
HEAD, and the sha1 of the previous head commit in PREV_HEAD.
```
Antonio Terceiro
2014-10-27 15:46:20 -0200

20 Oct, 2014

3 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

f8dfd5bc Merge branch 'hotfixes' into stable Browse Dir »

Victor Costa
2014-10-20 13:51:31 -0300
4ebcbe31 Added a way to set a proxy for https requests in feed handler Browse Dir »

Victor Costa
2014-10-20 13:51:09 -0300

17 Oct, 2014

1 commit

35f0b393 Merge branch 'I4-Video-Gallery-Plugin' into stable ... Browse Dir »
```
Conflicts:
	app/views/content_viewer/_article_toolbar.html.erb
```
Victor Costa
2014-10-17 13:02:09 -0300

13 Oct, 2014

1 commit

258b63ca Added a way to set a proxy for feed handler Browse Dir »

Victor Costa
2014-10-13 15:04:40 -0300

10 Oct, 2014

1 commit

30560212 Support running Noosfero as a /subdirectory ... Browse Dir »

- Remove absolute URL's from stylesheets and javascripts
- Handle prefix in LinkListBlock
- add Noosfero.root method as a central data source

The application server needs to be started with the
RAILS_RELATIVE_URL_ROOT environment variable set to the desired prefix.

In development, this can be tested with

  # assuming /social prefix
  $ RAILS_RELATIVE_URL_ROOT=/social thin --prefix /social start

For production, see INSTALL.md

2014-10-10 11:43:43 -0300

06 Oct, 2014

2 commits

3d117fad Merge branch 'AI3220_proposals' into stable Browse Dir »

Victor Costa
2014-10-06 15:07:30 -0300
0ae9f1ff Indicate on to_html that the caller is a feed Browse Dir »

Victor Costa
2014-10-06 14:40:53 -0300

02 Oct, 2014

1 commit

fe8e4abe adding lib/contats and lib/gdata Browse Dir »

Evandro Jr
2014-10-02 16:14:03 -0300

01 Oct, 2014

1 commit

97ec3806 turned to plugin Browse Dir »

Evandro Jr
2014-10-01 19:25:19 -0300

25 Sep, 2014

1 commit

bfccd16d Use table_prefix_name for plugins' table_name ... Browse Dir »
```
This makes Noosfero::Plugin::ActiveRecord obsolete. With plugin
interdependency, self.inherited may get the table name from another
class.
```
Braulio Bhavamitra
2014-09-25 09:08:18 -0300

22 Sep, 2014

1 commit

9804917f Merge branch 'master' into rails3_stable ... Browse Dir »
```
Conflicts:
	Gemfile
	Gemfile.lock
	lib/tasks/gettext.rake
	test/unit/dates_helper_test.rb
```
Victor Costa
2014-09-22 16:38:12 -0300

12 Sep, 2014

8 commits

a405a4a6 release: ask before creating tags Browse Dir »

Antonio Terceiro
2014-09-12 17:00:38 -0300
cb7466c4 Bumping version 1.0~rc3 Browse Dir »

Antonio Terceiro
2014-09-12 16:21:02 -0300
c28187ff release: actually allow to override the suggested version Browse Dir »

Antonio Terceiro
2014-09-12 16:02:18 -0300
c9c4d419 doc: make relative symlinks to plugin documentation Browse Dir »

Antonio Terceiro
2014-09-12 14:54:43 -0300
cf457ea2 Bumping version 1.0~rc2 Browse Dir »

Antonio Terceiro
2014-09-12 14:54:43 -0300
a774fb9b package task: use global $version variable Browse Dir »

Antonio Terceiro
2014-09-12 12:59:20 -0300
288284b8 release: fix regular expression to catch rc versions Browse Dir »

Antonio Terceiro
2014-09-12 12:59:19 -0300
5fd99be5 Merge branch 'ai3300' into 'master' ... Browse Dir »
```
Ai3300: In rails3, plugins' paths are being appended

See merge request !317
```
Antonio Terceiro
2014-09-12 15:58:44 +0000

11 Sep, 2014

4 commits

6bc2c9c5 Merge branch 'stable' into stable-merge ... Browse Dir »

Conflicts:
	AUTHORS
	app/controllers/public/content_viewer_controller.rb
	debian/changelog
	lib/noosfero.rb
	po/de/noosfero.po
	po/eo/noosfero.po
	po/es/noosfero.po
	po/fr/noosfero.po
	po/hy/noosfero.po
	po/it/noosfero.po
	po/noosfero.pot
	po/pt/noosfero.po
	po/ru/noosfero.po

2014-09-11 19:53:28 -0300

f58c398a LogMemoryConsumption: disable delayed job setup ... Browse Dir »
```
Such memory consumption logging should be done on the processes
processing requests, and not on the delayed job processes.
```
Antonio Terceiro
2014-09-11 19:08:44 -0300
56b1ab7e Fix prepend of plugins' view paths Browse Dir »

Braulio Bhavamitra
2014-09-11 17:52:39 -0300
c29b0edc shopping-cart-plugin: instance_exec instead of instance_eval ... Browse Dir »
```
AI3286
```
Junior Silva
2014-09-11 12:50:39 -0300

09 Sep, 2014

2 commits

f42c96a7 Merge branch 'ai3294' into 'master' ... Browse Dir »
```
Fix path and init loading order to be as in noosfero-rails2

http://noosfero.org/Development/ActionItem3294

See merge request !311
```
Antonio Terceiro
2014-09-09 20:48:59 +0000
85bd2779 gettext: fix string extraction and runtime usage ... Browse Dir »
```
Closes #307

Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
```
Victor Costa
2014-09-09 16:22:24 -0300

03 Sep, 2014

1 commit

2aed0d5e Load init in a separate loop ... Browse Dir »
```
As paths needs to be added to activesupport and ruby, init can't be load
at the same time. So do it on a separate loop
```
Braulio Bhavamitra
2014-09-03 11:17:44 -0300

01 Sep, 2014

1 commit

85411b0c hotfix for gettext tranlation Browse Dir »

Leandro Santos
2014-09-01 14:29:08 -0300

21 Aug, 2014

2 commits

2598c37e Merge branch 'master' into rails3_stable Browse Dir »

Victor Costa
2014-08-21 18:45:21 -0300
4c85bf77 Bumping version 0.47.4 Browse Dir »

Rodrigo Souto
2014-08-21 19:25:40 +0000