summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-111385-47907/+77241
|
* Changing host after transifex client update on serverThomas Müller2014-03-101-1/+1
|
* Merge pull request #7602 from owncloud/flush-updater-cacheVincent Petry2014-03-101-0/+2
|\ | | | | Reset time of last update feed polling after successful update
| * Reset time of last update feed pollingVictor Dubiniuk2014-03-061-0/+2
| |
* | Merge pull request #7656 from owncloud/xml-entityfixesLukas Reschke2014-03-102-4/+14
|\ \ | | | | | | Disable XML entities when parsing XML
| * | 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"
| * | fix: use print_escaped for radio button "checked"ideaship2014-03-061-1/+1
| | | | | | | | | | | | | | | use of p() results in escaped HTML code: checked="checked" where it should be: checked="checked"
* | | 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 successfully
| * | | 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
|\ \ \ \ | | | | | | | | | | [trash] fall back if file is not in db
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | we first shall check if the current session is valid - otherwise the ses...
| * | | | | fixing identThomas Müller2014-03-071-9/+9
| | | | | |
| * | | | | we first shall check if the current session is valid - otherwise the ↵Thomas Müller2014-03-071-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | session-id will be regenerated on login via basic auth
* | | | | | Merge pull request #7629 from owncloud/files-allfileswarningtypoVincent Petry2014-03-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed log warning when deleting a single file
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | [6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | [master] Fixed used space to be based on unencrypted size
| * | | | | | Return unencrypted_size of folder when queriedVincent Petry2014-03-074-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the "used space" to be based on the unencrypted size, not encrypted size, to be consistent with how quota/space is handled when encryption is enabled
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix FileInfo->getType errors
| * | | | | | 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 scrollable
| * | | | | 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 storages
| * | | | | | Add caching for getLocalFile on remote storagesRobin Appelman2014-03-042-101/+116
| | | | | | |
* | | | | | | Merge pull request #7583 from owncloud/trusteddomainerrorpageVincent Petry2014-03-073-17/+214
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | [master] Show warning page when accessing server from an untrusted domain
| * | | | | | 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
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Added early check for the requested domain host and show a warning page if the domain is not trusted.
* | | | | | Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-064-500/+641
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed upload issue when free space is not known (ex: FTP)
| * | | | | | 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 OC.Upload.init() to make the code testable - Added unit tests for the add() method of the uploader with some error cases
| * | | | | | Added testArea for JS Unit testsVincent Petry2014-03-061-0/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a testArea that is outside the viewport but still considered as visible from the jQuery code. The testArea is useful when: - tested code tries to access DOM elements using global ids - tested code is requiring some UI elements to be visible to activate themselves
* | | | | | Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fixVincent Petry2014-03-061-4/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix imagerotate and move loadFromBase64() one up
| * | | | | Fix imagerotate and move loadFromBase64() one up.kondou2014-02-121-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imagerotate() with third parameter being -1 does not seem to work in PHP 5.5 loadFromBase64() one up, so debug-logs aren't spammed (as much) with urlencoded base64-data from loadFromFile() debug output.
* | | | | | Revert "adding new javascript function OC.generateUrl(url, params)"Morris Jobke2014-03-061-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8e667d1934d6bd9b4344ac624fdd2846c89abb0a.
* | | | | | Merge pull request #7579 from owncloud/introduce-generateUrl-masterMorris Jobke2014-03-062-0/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | Introduce OC.generateUrl() in master
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Replace OC.Router.generate() with OC.generateUrl()
| * | | | | | Merge branch 'master' into fix-7307Thomas Müller2014-03-0647-229/+480
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js
| * | | | | | Removed obsolete OC.Router stubs in specHelperVincent Petry2014-03-051-10/+0
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 20:15:49 +0000