summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-246-6/+6
* Merge pull request #15846 from owncloud/fix-missing-loading-indicatorLukas Reschke2015-04-231-0/+2
|\
| * Add missing loading indicator for enabled appsMorris Jobke2015-04-231-0/+2
* | Merge pull request #15826 from owncloud/issue-15804-occ-user-delete-exceptionblizzz2015-04-238-20/+262
|\ \ | |/ |/|
| * Fix file namesJoas Schilling2015-04-232-0/+0
| * Add tests for occ user:lastseenJoas Schilling2015-04-231-0/+105
| * Unify the output of the user commands and use DIJoas Schilling2015-04-236-16/+40
| * Add unit tests for occ user:deleteJoas Schilling2015-04-231-0/+106
| * Check if the user exists before trying to delete himJoas Schilling2015-04-231-5/+12
* | Merge pull request #15814 from owncloud/public-reshare-webdavVincent Petry2015-04-234-139/+6
|\ \
| * | fix subfolder reshares over webdavRobin Appelman2015-04-231-2/+2
| * | remove unneeded readonlycacheRobin Appelman2015-04-221-44/+0
| * | resolve reshares in public webdavRobin Appelman2015-04-221-3/+4
| * | use the permissions mask cache wrapper instead of the read only cacheRobin Appelman2015-04-222-94/+4
* | | Merge pull request #15828 from owncloud/smb-1.0.1Thomas Müller2015-04-235-17/+16
|\ \ \
| * | | update icewind/smb to 1.0.1Robin Appelman2015-04-225-17/+16
| |/ /
* | | Merge pull request #15831 from owncloud/enc2-unittestcleanuptmpfileThomas Müller2015-04-231-0/+6
|\ \ \
| * | | Delete temp files after testing encryption stream wrapperVincent Petry2015-04-231-0/+6
| | |/ | |/|
* | | Merge pull request #15617 from mmattel/getenv_system_check_and_warningThomas Müller2015-04-232-0/+13
|\ \ \
| * | | Checks if getenv returns proper system variable resultsroot2015-04-232-0/+13
* | | | Merge pull request #15830 from owncloud/enc2-ajaxstatuswhenloggedinThomas Müller2015-04-231-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Only get encryption status when logged inVincent Petry2015-04-231-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2364-14/+366
* | | Merge pull request #15639 from rullzer/fix_15368Morris Jobke2015-04-232-2/+99
|\ \ \
| * | | Added unit testsRoeland Jago Douma2015-04-171-0/+94
| * | | moved from html to $('html') to fix unit testsRoeland Jago Douma2015-04-171-2/+1
| * | | Reset sharedialog valuesRoeland Jago Douma2015-04-171-0/+4
* | | | 8.1.0 alpha 2v8.1.0alpha2Frank Karlitschek2015-04-151-2/+2
* | | | Merge pull request #15805 from owncloud/fileslist-whitespaceMorris Jobke2015-04-221-3/+4
|\ \ \ \
| * | | | add whitespace to bottom of files list to correctly show dropdowns, fix #15801Jan-Christoph Borchardt2015-04-221-3/+4
* | | | | Merge pull request #15809 from owncloud/view-null-rootVincent Petry2015-04-222-2/+25
|\ \ \ \ \
| * | | | | typoRobin Appelman2015-04-221-1/+1
| * | | | | add unit tests for null handling in viewRobin Appelman2015-04-221-2/+19
| * | | | | dont allow using null as view rootRobin Appelman2015-04-221-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15799 from owncloud/fix-enc-folder-moveThomas Müller2015-04-2214-267/+168
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix PHPDocThomas Müller2015-04-221-7/+8
| * | | | pass KeyStorage via ctorThomas Müller2015-04-223-43/+12
| * | | | calling renameKeys() on directory level as well - fixes #15778Thomas Müller2015-04-222-9/+18
| * | | | add $encryptionModuleId to methods of Keys/IStorageThomas Müller2015-04-2213-218/+140
* | | | | Merge pull request #15787 from owncloud/trash-partfilesMorris Jobke2015-04-222-3/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Do not trash part files, delete directlyVincent Petry2015-04-212-3/+6
* | | | | Merge pull request #15549 from owncloud/jcf-fix-cache-updateMorris Jobke2015-04-221-1/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | clarify the duplication of the $params arrayJens-Christian Fischer2015-04-121-1/+2
| * | | | don't update identical valuesJens-Christian Fischer2015-04-111-1/+7
* | | | | Merge pull request #15757 from owncloud/enc-fixfeofforlastblockBjörn Schießle2015-04-224-6/+94
|\ \ \ \ \
| * | | | | Fix encryption feof to not return too earlyVincent Petry2015-04-204-6/+94
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-22102-14/+314
* | | | | | Merge pull request #15734 from owncloud/add-deprecate-tagsThomas Müller2015-04-216-1/+27
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add @deprecated to all methods with a proper method in \OCPMorris Jobke2015-04-206-1/+27
* | | | | | Merge pull request #15782 from owncloud/hide-modified-multiselectMorris Jobke2015-04-211-1/+10
|\ \ \ \ \ \