AvaliaSPB / Noosfero

27 Jan, 2015

1 commit

a9c67a1b Merge branch 'chat' into master-with-chat ... Browse File »
```
Conflicts:
	public/javascripts/application.js
	public/stylesheets/application.css
```
Rodrigo Souto
2015-01-27 19:15:59 -0300

21 Jan, 2015

1 commit

d5dfb87b chat: improve label and fix minor bugs Browse File »

Rodrigo Souto
2015-01-21 18:55:39 -0300

17 Jan, 2015

1 commit

8325efdc chat: fix open/toggle chat window Browse File »

Rodrigo Souto
2015-01-17 01:39:13 -0300

16 Jan, 2015

1 commit

68128c90 chat: chat label to toggle chat opened/closed Browse File »

Rodrigo Souto
2015-01-16 19:19:22 -0300

13 Jan, 2015

1 commit

b4a1f3b9 Fix homepage button to keep user looged in at application.js ... Browse File »

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>

2015-01-13 18:53:06 +0000

09 Jan, 2015

1 commit

e8e3038a chat: open up most recent conversation and fix submenu toggle Browse File »

Rodrigo Souto
2015-01-09 19:52:21 -0300

08 Jan, 2015

1 commit

64d0ae28 Save user_data and clear notice for reuse Browse File »

Braulio Bhavamitra
2015-01-08 22:22:00 -0300

04 Dec, 2014

1 commit

6c2e04aa gravatar: don't hardcode protocol Browse File »

Antonio Terceiro
2014-12-04 18:22:52 -0200

05 Nov, 2014

5 commits

032a2ee6 Add loading Browse File »

Rodrigo Souto
2014-11-05 18:55:35 -0300
3ae9623b Chat notification Browse File »

Rodrigo Souto
2014-11-05 18:55:34 -0300
dc4e304d Fix group chat Browse File »

Victor Costa
2014-11-05 18:54:03 -0300
5ffb864f Remove userdata polling when chat is enabled Browse File »

Victor Costa
2014-11-05 18:54:02 -0300
0b674b6d New chat layout ... Browse File »
```
Conflicts:
	app/helpers/layout_helper.rb
```
Victor Costa
2014-11-05 18:54:01 -0300

13 Oct, 2014

1 commit

48441fef Merge branch 'tinymce4' into 'master' ... Browse File »
```
Update to tinymce 4

See merge request !334
```
Antonio Terceiro
2014-10-13 15:01:45 +0000

10 Oct, 2014

1 commit

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

- 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

07 Oct, 2014

1 commit

18aeacba Update to tinymce 4 Browse File »

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

07 Aug, 2014

1 commit

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

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

09 Jul, 2014

1 commit

2325237c Merge branch 'ai3184' into 'stable' ... Browse File »
```
Ensure hidden before fadeIn()

http://noosfero.org/Development/ActionItem3184
```
Rodrigo Souto
2014-07-09 15:05:08 +0000

08 Jul, 2014

1 commit

90f03006 Add images' classes Browse File »

Braulio Bhavamitra
2014-07-08 08:57:54 -0300

01 Jul, 2014

1 commit

95430667 Ensure hidden before fadeIn() ... Browse File »
```
(ActionItem3184)
```
Braulio Bhavamitra
2014-07-01 15:58:43 -0300

27 Jun, 2014

1 commit

925df3dd Allow centralization of images with zoomify script ... Browse File »
```
(ActionItem3178)
```
Braulio Bhavamitra
2014-06-27 11:00:35 -0300

05 Jun, 2014

1 commit

2234c20e profile-wall: temporary fix to scrap box growing indefinetely ... Browse File »
```
This problem was properly fixed on: http://noosfero.org/Development/ActionItem3136
```
Rodrigo Souto
2014-06-05 13:10:35 -0300

29 May, 2014

1 commit

1d891d19 user-menu: loading user menu on the server-side instead of on the client-side ... Browse File »

There is no reason for the user menu to load on the client-side. The
only reason, that would be plausible is if it varnish was providing
cached pages for logged users. Since this is not happening, there is no
need to load it on the client-side.

2014-05-29 22:38:35 +0000

23 May, 2014

1 commit

7d107198 Merge branch 'master' into rails3 Browse File »

Victor Costa
2014-05-23 14:26:59 -0300

22 May, 2014

1 commit

409f4f8a rails3: use cookie to store csrf token Browse File »

Victor Costa
2014-05-22 11:29:08 -0300

19 May, 2014

1 commit

ec227289 wall: correct textarea growing indefinetely ... Browse File »
```
ActionItem3136
```
Rodrigo Souto
2014-05-19 16:40:51 -0300

11 Feb, 2014

1 commit

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

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

06 Feb, 2014

1 commit

7f92419a rails3: fix ajax requests with csrf protection Browse File »

Victor Costa
2014-02-06 13:44:22 -0300

15 Jan, 2014

1 commit

b3fb1448 forum_use_terms: add user term to forums ... Browse File »

(ActionItem2513)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-01-15 00:40:00 +0000

07 Jan, 2014

1 commit

c9eccb09 Merge branch 'stable' ... Browse File »
```
Conflicts:
	db/schema.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-07 14:38:59 +0000

16 Dec, 2013

1 commit

130acb98 Merge commit 'refs/merge-requests/387' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/387

Conflicts:
	app/helpers/application_helper.rb
	public/designs/themes/base/style.css
```
Rodrigo Souto
2013-12-16 15:36:30 -0300

24 Nov, 2013

1 commit

e9867fe1 Replaced link_to_remote by link_to ... Browse File »
```
the method link_to_remote is deprecated on Rails 3

(ActionItem2899)
```
Daniela Feitosa
2013-11-24 05:22:47 +0000

27 Sep, 2013

1 commit

817df70a Correct `#user .logged-in` ids and icons ... Browse File »

* The env admin link and the user pannel had the same controlpanel id.
* The user icon is now recovered.
* The #manage-enterprises icons was croped.

Closes ActionItem2817