summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #7656 from owncloud/xml-entityfixesLukas Reschke2014-03-102-4/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Disable XML entities when parsing XMLVincent Petry2014-03-102-4/+14
|/ / / / / / / /
* | | | | | | | Merge pull request #7600 from ideaship/fix_escaped_htmlVincent Petry2014-03-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix: use print_escaped for radio button "checked"ideaship2014-03-061-1/+1
* | | | | | | | | Merge pull request #7646 from owncloud/fix_ocs_api_unshareThomas Müller2014-03-102-7/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | we need the file_source to delete a share successfullyBjoern Schiessle2014-03-102-7/+40
* | | | | | | | | | Merge pull request #7398 from owncloud/trash_dont_rely_on_dbVincent Petry2014-03-108-151/+79
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | fix mimetype detection, introduce fake etag to identify preview imagesBjoern Schiessle2014-03-101-1/+2
| * | | | | | | | | get trash size from file cacheBjoern Schiessle2014-03-105-78/+11
| * | | | | | | | | only enable previews if the encryption is disabledBjoern Schiessle2014-03-101-1/+5
| * | | | | | | | | if file is not in db, fall back to restore file to the users rootBjoern Schiessle2014-03-104-72/+62
* | | | | | | | | | Merge pull request #7632 from owncloud/fix-7582-masterThomas Müller2014-03-101-11/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixing identThomas Müller2014-03-071-9/+9
| * | | | | | | | | | we first shall check if the current session is valid - otherwise the session-...Thomas Müller2014-03-071-12/+13
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7629 from owncloud/files-allfileswarningtypoVincent Petry2014-03-101-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed log warning when deleting a single fileVincent Petry2014-03-071-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #7631 from ichEben/masterVincent Petry2014-03-101-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | only initialise upload dropZone if public upload is allowedIchEben2014-03-071-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #7624 from owncloud/enc-encryptedusedspacefixVincent Petry2014-03-105-2/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return unencrypted_size of folder when queriedVincent Petry2014-03-074-0/+48
| * | | | | | | | | | Propagate unencrypted_size up to the file cache rootVincent Petry2014-03-071-2/+7
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7628 from owncloud/fileinfo-typeThomas Tanghus2014-03-092-4/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Check if value exists before returningRobin Appelman2014-03-071-2/+5
| * | | | | | | | | | Fix FileInfo->getType errorsRobin Appelman2014-03-072-2/+9
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7567 from owncloud/apps-scroll-settingsJan-Christoph Borchardt2014-03-091-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | restrict height of settings and make scrollableJan-Christoph Borchardt2014-03-051-0/+3
* | | | | | | | | | Merge pull request #7529 from owncloud/getlocalfile-cacheicewind19912014-03-072-101/+116
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add caching for getLocalFile on remote storagesRobin Appelman2014-03-042-101/+116
* | | | | | | | | | | Merge pull request #7583 from owncloud/trusteddomainerrorpageVincent Petry2014-03-073-17/+214
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixed X-Forwarded-Host parsingVincent Petry2014-03-061-1/+2
| * | | | | | | | | | Added unit tests for serverHost and other related functionsVincent Petry2014-03-061-0/+137
| * | | | | | | | | | Added localhost as trusted domainVincent Petry2014-03-061-0/+5
| * | | | | | | | | | Show warning page when accessing server from an untrusted domainVincent Petry2014-03-062-16/+70
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-064-500/+641
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed upload issue when free space is not knownVincent Petry2014-03-062-2/+4
| * | | | | | | | | | Added unit tests for "add()" method for file uploadVincent Petry2014-03-062-499/+631
| * | | | | | | | | | Added testArea for JS Unit testsVincent Petry2014-03-061-0/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fixVincent Petry2014-03-061-4/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix imagerotate and move loadFromBase64() one up.kondou2014-02-121-4/+3
* | | | | | | | | | Revert "adding new javascript function OC.generateUrl(url, params)"Morris Jobke2014-03-061-24/+0
* | | | | | | | | | Merge pull request #7579 from owncloud/introduce-generateUrl-masterMorris Jobke2014-03-062-0/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | adding js unit tests for OC.generateUrl()Thomas Müller2014-03-061-0/+9
| * | | | | | | | | | adding new javascript function OC.generateUrl(url, params)Thomas Müller2014-03-061-0/+24
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7494 from owncloud/fix-7307Vincent Petry2014-03-0617-179/+82
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'master' into fix-7307Thomas Müller2014-03-0647-229/+480
| |\| | | | | | | | |
| * | | | | | | | | | Removed obsolete OC.Router stubs in specHelperVincent Petry2014-03-051-10/+0
| * | | | | | | | | | fixing js unit testsThomas Müller2014-03-053-11/+5
| * | | | | | | | | | remove OC.Router.registerLoadedCallback()Thomas Müller2014-03-021-3/+1
| * | | | | | | | | | fixing download url in files appThomas Müller2014-03-021-1/+1
| * | | | | | | | | | adding JSDoc + remove unused functionThomas Müller2014-03-021-5/+8
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 08:07:39 +0000