summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-132-0/+77
* finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-131-2/+4
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-131-0/+6
* Merge pull request #6632 from eduardosan/masterVincent Petry2014-03-121-3/+17
|\
| * Remove unused spaceseduardo2014-01-081-2/+2
| * Remove name from codeeduardo2014-01-081-2/+0
| * Add tabs to conformance with owncloud code standardseduardo2014-01-051-4/+4
| * Fix PostgreSQL port configuration on installeduardo2014-01-041-3/+19
* | Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptionsVincent Petry2014-03-121-3/+30
|\ \
| * | fixing method namesThomas Müller2014-03-121-1/+1
| * | set content-type on ocs exceptionsThomas Müller2014-03-121-3/+30
* | | Merge pull request #7682 from owncloud/sanitize-fallbackid-masterLukas Reschke2014-03-121-1/+2
|\ \ \
| * | | sanitize fallbackIdThomas Müller2014-03-121-1/+2
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-03-1245-1/+99
|/ /
* | Merge pull request #7665 from owncloud/fix_ocs_share_api_pathsBjörn Schießle2014-03-111-2/+7
|\ \
| * | 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 quotaVincent Petry2014-03-102-1/+17
* | | | Merge pull request #7659 from owncloud/fix-7596Vincent Petry2014-03-112-14/+14
|\ \ \ \
| * | | | remove magic handling of recipient lists by exploding the string - this funct...Thomas Müller2014-03-101-4/+1
| * | | | 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 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
|\ \ \ \
| * | | | 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
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |