summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2012-10-281-0/+1
|
* Fix introduced style errorsBart Visscher2012-10-274-35/+43
|
* Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'Bart Visscher2012-10-272-12/+15
|\ | | | | | | | | Conflicts: lib/base.php
| * Update Sabre to version 1.7.1Susinthiran Sithamparanathan2012-10-172-12/+17
| |
* | fix function documentationBjörn Schießle2012-10-271-2/+1
| |
* | Merge branch 'routing'Bart Visscher2012-10-277-87/+452
|\ \ | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php
| * | Change Symfony/Component/Routing from submodule to composer fetchingBart Visscher2012-10-271-2/+2
| | |
| * | Merge branch 'master' into routingBart Visscher2012-10-1738-171/+632
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php
| | * | 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-052-0/+19
| | | |
| * | | fix actionincludeBart Visscher2012-09-291-1/+1
| | | |
| * | | Convert menu entries of settings pages to use routerBart Visscher2012-09-281-6/+12
| | | |
| * | | Implement route for download in OC_Search_Provider_FileBart Visscher2012-09-282-2/+6
| | | |
| * | | Merge branch 'master' into routingBart Visscher2012-09-287-25/+58
| |\ \ \
| * \ \ \ Merge branch 'master' into routingBart Visscher2012-09-2868-1145/+1765
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php
| * | | | | Add linkToRoute functionalityBart Visscher2012-09-122-6/+37
| | | | | |
| * | | | | Remove redundant loadAppsBart Visscher2012-09-071-1/+0
| | | | | |
| * | | | | Merge branch 'master' into routingBart Visscher2012-09-07116-1879/+2265
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php
| * \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-3071-448/+662
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/js/contacts.js apps/contacts/lib/search.php apps/files_archive/js/archive.js apps/gallery/lib/tiles.php apps/gallery/templates/index.php lib/ocs.php
| * \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-2945-242/+1903
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js
| * \ \ \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-1520-80/+155
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Routing: And start using them from phpBart Visscher2012-08-121-2/+2
| | | | | | | | | |
| * | | | | | | | | Routing: Add some core routesBart Visscher2012-08-122-1/+4
| | | | | | | | | |
| * | | | | | | | | 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-1143-282/+1553
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/base.php
| * | | | | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | Add loading of routes in OC_RouterBart Visscher2012-08-101-0/+13
| | | | | | | | | | |
| * | | | | | | | | | Small cleanupBart Visscher2012-07-251-2/+0
| | | | | | | | | | |
| * | | | | | | | | | Convert new actionsBart Visscher2012-07-251-8/+26
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into routingBart Visscher2012-07-2512-13/+328
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add functions for the common HTTP methodsBart Visscher2012-07-251-0/+15
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into routingBart Visscher2012-07-2423-835/+1221
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/ocs.php
| * | | | | | | | | | | | Convert routing to ownCloud fluid interfaceBart Visscher2012-07-233-111/+181
| | | | | | | | | | | | |
| * | | | | | | | | | | | Very basic conversion of ocs to Symfony Routing ComponentBart Visscher2012-07-212-57/+94
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add BackgroundJob::setExecutionType() to public APIJakob Sack2012-10-272-7/+30
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add a new backgroundjob class to access the type of background jobs easilyJakob Sack2012-10-271-0/+52
| | | | | | | | | | | | |
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-273-2/+20
| | | | | | | | | | | | |
* | | | | | | | | | | | | fixed user/group sharing hooksFlorian Hülsmann2012-10-261-13/+13
| | | | | | | | | | | | |
* | | | | | | | | | | | | Split database setup code to functionsBart Visscher2012-10-261-223/+238
| | | | | | | | | | | | |
* | | | | | | | | | | | | Hook emission on sharing stuffFlorian Hülsmann2012-10-261-1/+30
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fix mimetype detection with the 'file' utilityVictor Dubiniuk2012-10-261-9/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | possible fix for bombarding the server with the htaccess test during setupRobin Appelman2012-10-261-16/+21
| | | | | | | | | | | | |