summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'Bart Visscher2012-10-27216-1142/+6469
|\
| * Update Sabre to version 1.7.1Susinthiran Sithamparanathan2012-10-17216-1142/+6471
* | Include copy of Symfony routing component, and don't use composerBart Visscher2012-10-2744-22/+4037
* | fix function documentationBjörn Schießle2012-10-271-2/+1
* | fix broken paths in versions appBjörn Schießle2012-10-271-280/+279
* | don't call $('#found_versions').chosen(); after opening the history drop-down...Björn Schießle2012-10-271-1/+0
* | Fix download url generationBart Visscher2012-10-272-2/+2
* | fix paths in preeseed-config.phpThomas Müller2012-10-271-2/+2
* | Add composer command for now, seeBart Visscher2012-10-271-0/+0
* | LDAP: let result processing in Access::search slice the array for not-paginat...Arthur Schiwon2012-10-272-14/+11
* | LDAP: debug messagedArthur Schiwon2012-10-271-3/+4
* | LDAP: sourced out paged search init into initPagedSearch method, making searc...Arthur Schiwon2012-10-271-28/+46
* | Merge branch 'routing'Bart Visscher2012-10-2753-225/+792
|\ \
| * | More info for composer.jsonBart Visscher2012-10-271-0/+10
| * | Change Symfony/Component/Routing from submodule to composer fetchingBart Visscher2012-10-275-5/+14
| * | Resetting the password should also invalidate the token login cookiesBart Visscher2012-10-171-0/+1
| * | Change the lostpassword flow to a controllerBart Visscher2012-10-176-67/+101
| * | Merge branch 'master' into routingBart Visscher2012-10-171500-176214/+23713
| |\ \
| | * | Check for file exists before loading app version fileBart Visscher2012-10-171-3/+2
| * | | Add API description to OC_Route and OC_RouterBart Visscher2012-10-052-0/+71
| * | | Implement routing on javascript sideBart Visscher2012-10-055-1/+96
| * | | Fix route nameBart Visscher2012-10-051-1/+1
| * | | Make the core ajax calls use the routerBart Visscher2012-10-029-10/+22
| * | | Make the settings ajax calls use the routerBart Visscher2012-10-0221-59/+72
| * | | fix actionincludeBart Visscher2012-09-291-1/+1
| * | | Convert menu entries of settings pages to use routerBart Visscher2012-09-288-14/+34
| * | | Implement route for download in OC_Search_Provider_FileBart Visscher2012-09-283-2/+18
| * | | Merge branch 'master' into routingBart Visscher2012-09-2814-34/+160
| |\ \ \
| * \ \ \ Merge branch 'master' into routingBart Visscher2012-09-28739-10430/+27881
| |\ \ \ \
| * | | | | Add linkToRoute functionalityBart Visscher2012-09-122-6/+37
| * | | | | Remove redundant loadAppsBart Visscher2012-09-071-1/+0
| * | | | | Merge branch 'master' into routingBart Visscher2012-09-07852-11512/+19011
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-301916-304209/+16808
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-291321-15741/+147757
| |\ \ \ \ \ \ \
| * | | | | | | | Fix gallery image viewBart Visscher2012-08-151-3/+1
| * | | | | | | | Fix linkTo calls for new routingBart Visscher2012-08-158-11/+11
| * | | | | | | | Merge branch 'master' into routingBart Visscher2012-08-15961-9859/+57878
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use core routes in js tooBart Visscher2012-08-151-2/+2
| * | | | | | | | | Routing: And start using them from phpBart Visscher2012-08-121-2/+2
| * | | | | | | | | Routing: Add some core routesBart Visscher2012-08-123-1/+23
| * | | | | | | | | Routing: Prepare load funtions to be called from OC_RouterBart Visscher2012-08-121-11/+14
| * | | | | | | | | Add router match to OC::handleRequestBart Visscher2012-08-111-0/+9
| * | | | | | | | | Routing: Fix construction of RequestContextBart Visscher2012-08-111-1/+5
| * | | | | | | | | Merge branch 'master' into routingBart Visscher2012-08-11780-29832/+68347
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix for running doing routing in lib/ocs.phpBart Visscher2012-08-113-5/+14
| * | | | | | | | | | Routing: combine all routes into one setBart Visscher2012-08-101-8/+12
| * | | | | | | | | | Move loading of routes to OC::getRouter functionBart Visscher2012-08-102-1/+7
| * | | | | | | | | | Change access to router object to getter functionBart Visscher2012-08-101-6/+12
| * | | | | | | | | | Routing: Method needs to be uppercaseBart Visscher2012-08-102-6/+6
| * | | | | | | | | | Create OC_Router in OC::initBart Visscher2012-08-101-0/+6