summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into filesystemRobin Appelman2012-10-276-45/+73
|\
| * 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-274-4/+16
| |\
| | * Merge branch 'master' into routingBart Visscher2012-10-17132-381/+1314
| | |\
| | * | Implement route for download in OC_Search_Provider_FileBart Visscher2012-09-281-0/+12
| | * | Merge branch 'master' into routingBart Visscher2012-09-281-1/+1
| | |\ \
| | * \ \ Merge branch 'master' into routingBart Visscher2012-09-28177-391/+1695
| | |\ \ \
| | * \ \ \ Merge branch 'master' into routingBart Visscher2012-09-07158-1249/+1675
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-301302-298022/+773
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-29745-3070/+124866
| | |\ \ \ \ \ \
| | * | | | | | | Fix gallery image viewBart Visscher2012-08-151-3/+1
| | * | | | | | | Fix linkTo calls for new routingBart Visscher2012-08-158-11/+11
* | | | | | | | | some more porting of the sharingRobin Appelman2012-10-272-5/+7
* | | | | | | | | remove last uses of depricated OC_FilesystemRobin Appelman2012-10-271-4/+6
* | | | | | | | | fix delete and sort filesRobin Appelman2012-10-274-13/+24
* | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-277-7/+51
|\| | | | | | | |
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-277-7/+51
* | | | | | | | | move some stuff to the new apiRobin Appelman2012-10-2610-19/+21
* | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-263-36/+150
|\| | | | | | | |
| * | | | | | | | LDAP: let getUsers make use of paged searchArthur Schiwon2012-10-261-15/+29
| * | | | | | | | LDAP: add support for paged searches.Arthur Schiwon2012-10-261-20/+115
| * | | | | | | | LDAP: know, wether server supports paged searchArthur Schiwon2012-10-261-0/+3
| * | | | | | | | LDAP: check for resource before unbindingArthur Schiwon2012-10-261-1/+3
* | | | | | | | | merge master into filesystemRobin Appelman2012-10-261-6/+5
|\| | | | | | | |
| * | | | | | | | separate buttons for new file and uploadJan-Christoph Borchardt2012-10-261-6/+5
* | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-264-7/+59
|\| | | | | | | |
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-264-7/+59
* | | | | | | | | merge master into filesystemRobin Appelman2012-10-2520-62/+68
|\| | | | | | | |
| * | | | | | | | dir in newfile has to start with /Bart Visscher2012-10-251-1/+1
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-251-0/+6
| * | | | | | | | Merge pull request #81 from fmms/masterLukas Reschke2012-10-2415-53/+53
| |\ \ \ \ \ \ \ \
| | * | | | | | | | NoSpaceAfterComma IIFelix Moeller2012-10-233-6/+6
| | * | | | | | | | Checkstyle: NoSpaceAfterCommaFelix Moeller2012-10-2314-49/+49
| * | | | | | | | | Forget to urlencode the pathLukas Reschke2012-10-241-1/+1
| * | | | | | | | | urlencodeLukas Reschke2012-10-241-6/+6
| * | | | | | | | | Revert e1a4fe98908dbf8f9e795fd852b231381d4f3ce4Lukas Reschke2012-10-241-1/+1
| * | | | | | | | | urldecode target directoryBjörn Schießle2012-10-241-1/+1
* | | | | | | | | | cleanup OC_Files a bitRobin Appelman2012-10-245-20/+34
* | | | | | | | | | merge master into filesystemRobin Appelman2012-10-2414-244/+361
|\| | | | | | | | |
| * | | | | | | | | Apply coding style guideThomas Müller2012-10-241-1/+2
| * | | | | | | | | fix copy&paste bug from previous commitBjörn Schießle2012-10-241-1/+1
| * | | | | | | | | Shared files are not stored in the file cache. Therefore we need toBjörn Schießle2012-10-241-1/+18
| * | | | | | | | | Place the brackets in the first lineLukas Reschke2012-10-241-60/+59
| * | | | | | | | | Apply coding style guideThomas Müller2012-10-241-203/+203
| * | | | | | | | | calling OC_Filesystem at this point will initialize file system with wrong us...Björn Schießle2012-10-241-2/+8
| * | | | | | | | | Merge pull request #76 from fmms/masterLukas Reschke2012-10-233-3/+3
| |\| | | | | | | |
| | * | | | | | | | Codestyle: FunctionCallArgumentSpacingFelix Moeller2012-10-233-3/+3
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-244-23/+58