Omar Junior / Noosfero

08 Sep, 2014

1 commit

79e1ad7b Merge branch 'master' into stoa ... Browse Dir »

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/my_profile/memberships_controller.rb
	app/controllers/public/account_controller.rb
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/helpers/token_helper.rb
	app/views/account/signup.html.erb
	app/views/layouts/_javascript.html.erb
	db/schema.rb
	test/functional/application_controller_test.rb

2014-09-08 12:36:01 -0300

26 Aug, 2014

1 commit

01c0f483 adding some functional tests ... Browse Dir »
```
also:
* keep the tip about separate tags by comma
* include the css in the header page to have cache

(ActionItem3280)
```
Joenio Costa
2014-08-26 18:01:28 -0300

18 Aug, 2014

1 commit

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

08 Aug, 2014

1 commit

3d9edbbb change tagging ui Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-08-08 18:57:45 -0300

30 Jul, 2014

2 commits

954fcbce [media-panel-improvements] Reload published media on upload instead of manually including item Browse Dir »

Rodrigo Souto
2014-07-30 13:06:12 -0300
6ffda996 [media-panel-improvements] Create folder on dialog Browse Dir »

Rodrigo Souto
2014-07-30 11:52:30 -0300

29 Jul, 2014

2 commits

e643284a [media-panel-improvements] Show/Hide media panel Browse Dir »

Rodrigo Souto
2014-07-29 18:03:01 -0300
26cd97af [media-panel-improvements] Create folder on demand Browse Dir »

Rodrigo Souto
2014-07-29 16:57:38 -0300

28 Jul, 2014

3 commits

4ad1745d Fixing article parents html links in cms view ... Browse Dir »
```
(ActionItem3236)
```
Arthur Esposte
2014-07-28 17:03:31 -0300
6e53d8be Merge remote-tracking branch 'larissa/share' into stoa Browse Dir »

Rodrigo Souto
2014-07-28 11:21:57 -0300
50e72f1d spread: all public content can be reposted and portal community is free for all Browse Dir »

Larissa Reis
2014-07-28 11:26:25 -0300

22 Jul, 2014

2 commits

ff425200 [media-panel-improvements] Add buttons labels back Browse Dir »

Rodrigo Souto
2014-07-22 10:59:37 -0300
b0fad597 [media-panel-improvements] Using unique id to identify file progress elements ... Browse Dir »
```
Also removing string.js lib since it's now unecessary.
```
Rodrigo Souto
2014-07-22 10:59:32 -0300

18 Jul, 2014

4 commits

dd49b8f4 [media-panel-improvements] Avoid file-name and percentage fields collapse Browse Dir »

Rodrigo Souto
2014-07-18 17:47:36 -0300
21fb3fcc [media-panel-improvements] Show/Hide all uploads Browse Dir »

Rodrigo Souto
2014-07-18 19:52:23 +0000
16b3ad01 [media-panel-improvements] Error handling Browse Dir »

Rodrigo Souto
2014-07-18 16:56:25 +0000
580afdd7 [media-panel-improvements] View all Browse Dir »

Rodrigo Souto
2014-07-18 16:56:19 +0000

17 Jul, 2014

1 commit

3db199c7 [media-panel-improvements] Media search Browse Dir »

Rodrigo Souto
2014-07-17 11:57:26 -0300

16 Jul, 2014

5 commits

ee45f928 [media-panel-improvements] Published media folder selection filter Browse Dir »

Rodrigo Souto
2014-07-16 19:25:46 -0300
efd10d8d [media-panel-improvements] Insert uploaded media before the others Browse Dir »

Rodrigo Souto
2014-07-16 17:05:42 -0300
1c1a6c38 [media-panel-improvements] Insert file media on text by click Browse Dir »

Rodrigo Souto
2014-07-16 17:05:07 -0300
ac343688 [media-panel-improvements] Load recent media on published media box Browse Dir »

Rodrigo Souto
2014-07-16 17:04:32 -0300
3ca93524 [media-panel-improvements] Published media box Browse Dir »

Rodrigo Souto
2014-07-16 15:20:29 -0300

15 Jul, 2014

2 commits

231ad8a0 [media-panel-improvements] Progress bar Browse Dir »

Rodrigo Souto
2014-07-15 18:44:11 -0300
8bf75114 [media-panel-improvements] Multiple files upload Browse Dir »

Rodrigo Souto
2014-07-15 18:15:01 +0000

14 May, 2014

1 commit

31750a44 Move labelled_form_for to new api format Browse Dir »

Rodrigo Souto
2014-05-14 17:56:39 -0300

13 May, 2014

1 commit

23914711 Merge branch 'master' into rails3 ... Browse Dir »

Conflicts:
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/models/community.rb
	app/models/enterprise.rb
	app/models/product_category.rb
	app/views/account/change_password.html.erb
	config/boot.rb
	config/environment.rb
	config/routes.rb
	lib/noosfero/plugin.rb
	test/unit/enterprise_activation_test.rb
	test/unit/person_notifier_test.rb

2014-05-13 10:43:37 -0300

23 Apr, 2014

1 commit

d08608af Merge remote-tracking branch 'origin' into stable ... Browse Dir »

Conflicts:
	app/views/content_viewer/view_page.rhtml
	app/views/profile_editor/index.rhtml
	debian/changelog
	lib/noosfero.rb
	plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb

2014-04-23 10:52:54 -0300

02 Apr, 2014

1 commit

a0666485 Fix use of tinymce on enterprise homepage Browse Dir »

Braulio Bhavamitra
2014-04-02 17:24:48 -0300

11 Feb, 2014

2 commits

1f0194be Merge branch 'master' into rails3-merge ... Browse Dir »

Conflicts:
	app/views/profile_themes/add_css.rhtml
	app/views/profile_themes/add_image.rhtml
	app/views/profile_themes/css_editor.rhtml
	app/views/profile_themes/edit.rhtml
	app/views/profile_themes/new.rhtml
	app/views/themes/add_css.html.erb
	app/views/themes/add_css.rhtml
	app/views/themes/add_image.html.erb
	app/views/themes/add_image.rhtml
	app/views/themes/css_editor.html.erb
	app/views/themes/css_editor.rhtml
	app/views/themes/edit.html.erb
	app/views/themes/edit.rhtml
	app/views/themes/index.html.erb
	app/views/themes/new.html.erb
	app/views/themes/new.rhtml
	test/factories.rb
	test/functional/profile_themes_controller_test.rb

2014-02-11 18:00:35 -0300

e9fea38f Merge branch 'master' into rails3-merge ... Browse Dir »

Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb

2014-02-11 17:35:19 -0300