Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-28 | 1 | -0/+1 |
| | |||||
* | Fix introduced style errors | Bart Visscher | 2012-10-27 | 4 | -35/+43 |
| | |||||
* | Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git' | Bart Visscher | 2012-10-27 | 2 | -12/+15 |
|\ | | | | | | | | | Conflicts: lib/base.php | ||||
| * | Update Sabre to version 1.7.1 | Susinthiran Sithamparanathan | 2012-10-17 | 2 | -12/+17 |
| | | |||||
* | | fix function documentation | Björn Schießle | 2012-10-27 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'routing' | Bart Visscher | 2012-10-27 | 7 | -87/+452 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php | ||||
| * | | Change Symfony/Component/Routing from submodule to composer fetching | Bart Visscher | 2012-10-27 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into routing | Bart Visscher | 2012-10-17 | 38 | -171/+632 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php | ||||
| | * | | Check for file exists before loading app version file | Bart Visscher | 2012-10-17 | 1 | -3/+2 |
| | | | | |||||
| * | | | Add API description to OC_Route and OC_Router | Bart Visscher | 2012-10-05 | 2 | -0/+71 |
| | | | | |||||
| * | | | Implement routing on javascript side | Bart Visscher | 2012-10-05 | 2 | -0/+19 |
| | | | | |||||
| * | | | fix actioninclude | Bart Visscher | 2012-09-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Convert menu entries of settings pages to use router | Bart Visscher | 2012-09-28 | 1 | -6/+12 |
| | | | | |||||
| * | | | Implement route for download in OC_Search_Provider_File | Bart Visscher | 2012-09-28 | 2 | -2/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 7 | -25/+58 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 68 | -1145/+1765 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php | ||||
| * | | | | | Add linkToRoute functionality | Bart Visscher | 2012-09-12 | 2 | -6/+37 |
| | | | | | | |||||
| * | | | | | Remove redundant loadApps | Bart Visscher | 2012-09-07 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into routing | Bart Visscher | 2012-09-07 | 116 | -1879/+2265 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php | ||||
| * \ \ \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-30 | 71 | -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 routing | Bart Visscher | 2012-08-29 | 45 | -242/+1903 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-15 | 20 | -80/+155 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Routing: And start using them from php | Bart Visscher | 2012-08-12 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Routing: Add some core routes | Bart Visscher | 2012-08-12 | 2 | -1/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Routing: Prepare load funtions to be called from OC_Router | Bart Visscher | 2012-08-12 | 1 | -11/+14 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add router match to OC::handleRequest | Bart Visscher | 2012-08-11 | 1 | -0/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Routing: Fix construction of RequestContext | Bart Visscher | 2012-08-11 | 1 | -1/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into routing | Bart Visscher | 2012-08-11 | 43 | -282/+1553 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/base.php | ||||
| * | | | | | | | | | | Fix for running doing routing in lib/ocs.php | Bart Visscher | 2012-08-11 | 3 | -5/+14 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Routing: combine all routes into one set | Bart Visscher | 2012-08-10 | 1 | -8/+12 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Move loading of routes to OC::getRouter function | Bart Visscher | 2012-08-10 | 2 | -1/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Change access to router object to getter function | Bart Visscher | 2012-08-10 | 1 | -6/+12 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Routing: Method needs to be uppercase | Bart Visscher | 2012-08-10 | 2 | -6/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Create OC_Router in OC::init | Bart Visscher | 2012-08-10 | 1 | -0/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add loading of routes in OC_Router | Bart Visscher | 2012-08-10 | 1 | -0/+13 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Small cleanup | Bart Visscher | 2012-07-25 | 1 | -2/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Convert new actions | Bart Visscher | 2012-07-25 | 1 | -8/+26 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into routing | Bart Visscher | 2012-07-25 | 12 | -13/+328 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add functions for the common HTTP methods | Bart Visscher | 2012-07-25 | 1 | -0/+15 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into routing | Bart Visscher | 2012-07-24 | 23 | -835/+1221 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/ocs.php | ||||
| * | | | | | | | | | | | | Convert routing to ownCloud fluid interface | Bart Visscher | 2012-07-23 | 3 | -111/+181 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Very basic conversion of ocs to Symfony Routing Component | Bart Visscher | 2012-07-21 | 2 | -57/+94 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Add BackgroundJob::setExecutionType() to public API | Jakob Sack | 2012-10-27 | 2 | -7/+30 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Add a new backgroundjob class to access the type of background jobs easily | Jakob Sack | 2012-10-27 | 1 | -0/+52 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-27 | 3 | -2/+20 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | fixed user/group sharing hooks | Florian Hülsmann | 2012-10-26 | 1 | -13/+13 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Split database setup code to functions | Bart Visscher | 2012-10-26 | 1 | -223/+238 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Hook emission on sharing stuff | Florian Hülsmann | 2012-10-26 | 1 | -1/+30 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fix mimetype detection with the 'file' utility | Victor Dubiniuk | 2012-10-26 | 1 | -9/+4 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | possible fix for bombarding the server with the htaccess test during setup | Robin Appelman | 2012-10-26 | 1 | -16/+21 |
| | | | | | | | | | | | | |