Merge remote branch 'cadamo/devel'
4acf45743155
Actions

Description

Merge remote branch 'cadamo/devel'

Conflicts:
src/__celerity_resource_map__.php

Details

Provenance

epriestley	Authored on Jun 20 2011, 4:06 PM
themackabu	Pushed on Mar 25 2025, 8:07 PM

Parents

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

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

7851b6573fae Project list and profile view modifications
Author
Cristian Adamo
Browse Repository
No Builds
No Audits

Changes (38)

Path

Size

resources/

sql/

patches/

047.projectstatus.sql

src/

__celerity_resource_map__.php

__phutil_library_map__.php

aphront/

default/

configuration/

AphrontDefaultApplicationConfiguration.php

applications/

people/

controller/

profile/

PhabricatorPeopleProfileController.php

__init__.php

profileedit/

PhabricatorPeopleProfileEditController.php

project/

constants

status

PhabricatorProjectStatus.php

controller/

edit

PhabricatorProjectEditController.php

__init__.php

list/

PhabricatorProjectListController.php

__init__.php

profile/

PhabricatorProjectProfileController.php

__init__.php

profileedit

	profileedit/
	edit/

	PhabricatorProjectProfileEditController.php
	PhabricatorProjectEditController.php

__init__.php

quickcreate/

PhabricatorProjectQuickCreateController.php

__init__.php

storage/

profile/

PhabricatorProjectProfile.php

__init__.php

project/

PhabricatorProject.php

__init__.php

transactions

PhabricatorProjectTransactionSearch.php

	project/	constants/	status/
	maniphest/	constants/	priority/

__init__.php

	project/	transactions/	search/
	search/	storage/	document/	field/

__init__.php

view/

layout/

profile

PhabricatorProfileView.php

	profile/
	sidenav/

__init__.php

webroot/

rsrc/

css/

application/

people

profile.css

profile

	profile/
	people/

	profile-view.css
	profile.css

rP4acf45743155

View Options

resources/sql/patches/047.projectstatus.sql

View Options

src/__celerity_resource_map__.php

View Options

src/__phutil_library_map__.php

View Options

src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php

View Options

src/applications/people/controller/profile/PhabricatorPeopleProfileController.php

View Options

src/applications/people/controller/profile/init.php

View Options

src/applications/people/controller/profileedit/PhabricatorPeopleProfileEditController.php

View Options

src/applications/project/constants/status/PhabricatorProjectStatus.php

View Options

src/applications/project/constants/status/init.php

View Options

src/applications/project/controller/edit

View Options

src/applications/project/controller/edit/PhabricatorProjectEditController.php

View Options

src/applications/project/controller/edit/init.php

View Options

src/applications/project/controller/list/PhabricatorProjectListController.php

View Options

src/applications/project/controller/list/init.php

View Options

src/applications/project/controller/profile/PhabricatorProjectProfileController.php

View Options

src/applications/project/controller/profile/init.php

View Options

src/applications/project/controller/profileedit/PhabricatorProjectProfileEditController.php

View Options

src/applications/project/controller/profileedit/init.php

View Options

src/applications/project/controller/quickcreate/PhabricatorProjectQuickCreateController.php

View Options

src/applications/project/controller/quickcreate/init.php

View Options

src/applications/project/storage/profile/PhabricatorProjectProfile.php

View Options

src/applications/project/storage/profile/init.php

View Options

src/applications/project/storage/project/PhabricatorProject.php

View Options

src/applications/project/storage/project/init.php

View Options

src/applications/project/transactions/search/PhabricatorProjectTransactionSearch.php

View Options

src/applications/project/transactions/search/init.php

View Options

src/view/layout/profile/PhabricatorProfileView.php

View Options

src/view/layout/profile/init.php

View Options

webroot/rsrc/css/application/people

View Options

webroot/rsrc/css/application/people/profile.css

View Options

webroot/rsrc/css/application/profile/profile-view.css

Merge remote branch 'cadamo/devel'4acf45743155Actions

Description

Details

Event Timeline

Merged Changes

Changes (38)

rP4acf45743155

resources/sql/patches/047.projectstatus.sql

src/__celerity_resource_map__.php

src/__phutil_library_map__.php

src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php

src/applications/people/controller/profile/PhabricatorPeopleProfileController.php

src/applications/people/controller/profile/__init__.php

src/applications/people/controller/profileedit/PhabricatorPeopleProfileEditController.php

src/applications/project/constants/status/PhabricatorProjectStatus.php

src/applications/project/constants/status/__init__.php

src/applications/project/controller/edit

src/applications/project/controller/edit/PhabricatorProjectEditController.php

src/applications/project/controller/edit/__init__.php

src/applications/project/controller/list/PhabricatorProjectListController.php

src/applications/project/controller/list/__init__.php

src/applications/project/controller/profile/PhabricatorProjectProfileController.php

src/applications/project/controller/profile/__init__.php

src/applications/project/controller/profileedit/PhabricatorProjectProfileEditController.php

src/applications/project/controller/profileedit/__init__.php

src/applications/project/controller/quickcreate/PhabricatorProjectQuickCreateController.php

src/applications/project/controller/quickcreate/__init__.php

src/applications/project/storage/profile/PhabricatorProjectProfile.php

src/applications/project/storage/profile/__init__.php

src/applications/project/storage/project/PhabricatorProject.php

src/applications/project/storage/project/__init__.php

src/applications/project/transactions/search/PhabricatorProjectTransactionSearch.php

src/applications/project/transactions/search/__init__.php

src/view/layout/profile/PhabricatorProfileView.php

src/view/layout/profile/__init__.php

webroot/rsrc/css/application/people

webroot/rsrc/css/application/people/profile.css

webroot/rsrc/css/application/profile/profile-view.css

Merge remote branch 'cadamo/devel'
4acf45743155
Actions

src/applications/people/controller/profile/init.php

src/applications/project/constants/status/init.php

src/applications/project/controller/edit/init.php

src/applications/project/controller/list/init.php

src/applications/project/controller/profile/init.php

src/applications/project/controller/profileedit/init.php

src/applications/project/controller/quickcreate/init.php

src/applications/project/storage/profile/init.php

src/applications/project/storage/project/init.php

src/applications/project/transactions/search/init.php

src/view/layout/profile/init.php