summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7665 from owncloud/fix_ocs_share_api_pathsBjörn Schießle2014-03-111-2/+7
|\ | | | | Fix ocs share api paths
| * fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-111-2/+7
| |
* | Merge pull request #7650 from owncloud/quota-totalspaceVincent Petry2014-03-112-1/+17
|\ \ | | | | | | Fixed total space display when data size exceeds quota
| * | Fixed total space display when data size exceeds quotaVincent Petry2014-03-102-1/+17
| | | | | | | | | | | | | | | The total space display in the personal page now shows the quota value instead of used space when used space exceeds the quota (soft quota).
* | | Merge pull request #7659 from owncloud/fix-7596Vincent Petry2014-03-112-14/+14
|\ \ \ | | | | | | | | Fix 7596
| * | | remove magic handling of recipient lists by exploding the string - this ↵Thomas Müller2014-03-101-4/+1
| | | | | | | | | | | | | | | | functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname
| * | | send an individual email to each recipientThomas Müller2014-03-101-10/+13
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1153-279/+159
|/ / /
* | | 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
| | | |
* | | | Disable XML entities when parsing XMLVincent Petry2014-03-102-4/+14
| |_|/ |/| |
* | | Merge pull request #7398 from owncloud/trash_dont_rely_on_dbVincent Petry2014-03-101-1/+1
|\ \ \ | | | | | | | | [trash] fall back if file is not in db
| * | | get trash size from file cacheBjoern Schiessle2014-03-101-1/+1
| | | |
* | | | 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 #7624 from owncloud/enc-encryptedusedspacefixVincent Petry2014-03-102-2/+12
|\ \ \ \ | | | | | | | | | | [master] Fixed used space to be based on unencrypted size
| * | | | Return unencrypted_size of folder when queriedVincent Petry2014-03-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #7529 from owncloud/getlocalfile-cacheicewind19912014-03-071-2/+22
|\ \ \ \ \ | | | | | | | | | | | | Add caching for getLocalFile on remote storages
| * | | | | Add caching for getLocalFile on remote storagesRobin Appelman2014-03-041-2/+22
| | | | | |
* | | | | | Merge pull request #7583 from owncloud/trusteddomainerrorpageVincent Petry2014-03-072-17/+77
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [master] Show warning page when accessing server from an untrusted domain
| * | | | | Fixed X-Forwarded-Host parsingVincent Petry2014-03-061-1/+2
| | | | | |
| * | | | | 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-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed upload issue when free space is not known (ex: FTP)
| * | | | | Fixed upload issue when free space is not knownVincent Petry2014-03-061-1/+1
| |/ / / /
* | | | | 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.
* | | | | Merge pull request #7494 from owncloud/fix-7307Vincent Petry2014-03-062-25/+0
|\ \ \ \ \ | | | | | | | | | | | | Replace OC.Router.generate() with OC.generateUrl()
| * \ \ \ \ Merge branch 'master' into fix-7307Thomas Müller2014-03-0615-142/+192
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js
| * | | | | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-022-25/+0
| | | | | |
* | | | | | fix merge conflictsGeorg Ehrke2014-03-067-8/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #7354 from pschmitt/masterLukas Reschke2014-03-054-6/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | Use 'command -v' to detect whether and where software is installed (instead of 'which')
| | * | | | | Use 'command -v' to detect whether and where software is installed (instead ↵Philipp Schmitt2014-02-214-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | of 'which')
| * | | | | | Merge pull request #7531 from owncloud/dont_create_shared_folderBjörn Schießle2014-03-052-2/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | don't allow to create a file or folder named 'Shared' in the root folder
| | * | | | | | don't allow to create a file or folder named 'Shared' in the root folder, ↵Bjoern Schiessle2014-03-052-2/+5
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | also exclude all combinations of lower and upper case letters
| * | | | | | add fclose, fixes issue from bdb96b9af85256f9b3f8663ccf6d27b3d1330918Georg Ehrke2014-03-051-0/+1
| | | | | | |
* | | | | | | fix issue with Non-static method Imagick ../..; @ doesn't seem to work in ↵Georg Ehrke2014-03-053-62/+80
|/ / / / / / | | | | | | | | | | | | | | | | | | this case
* | | | | | fix issue with spamming logging files when loading cached thumbnailGeorg Ehrke2014-03-051-1/+3
| | | | | |
* | | | | | Merge pull request #7521 from owncloud/docstrings_2_kondouThomas Müller2014-03-052-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix some more docstrings
| * | | | | | Fix some more docstringskondou2014-03-032-2/+2
| | | | | | |
* | | | | | | Merge pull request #7251 from owncloud/fix-ocsapi-getuserTom Needham2014-03-041-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add displayname for admins on external api
| * | | | | | | Return 101 if user doesnt existtomneedham2014-02-181-2/+6
| | | | | | | |
| * | | | | | | Add displayname for adminstomneedham2014-02-181-2/+10
| | | | | | | |
* | | | | | | | Merge pull request #7481 from tripflex/fix_downloadlink_spacesVincent Petry2014-03-041-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | replace spaces in download link without encoding entire URL
| * | | | | | | | move replace to inside issetMyles McNamara2014-02-281-2/+2
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 23:24:44 +0000