Diffusion Phabricator 4acf45743155

Merge remote branch 'cadamo/devel'
4acf45743155
Actions

Authored by epriestley <git@epriestley.com> on Jun 21 2011, 01:06.

Description

Merge remote branch 'cadamo/devel'

Conflicts:
src/__celerity_resource_map__.php

Details

Committed

epriestley <git@epriestley.com>

Jun 21 2011, 01:06

Pushed

aubort

Jan 31 2017, 17:16

Parents

rPH7851b6573fae: Project list and profile view modifications
rPH4a55af7857da: Don't repeat the diff property table when clicking "show more"

Branches

Unknown

Tags

Unknown

Event Timeline

epriestley <git@epriestley.com> committed rPH4acf45743155: Merge remote branch 'cadamo/devel' (authored by epriestley <git@epriestley.com>).Jun 21 2011, 01:06

Merged Changes

	Commit			Author	Details	Committed
	7851b6573fae			Cristian Adamo	Project list and profile view modifications	Jun 20 2011

Changes (38)

		Path
A		resources/sql/patches/047.projectstatus.sql
M		src/__celerity_resource_map__.php
M		src/__phutil_library_map__.php
M		src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
M		src/applications/people/controller/profile/PhabricatorPeopleProfileController.php
M		src/applications/people/controller/profile/__init__.php
M		src/applications/people/controller/profileedit/PhabricatorPeopleProfileEditController.php
A	(dir)	src/applications/project/constants/
A	(dir)	src/applications/project/constants/status/
A		src/applications/project/constants/status/PhabricatorProjectStatus.php
P		src/applications/project/constants/status/__init__.php Copied from src/applications/maniphest/constants/priority/__init__.php
D		src/applications/project/controller/edit
V		src/applications/project/controller/{edit/PhabricatorProjectEditController.php → profileedit/PhabricatorProjectProfileEditController.php}
V		src/applications/project/controller/{edit → profileedit}/__init__.php
M		src/applications/project/controller/list/PhabricatorProjectListController.php
M		src/applications/project/controller/list/__init__.php
M		src/applications/project/controller/profile/PhabricatorProjectProfileController.php
M		src/applications/project/controller/profile/__init__.php
A	(dir)	src/applications/project/controller/profileedit/
V		src/applications/project/controller/{profileedit/PhabricatorProjectProfileEditController.php ← edit/PhabricatorProjectEditController.php}
V		src/applications/project/controller/{profileedit ← edit}/__init__.php
M		src/applications/project/controller/quickcreate/PhabricatorProjectQuickCreateController.php
M		src/applications/project/controller/quickcreate/__init__.php
M		src/applications/project/storage/profile/PhabricatorProjectProfile.php
M		src/applications/project/storage/profile/__init__.php
M		src/applications/project/storage/project/PhabricatorProject.php
M		src/applications/project/storage/project/__init__.php
A	(dir)	src/applications/project/transactions/
A	(dir)	src/applications/project/transactions/search/
A		src/applications/project/transactions/search/PhabricatorProjectTransactionSearch.php
P		src/applications/project/transactions/search/__init__.php Copied from src/applications/search/storage/document/field/__init__.php
A	(dir)	src/view/layout/profile/
A		src/view/layout/profile/PhabricatorProfileView.php
P		src/view/layout/profile/__init__.php Copied from src/view/layout/sidenav/__init__.php
D		webroot/rsrc/css/application/people
V		webroot/rsrc/css/application/{people/profile.css → profile/profile-view.css}
A	(dir)	webroot/rsrc/css/application/profile/
V		webroot/rsrc/css/application/{profile/profile-view.css ← people/profile.css}