summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Added localhost as trusted domainVincent Petry2014-03-061-0/+5
| * | | | | | Show warning page when accessing server from an untrusted domainVincent Petry2014-03-061-16/+54
| | |/ / / / | |/| | | |
* | | | | | 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-061-24/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix-7307Thomas Müller2014-03-0614-141/+190
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-021-24/+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
|/ / / / / / / /
* | / / / / / / Fix some docstrings in l10n.phpkondou2014-03-011-13/+15
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #7444 from owncloud/fix/7443Thomas Müller2014-02-282-23/+9
|\ \ \ \ \ \ \
| * | | | | | | add BMP mimetype for BMP previewsMorris Jobke2014-02-271-0/+1
| * | | | | | | remove unused code and fix wrong variable names - some PHPDoc updatedThomas Müller2014-02-261-23/+8
| |/ / / / / /
* | | | | | | Merge pull request #7471 from owncloud/fix-css-loadingMorris Jobke2014-02-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | CSS is now loaded directly instead via PHPLukas Reschke2014-02-281-1/+1
* | | | | | | | Merge pull request #7455 from owncloud/rawlist-fileinfoicewind19912014-02-281-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update rawlist to work with new fileinfo objectRobin Appelman2014-02-271-1/+1
| |/ / / / / /
* / / / / / / Also quote old column name during DB migrationVincent Petry2014-02-271-0/+3
|/ / / / / /
* | | | | | Merge pull request #7279 from owncloud/folderid-reuseicewind19912014-02-262-2/+13
|\ \ \ \ \ \
| * | | | | | Remove fileid parameter for getFolderContentRobin Appelman2014-02-211-5/+2
| * | | | | | Split getFolderContentByIdRobin Appelman2014-02-211-0/+10
| * | | | | | Merge branch 'master' into folderid-reuseRobin Appelman2014-02-2159-146/+470
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Reuse the folder id in View->getFolderContentsRobin Appelman2014-02-192-4/+8
* | | | | | | Merge pull request #7399 from owncloud/themable-doc-linksJan-Christoph Borchardt2014-02-262-1/+8
|\ \ \ \ \ \ \
| * | | | | | | introduce new theme function to allow full creation of documentation links: b...Thomas Müller2014-02-252-1/+8
* | | | | | | | Merge pull request #7328 from owncloud/McNetic-zipstreamerVincent Petry2014-02-261-112/+101
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into McNetic-zipstreamerThomas Müller2014-02-2410-206/+136
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into McNetic-zipstreamerThomas Müller2014-02-219-75/+123
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into M...Thomas Müller2014-02-201-112/+101
| |\ \ \ \ \ \ \ \