archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'cadamo/devel'

Browse Source 
Conflicts:
	src/__celerity_resource_map__.php
This commit is contained in:
epriestley
2011-06-20 16:06:03 -07:00
parent 4a55af7857 7851b6573f
commit 4acf457431
26 changed files with 636 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
View File

@@ -76,7 +76,8 @@ class AphrontDefaultApplicationConfiguration
'edit/(?:(?P<id>\d+)/(?:(?P<view>\w+)/)?)?$'
=> 'PhabricatorPeopleEditController',
),
'/p/(?P<username>\w+)/$' => 'PhabricatorPeopleProfileController',
'/p/(?P<username>\w+)/(?:(?P<page>\w+)/)?$'
=> 'PhabricatorPeopleProfileController',
'/profile/' => array(
'edit/$' => 'PhabricatorPeopleProfileEditController',
),
@@ -197,8 +198,9 @@ class AphrontDefaultApplicationConfiguration
'/project/' => array(
'$' => 'PhabricatorProjectListController',
'edit/(?:(?P<id>\d+)/)?$' => 'PhabricatorProjectEditController',
'view/(?P<id>\d+)/$' => 'PhabricatorProjectProfileController',
'edit/(?:(?P<id>\d+)/)?$' => 'PhabricatorProjectProfileEditController',
'view/(?P<id>\d+)/(?:(?P<page>\w+)/)?$'
=> 'PhabricatorProjectProfileController',
'affiliation/(?P<id>\d+)/$'
=> 'PhabricatorProjectAffiliationEditController',
'quickcreate/$' => 'PhabricatorProjectQuickCreateController',