summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Increase version to trigger upgrade related to .ocdataVincent Petry2014-03-171-1/+1
|
* Return 503 when a config/data dir error existsVincent Petry2014-03-142-0/+5
|
* Added .ocdata file to check for data folder validityVincent Petry2014-03-145-4/+146
| | | | | | | | In environments where the data folder is mount from another partition, it is important to check that the data folder we see is actually the real one. If the mount failed for some reasons, this fix will make ownCloud temporarily unavailable instead of causing unpredictable behavior.
* Merge pull request #7669 from owncloud/versions_predeleteVincent Petry2014-03-121-1/+4
|\ | | | | add preDelete hook for files_versions app
| * add preDelete hook for files_versions appGeorg Ehrke2014-03-111-1/+4
| |
* | Merge pull request #7668 from owncloud/trashbin_predeleteVincent Petry2014-03-121-0/+1
|\ \ | | | | | | add preDelete hook for files_trashbin app
| * | add preDelete hook for files_trashbin appGeorg Ehrke2014-03-111-0/+1
| |/
* | Merge pull request #7695 from owncloud/fix-3rdparty-masterThomas Müller2014-03-121-0/+0
|\ \ | | | | | | Re-add submodule 3rdparty
| * | Re-add submodule 3rdpartyThomas Müller2014-03-121-0/+0
|/ /
* | Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptionsVincent Petry2014-03-122-3/+32
|\ \ | | | | | | set content-type on ocs exceptions
| * | fixing method namesThomas Müller2014-03-122-2/+1
| | |
| * | set content-type on ocs exceptionsThomas Müller2014-03-122-3/+33
| | |
* | | Merge pull request #7682 from owncloud/sanitize-fallbackid-masterLukas Reschke2014-03-121-1/+2
|\ \ \ | | | | | | | | sanitize fallbackId
| * | | sanitize fallbackIdThomas Müller2014-03-121-1/+2
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-03-12755-3221/+4388
|/ /
* | Merge pull request #7674 from owncloud/fix-spelling-masterThomas Müller2014-03-112-2/+2
|\ \ | | | | | | Authentification -> Authentication
| * | Authentification -> AuthenticationThomas Müller2014-03-112-2/+2
| | |
* | | Merge pull request #7665 from owncloud/fix_ocs_share_api_pathsBjörn Schießle2014-03-113-10/+208
|\ \ \ | |/ / |/| | Fix ocs share api paths
| * | add 'received_from' info to the share, so that every share can have a ↵Bjoern Schiessle2014-03-111-2/+4
| | | | | | | | | | | | different value
| * | fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-112-8/+204
| | |
* | | Fix 3rdparty submodule after transifex sync broke itThomas Müller2014-03-111-0/+0
| |/ |/|
* | Merge pull request #7650 from owncloud/quota-totalspaceVincent Petry2014-03-113-1/+130
|\ \ | | | | | | Fixed total space display when data size exceeds quota
| * | Fixed total space display when data size exceeds quotaVincent Petry2014-03-103-1/+130
| | | | | | | | | | | | | | | 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 #7652 from owncloud/localStorage_removeVincent Petry2014-03-111-0/+3
|\ \ \ | | | | | | | | Add OC.localStorage.removeItem()
| * | | Fix copy/paste errorThomas Tanghus2014-03-101-1/+1
| | | |
| * | | Add function remove() to OC.localeStorageThomas Tanghus2014-03-101-0/+3
| | | |
* | | | Merge pull request #7659 from owncloud/fix-7596Vincent Petry2014-03-113-16/+23
|\ \ \ \ | | | | | | | | | | 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-102-12/+22
| | | | |
* | | | | [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