AvaliaSPB / Noosfero

18 Aug, 2014

1 commit

b7823262 Merge branch 'master' into stoa ... Browse File »
```
Conflicts:
	app/controllers/my_profile/cms_controller.rb
	db/schema.rb
```
Rodrigo Souto
2014-08-18 12:31:32 -0300

28 Jul, 2014

1 commit

0409f85d Merge branch 'invite-user-to-community' of https://gitlab.com/larissa/noosfero into invite-user ... Browse File »

Conflicts:
	app/views/friends/index.rhtml
	app/views/invite/_select_address_book.rhtml
	app/views/invite/select_friends.rhtml
	app/views/profile/friends.rhtml
	config/routes.rb
	plugins/stoa/lib/ext/person.rb
	test/functional/invite_controller_test.rb
	test/unit/invite_member_test.rb

2014-07-28 10:53:39 -0300

23 Jul, 2014

1 commit

f9f7f341 Fix article versioning page ... Browse File »
```
(AI3223)
```
Victor Costa
2014-07-23 16:19:41 -0300

13 May, 2014

2 commits

2da36e2c Fix old route format Browse File »

Rodrigo Souto
2014-05-13 11:35:37 -0300

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

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

12 May, 2014

1 commit

af190be9 Merge branch 'rails235' ... Browse File »
```
Conflicts:
	features/categories_block.feature
	public/stylesheets/application.css
```
Daniela Feitosa
2014-05-12 15:58:32 +0000

07 May, 2014

1 commit

4e32d3ef rails3: fix route for embed content Browse File »

Victor Costa
2014-05-07 13:27:09 -0300

06 May, 2014

1 commit

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

* 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

08 Apr, 2014

1 commit

d5cce900 Change routes from embed controller ... Browse File »
```
(ActionItem3031)
```
Joenio Costa
2014-04-08 10:17:17 -0300

07 Apr, 2014

1 commit

12fdb928 noosfero-load: avoid multiple loads of noosfero module Browse File »

Rodrigo Souto
2014-04-07 19:52:31 +0000

31 Mar, 2014

1 commit

4dae1207 Only match numbers for the 'id' param in the embed route ... Browse File »
```
also, add at least one test

(ActionItem3031)
```
Joenio Costa
2014-03-31 23:49:33 -0300

07 Mar, 2014

3 commits

b6d443cb adjust infra to embed track block Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-03-07 16:25:13 -0300
91c78592 add infra to embed track block Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-03-07 16:24:09 -0300
705a8ec6 add infra to embed feature Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-03-07 16:22:33 -0300

19 Feb, 2014

1 commit

00299ccc rails3: fix integration tests Browse File »

Victor Costa
2014-02-19 18:02:55 -0300

13 Feb, 2014

1 commit

2f21005a Merge branch 'rails3' of gitlab.com:noosfero/noosfero into rails3 Browse File »

Victor Costa
2014-02-13 15:45:56 -0300

11 Feb, 2014

2 commits

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

a03f0c92 rails3: fix some cucumber tests Browse File »

Victor Costa
2014-02-11 17:03:30 -0300

31 Jan, 2014

1 commit

3a5bb313 rails3: fix profile_controller tests Browse File »

Victor Costa
2014-01-31 16:47:52 -0300

30 Jan, 2014

1 commit

2253cc66 diff-article-versions: display differences between two article versions ... Browse File »
```
AI2822
```
Junior Silva
2014-01-30 17:59:39 -0300

28 Jan, 2014

2 commits

3badd4de rails3: add route alias to tag_feed Browse File »

Victor Costa
2014-01-28 16:23:44 -0300
2c109fdf rails3: fix some functional tests Browse File »

Victor Costa
2014-01-28 15:19:31 -0300

22 Jan, 2014

1 commit

4cefe47d rails3: added alias to profile route Browse File »

Victor Costa
2014-01-22 18:28:59 -0300

19 Jan, 2014

1 commit

25f34b4d article_versions: list of versions on a new page ... Browse File »
```
- Added pagination to versions
- Treating access denied and not found

(ActionItem2822)
```
Daniela Feitosa
2014-01-19 21:44:03 +0000

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse File »

Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb

2014-01-09 15:17:55 +0000

06 Jan, 2014

1 commit

fb93be11 Improved registered users invitation using the user interface Browse File »

Larissa Reis
2014-01-06 13:46:03 -0300

28 Nov, 2013

1 commit

0834d18f improving agenda/events ... Browse File »

Show events by month
Event list now only show 10 events when listing events for month
(events for a day still listing all events)
Add information on indefined place
Enhance layout

(ActionItem2587)

Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by; Gabriela Navarro <navarro1703@gmail.com>

2013-11-28 01:30:56 -0200

19 Jul, 2013

2 commits

0d6d8ba5 Fix new route to match Rails 3 format Browse File »

Antonio Terceiro
2013-07-19 15:39:01 -0300

b05904aa Merge branch 'master' into rails3 ... Browse File »

Conflicts:
	app/helpers/boxes_helper.rb
	app/models/comment.rb
	app/views/comment/_comment.rhtml
	app/views/comment/_comment_form.rhtml
	app/views/content_viewer/_comment.html.erb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/_comment_form.html.erb
	app/views/content_viewer/_comment_form.rhtml
	app/views/profile/send_mail.html.erb
	config/routes.rb
	debian/control

2013-07-19 15:36:31 -0300

31 May, 2013

1 commit

06f644b6 [rails3] Fixed routes ... Browse File »
```
*param is not like 'a/b/c' instead of ['a', 'b', 'c'], so those
controllers will need to be changed
```
Antonio Terceiro
2013-05-31 22:45:05 -0300

20 Feb, 2013

1 commit

3e4b7e40 improving comment manipulation and making possible to moderate comments by article Browse File »

Leandro Nunes dos Santos
2013-02-20 10:01:51 -0300

02 Jan, 2013

3 commits

ecccea23 Fix root of hosted domain Browse File »

Antonio Terceiro
2013-01-02 12:10:18 -0300
41c29b09 Fix account controller route ... Browse File »
```
All optional URL parts must be surrounded by parenthesis, i.e.
/:controller(:action(/:id))
```
Antonio Terceiro
2013-01-02 11:56:48 -0300
b1393db3 Fix content viewer routes and associated tests Browse File »

Antonio Terceiro
2013-01-02 11:56:11 -0300

01 Jan, 2013

1 commit

269dc4a4 Routes rewritten Browse File »

Rafael Manzo
2013-01-01 18:13:26 -0200

26 Dec, 2012

1 commit

55517151 Random fixes to get the initial page loading ... Browse File »
```
plus login and signup screens being displayed. They don't work yet,
though.
```
Antonio Terceiro
2012-12-26 16:40:27 -0300

25 Dec, 2012

1 commit

d4e63efe Migration to Rails 3: checkpoint ... Browse File »
```
Things do not quite work yet, but I'm close. I am committing right now
as a checkpoint.
```
Antonio Terceiro
2012-12-25 11:40:52 -0300

25 Oct, 2012

1 commit

518ec830 Merge commit 'refs/merge-requests/233' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/233

Conflicts:
	test/integration/routing_test.rb
```
Daniela Feitosa
2012-10-25 00:39:00 -0200

21 Oct, 2012

1 commit

7bac7ef7 adding some hotspots to make the openid plugin works. Browse File »

Leandro Nunes dos Santos
2012-10-21 18:42:30 -0200

13 Sep, 2012

1 commit

f9296a1f [performance] Rendering nothing on some not_founds ... Browse File »

Some requests aren't made directly by the user, like the request to get
the favicon, and these guys are not displayed to the user. Therefore
it's not necessary to render the full layout not_found, just sent the
status of not_found

2012-09-13 17:24:10 +0000