summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
|\ \
| * | 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 #7624 from owncloud/enc-encryptedusedspacefixVincent Petry2014-03-102-2/+12
|\ \ \
| * | | Return unencrypted_size of folder when queriedVincent Petry2014-03-071-0/+5
| * | | 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 #7529 from owncloud/getlocalfile-cacheicewind19912014-03-071-2/+22
|\ \ \ \
| * | | | Add caching for getLocalFile on remote storagesRobin Appelman2014-03-041-2/+22
* | | | | Merge pull request #7583 from owncloud/trusteddomainerrorpageVincent Petry2014-03-072-17/+77
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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
| | |/ / | |/| |
* | | | Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-061-1/+1
|\ \ \ \
| * | | | 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.kondou2014-02-121-4/+3
* | | | | Merge pull request #7494 from owncloud/fix-7307Vincent Petry2014-03-062-25/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into fix-7307Thomas Müller2014-03-0615-142/+192
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | 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 o...Philipp Schmitt2014-02-214-6/+6
| * | | | | | 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, als...Bjoern Schiessle2014-03-052-2/+5
| | | |_|_|/ / | | |/| | | |
| * | | | | | add fclose, fixes issue from bdb96b9af85256f9b3f8663ccf6d27b3d1330918Georg Ehrke2014-03-051-0/+1
* | | | | | | fix issue with Non-static method Imagick ../..; @ doesn't seem to work in thi...Georg Ehrke2014-03-053-62/+80
|/ / / / / /
* | | | | | 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 docstringskondou2014-03-032-2/+2
* | | | | | | Merge pull request #7251 from owncloud/fix-ocsapi-getuserTom Needham2014-03-041-2/+14
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | move replace to inside issetMyles McNamara2014-02-281-2/+2
| * | | | | | | | replace spaces in download link without encoding entire URLMyles McNamara2014-02-281-0/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #7453 from owncloud/preview-fileinfoVincent Petry2014-03-031-115/+126
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Cache the fileinfo in OC\PreviewRobin Appelman2014-02-271-115/+126
* | | | | | | | Merge pull request #7500 from owncloud/theme-mailtemplateFrank Karlitschek2014-03-031-0/+14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | make mail notification header color themableJan-Christoph Borchardt2014-03-031-0/+14
* | | | | | | | Allow XML entity loader for MDB2 schema loaderVincent Petry2014-03-031-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #7486 from owncloud/l10n_docstringsMorris Jobke2014-03-011-13/+15
|\ \ \ \ \ \ \
| * | | | | | | Fix some docstrings in l10n.phpkondou2014-03-011-13/+15
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #7433 from owncloud/config_basic_authThomas Tanghus2014-03-011-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Config to disable basic_auth username chackingkondou2014-02-261-1/+2
| |/ / / / /