summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-03156-912/+818
* Merge pull request #8171 from owncloud/fix-importBernhard Posselt2014-05-022-3/+1
|\
| * add class Pimple to autloaderThomas Müller2014-04-282-3/+1
| * be nice and use a relative import so people can use the class without firing ...Bernhard Posselt2014-04-121-1/+1
* | Merge pull request #8377 from youngguns-nl/issue_8376Vincent Petry2014-05-023-3/+29
|\ \
| * | refs #8376; spaces=>tabsSjors van der Pluijm2014-04-291-1/+1
| * | refs #8376; spaces=>tabsSjors van der Pluijm2014-04-281-1/+1
| * | refs #8376; added comment and applied patch on other filesSjors van der Pluijm2014-04-283-2/+24
| * | rewind iterator before iteration startsSjors van der Pluijm2014-04-281-0/+1
| * | fixes #8376Sjors van der Pluijm2014-04-281-1/+4
* | | Merge pull request #8400 from owncloud/download-button-public-folderThomas Müller2014-05-024-18/+21
|\ \ \
| * | | disable download button if zip download is disabledThomas Müller2014-05-022-1/+4
| * | | fix position and look of public download buttonJan-Christoph Borchardt2014-05-022-7/+7
| * | | remove unneeded header-right details stylesJan-Christoph Borchardt2014-05-021-7/+0
| * | | remove file name from upper right buttonThomas Müller2014-04-291-1/+1
| * | | reintroduce download button on public sharesThomas Müller2014-04-291-3/+10
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0222-86/+116
* | | | Merge pull request #8415 from owncloud/sharing_fix_renameBjörn Schießle2014-05-011-4/+7
|\ \ \ \
| * | | | return the new name if a mount point was renamedBjoern Schiessle2014-04-301-4/+7
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0187-289/+8061
* | | | | Merge pull request #8412 from owncloud/sharing_fix_part_file_renameLukas Reschke2014-04-303-9/+98
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | get the correct owner path for part filesBjoern Schiessle2014-04-302-1/+92
| * | | | only update the values which really changedBjoern Schiessle2014-04-301-8/+6
| |/ / /
* | | | Merge pull request #8391 from owncloud/router-parameter-sortingThomas Müller2014-04-301-1/+1
|\ \ \ \
| * | | | Preserve keys when sorting parameters when generatings urlsRobin Appelman2014-04-291-1/+1
* | | | | Merge pull request #8404 from owncloud/fix-checkboxesThomas Müller2014-04-301-5/+5
|\ \ \ \ \
| * | | | | Fixed too generic checkbox and link selectorsVincent Petry2014-04-291-5/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #8408 from owncloud/delete-spinnerMorris Jobke2014-04-302-0/+17
|\ \ \ \ \
| * | | | | Show spinner for all files when deleting allVincent Petry2014-04-292-0/+17
| |/ / / /
* | | | | Merge pull request #8405 from owncloud/remove-leftcontent-rightcontentMorris Jobke2014-04-301-15/+0
|\ \ \ \ \
| * | | | | remove leftcontent and rightcontent CSS, no longer neededJan-Christoph Borchardt2014-04-291-15/+0
| |/ / / /
* | | | | Merge pull request #8132 from owncloud/issue/8131Thomas Müller2014-04-303-90/+90
|\ \ \ \ \
| * | | | | Remove unneccessary statement from testJoas Schilling2014-04-291-2/+0
| * | | | | Update tests to test for create and update aswellJoas Schilling2014-04-291-13/+35
| * | | | | Deduplicate codeJoas Schilling2014-04-291-136/+39
| * | | | | Correctly emit create/update hooks when a large file is being created/updateJoas Schilling2014-04-291-0/+31
| * | | | | Emit a new hook, when a file is being updated onlyJoas Schilling2014-04-292-1/+47
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-30575-3128/+7578
| |/ / / / |/| | | |
* | | | | Merge pull request #8382 from owncloud/enc_fix_decrypt_allVincent Petry2014-04-292-10/+52
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix shouldEncrypt() method and improved decryptAll() unit testsBjoern Schiessle2014-04-282-10/+52
| | |/ / | |/| |
* | | | Merge pull request #8285 from owncloud/better_getmountby_handlingicewind19912014-04-293-3/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Better handle return values from Filesystem::getMountBy*Robin McCorkell2014-04-253-3/+4
* | | | Merge pull request #6870 from owncloud/uncheck-remember-checkboxJan-Christoph Borchardt2014-04-291-1/+1
|\ \ \ \
| * | | | do not check 'remember' log in by defaultJan-Christoph Borchardt2014-01-211-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-29304-5308/+21503
* | | | | Merge pull request #8388 from owncloud/reset-3rdparty-masterLukas Reschke2014-04-281-0/+0
|\ \ \ \ \
| * | | | | Update 3rdpartyThomas Müller2014-04-281-0/+0
* | | | | | Merge pull request #7852 from josh4trunks/basic_auth_fixThomas Müller2014-04-282-16/+14
|\ \ \ \ \ \
| * | | | | | Remove missed stuff from mergejosh4trunks2014-04-031-3/+0
| * | | | | | Fixed Typojosh4trunks2014-04-031-1/+1