Commit Graph

21 Commits

Author SHA1 Message Date
santipalenque a541409705 [spalenque] - #7812 *WIP 2014-12-04 11:44:14 -03:00
Sebastian Marcet 2855aa90d5 [smarcet] - #7811
* fixed marketplace css issues/links
2014-12-04 11:43:43 -03:00
santipalenque e841182531 [spalenque] - #6968 *BUG FIX 2014-11-26 16:31:16 -03:00
santipalenque 48d1f4f09e [spalenque] - #6968 *QA CHANGES 2014-11-26 16:30:56 -03:00
santipalenque 70b97e2e0e [spalenque] - #6968 *QA CHANGES 2014-11-26 16:30:46 -03:00
santipalenque 1f26e7d5e6 [spalenque] - #6968 *DONE
Conflicts:

	marketplace/code/infrastructure/repositories/SapphireRegionalSupportedCompanyServiceRepository.php
	marketplace/code/interfaces/restfull_api/marketplace/ConsultantsCrudApi.php
	marketplace/code/ui/admin/MarketPlaceAdminPage.php
2014-11-26 16:30:37 -03:00
santipalenque 9057a0cd67 [spalenque] - #6968 *WIP
Conflicts:

	marketplace/_config.php
	marketplace/code/interfaces/restfull_api/marketplace/ConsultantsCrudApi.php
2014-11-26 16:30:28 -03:00
santipalenque 073cd5cd19 [spalenque] - #6968 *WIP
Conflicts:

	marketplace/_config.php
	marketplace/code/interfaces/restfull_api/marketplace/ConsultantsCrudApi.php
	marketplace/templates/Layout/Includes/MarketPlaceAdminPage_implementations_list.ss
2014-11-26 16:30:17 -03:00
santipalenque 8bc923482f [spalenque] - #6968 *WIP 2014-11-26 16:30:06 -03:00
santipalenque 606f42d2e8 [spalenque] - #6968 *WIP 2014-11-26 16:29:58 -03:00
santipalenque 5094226753 [spalenque] - #6968 *WIP 2014-11-26 16:29:50 -03:00
santipalenque 5074ac6253 [spalenque] - #6968 *pdfs map zoom 2014-11-26 16:29:40 -03:00
santipalenque 1fb147c59a [spalenque] - #6968 *pdfs bug
Conflicts:

	marketplace/code/ui/frontend/ConsultantsDirectoryPage.php
	marketplace/templates/Layout/ConsultantsDirectoryPage_consultant.ss
2014-11-26 16:29:31 -03:00
santipalenque b70162348b [spalenque] - #6968 *download pdfs
Conflicts:

	marketplace/templates/Layout/CloudsDirectoryPage_cloud.ss
	marketplace/templates/Layout/CloudsDirectoryPage_pdf.ss
	marketplace/templates/Layout/ConsultantsDirectoryPage_pdf.ss
	marketplace/templates/Layout/DistributionsDirectoryPage_pdf.ss
	openstack/code/Company.php
2014-11-26 16:29:21 -03:00
santipalenque a47bd50bcc [spalenque] - #6968 *WIP 2014-11-26 16:29:12 -03:00
Sebastian Marcet 0d49a5b6cb [smarcet] - #6968
* added preview feature on admin

Conflicts:

	marketplace/code/ui/frontend/DistributionsDirectoryPage.php

Conflicts:

	marketplace/code/ui/admin/MarketPlaceAdminPage.php
	marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php
	marketplace/code/ui/frontend/ConsultantsDirectoryPage.php
	marketplace/templates/Layout/Includes/MarketPlaceAdminPage_implementations_list.ss
2014-11-26 16:29:00 -03:00
Sebastian Marcet 00b077eb8f [smarcet] - #7612
* refactoring

Conflicts:

	openstack/_config.php
	themes/openstack/templates/Layout/SangriaPage_SetCategorySponsors.ss
	themes/openstack/templates/Layout/SangriaPage_ViewSponsorsRequest.ss

Conflicts:

	openstack/_config.php
	openstack/code/SangriaPage.php
	themes/openstack/templates/Layout/SangriaPage_AddInvolvementType.ss

Conflicts:

	openstack/code/SangriaPage.php
2014-11-24 14:06:33 -03:00
Sebastian Marcet df46bd5a0d [smarcet]
* ss3 migration fixes.

Conflicts:

	marketplace/code/model/consultants/ISpokenLanguage.php
2014-11-24 14:05:12 -03:00
Sebastian Marcet 6900a186cf [smarcet] - #7742
* fixed slug method on datacenter locations on js side.
2014-11-24 14:04:27 -03:00
Sebastian Marcet 63d950dd28 [smarcet] - updated apache header 2014-10-31 16:59:18 -03:00
Sebastian Marcet c09eca8cc4 [smarcet] - initial commit 2014-10-31 16:21:41 -03:00