summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Removed debugging commentsSam Tuke2013-01-141-49/+0
* Removed old and unnecessary commentsSam Tuke2013-01-101-7/+0
* Removed misleading crypto gen commentSam Tuke2013-01-101-2/+0
* Merge branch 'master' into files_encryptionSam Tuke2013-01-1064-120/+255
|\
| * Merge pull request #1127 from owncloud/fixing-641-for-webdav-masterThomas Müller2013-01-101-0/+1
| |\
| | * webdav returns "503 Service Unavailable" in case the ownCloud server is curre...Thomas Mueller2013-01-091-0/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1050-19/+125
| * | Merge pull request #1131 from owncloud/more_translationsLukas Reschke2013-01-092-5/+6
| |\ \
| | * | more translationsJörn Friedrich Dreyer2013-01-092-5/+6
| * | | Merge pull request #1124 from schiesbn/sabredav2Lukas Reschke2013-01-091-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Upstream merged my patch to add additional ssl root certificates to the webda...Björn Schießle2013-01-081-1/+1
| | |/
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0940-41/+13
| * | Merge pull request #938 from owncloud/fix_minor_files_annoyancesThomas Tanghus2013-01-084-52/+72
| |\ \ | | |/ | |/|
| | * fixing string concatenation in javascriptThomas Mueller2013-01-081-1/+1
| | * attach max upload tipsy to div instead of a to fix tooltip not showing due to...Jörn Friedrich Dreyer2013-01-072-3/+7
| | * remove aborted uploadsJörn Friedrich Dreyer2013-01-071-0/+3
| | * adapt to isFileNameValid, whitespace cleanupJörn Friedrich Dreyer2013-01-072-28/+19
| | * Merge branch 'master' into fix_minor_files_annoyancesThomas Mueller2013-01-0655-18/+158
| | |\
| | * | reverse z-index of a and input to make upload work again in ie8/9Jörn Friedrich Dreyer2013-01-041-2/+2
| | * | remove initial iframe, is added automatically by jquery upload mechanismJörn Friedrich Dreyer2013-01-041-2/+0
| | * | input/form switching cleanupJörn Friedrich Dreyer2013-01-022-3/+3
| | * | abort rename on ESC keyupJörn Friedrich Dreyer2013-01-021-0/+7
| | * | show notification when renaming a file to ''Jörn Friedrich Dreyer2013-01-021-0/+4
| | * | enable enter in ie by using .submit()+form instead of .change(), use notifica...Jörn Friedrich Dreyer2013-01-021-12/+25
| | * | whitespace cleanupJörn Friedrich Dreyer2013-01-021-14/+14
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0811-1/+28
| * | | Update apps/user_webdavauth/user_webdavauth.phpFrank Karlitschek2013-01-071-1/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-074-0/+8
| | |/ | |/|
* | | Re-added 'checkAdminUser'Sam Tuke2013-01-101-6/+10
* | | Merge branch 'master' into files_encryptionSam Tuke2013-01-063-6/+18
|\| |
| * | rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has ...Thomas Mueller2013-01-062-5/+17
| * | Files: prevent people from renaming files to '.'Robin Appelman2013-01-052-2/+2
* | | All in-use unit tests now passing after mergeSam Tuke2013-01-0615-540/+513
* | | Removed debugging lineSam Tuke2013-01-061-1/+1
* | | Made Keymanager::getFileKey() dependencies explicit, fixed client code and te...Sam Tuke2013-01-064-7/+11
* | | Merge branch 'master' into files_encryptionSam Tuke2013-01-0552-12/+140
|\| |
| * | Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-041-1/+1
| |\ \
| | * | Remove the WIP external sharing apiTom Needham2012-12-314-84/+0
| | * | Merge branch 'master' into ocs_apiTom Needham2012-12-31100-202/+704
| | |\ \
| | * | | check if adminFrank Karlitschek2012-12-294-1/+10
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-291-0/+2
| | * | | Change post_write hook to write to prevent creating a duplicate of the origin...Michael Gapczynski2012-12-291-1/+1
| | * | | prevent keyboardshortcuts from catching events outside the main doc - e.g. th...Thomas Mueller2012-12-291-0/+3
| | * | | Merge branch 'master' into ocs_apiTom Needham2012-12-1618-28/+45
| | |\ \ \
| | * \ \ \ Merge master into ocs_api, fix conflicts.Tom Needham2012-12-14248-1940/+3296
| | |\ \ \ \
| | * | | | | External Share API: Move url down one level in responseTom Needham2012-10-313-2/+15
| | * | | | | Fix url generated for public shared filesTom Needham2012-10-281-2/+2
| | * | | | | Merge master into ocs_apiTom Needham2012-10-28264-1195/+3585
| | |\ \ \ \ \
| | * | | | | | Add API method for sharing a file, currently only via a link.Tom Needham2012-10-283-1/+72
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0542-0/+58