Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Increase version to trigger upgrade related to .ocdata | Vincent Petry | 2014-03-17 | 1 | -1/+1 |
| | |||||
* | Return 503 when a config/data dir error exists | Vincent Petry | 2014-03-14 | 2 | -0/+5 |
| | |||||
* | Added .ocdata file to check for data folder validity | Vincent Petry | 2014-03-14 | 5 | -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_predelete | Vincent Petry | 2014-03-12 | 1 | -1/+4 |
|\ | | | | | add preDelete hook for files_versions app | ||||
| * | add preDelete hook for files_versions app | Georg Ehrke | 2014-03-11 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #7668 from owncloud/trashbin_predelete | Vincent Petry | 2014-03-12 | 1 | -0/+1 |
|\ \ | | | | | | | add preDelete hook for files_trashbin app | ||||
| * | | add preDelete hook for files_trashbin app | Georg Ehrke | 2014-03-11 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #7695 from owncloud/fix-3rdparty-master | Thomas Müller | 2014-03-12 | 1 | -0/+0 |
|\ \ | | | | | | | Re-add submodule 3rdparty | ||||
| * | | Re-add submodule 3rdparty | Thomas Müller | 2014-03-12 | 1 | -0/+0 |
|/ / | |||||
* | | Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptions | Vincent Petry | 2014-03-12 | 2 | -3/+32 |
|\ \ | | | | | | | set content-type on ocs exceptions | ||||
| * | | fixing method names | Thomas Müller | 2014-03-12 | 2 | -2/+1 |
| | | | |||||
| * | | set content-type on ocs exceptions | Thomas Müller | 2014-03-12 | 2 | -3/+33 |
| | | | |||||
* | | | Merge pull request #7682 from owncloud/sanitize-fallbackid-master | Lukas Reschke | 2014-03-12 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | sanitize fallbackId | ||||
| * | | | sanitize fallbackId | Thomas Müller | 2014-03-12 | 1 | -1/+2 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-12 | 755 | -3221/+4388 |
|/ / | |||||
* | | Merge pull request #7674 from owncloud/fix-spelling-master | Thomas Müller | 2014-03-11 | 2 | -2/+2 |
|\ \ | | | | | | | Authentification -> Authentication | ||||
| * | | Authentification -> Authentication | Thomas Müller | 2014-03-11 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #7665 from owncloud/fix_ocs_share_api_paths | Björn Schießle | 2014-03-11 | 3 | -10/+208 |
|\ \ \ | |/ / |/| | | Fix ocs share api paths | ||||
| * | | add 'received_from' info to the share, so that every share can have a ↵ | Bjoern Schiessle | 2014-03-11 | 1 | -2/+4 |
| | | | | | | | | | | | | different value | ||||
| * | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-11 | 2 | -8/+204 |
| | | | |||||
* | | | Fix 3rdparty submodule after transifex sync broke it | Thomas Müller | 2014-03-11 | 1 | -0/+0 |
| |/ |/| | |||||
* | | Merge pull request #7650 from owncloud/quota-totalspace | Vincent Petry | 2014-03-11 | 3 | -1/+130 |
|\ \ | | | | | | | Fixed total space display when data size exceeds quota | ||||
| * | | Fixed total space display when data size exceeds quota | Vincent Petry | 2014-03-10 | 3 | -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_remove | Vincent Petry | 2014-03-11 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Add OC.localStorage.removeItem() | ||||
| * | | | Fix copy/paste error | Thomas Tanghus | 2014-03-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add function remove() to OC.localeStorage | Thomas Tanghus | 2014-03-10 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #7659 from owncloud/fix-7596 | Vincent Petry | 2014-03-11 | 3 | -16/+23 |
|\ \ \ \ | | | | | | | | | | | Fix 7596 | ||||
| * | | | | remove magic handling of recipient lists by exploding the string - this ↵ | Thomas Müller | 2014-03-10 | 1 | -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 recipient | Thomas Müller | 2014-03-10 | 2 | -12/+22 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-11 | 1385 | -47907/+77241 |
| | | | | | |||||
* | | | | | Changing host after transifex client update on server | Thomas Müller | 2014-03-10 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #7602 from owncloud/flush-updater-cache | Vincent Petry | 2014-03-10 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Reset time of last update feed polling after successful update | ||||
| * | | | | Reset time of last update feed polling | Victor Dubiniuk | 2014-03-06 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #7656 from owncloud/xml-entityfixes | Lukas Reschke | 2014-03-10 | 2 | -4/+14 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Disable XML entities when parsing XML | ||||
| * | | | | Disable XML entities when parsing XML | Vincent Petry | 2014-03-10 | 2 | -4/+14 |
|/ / / / | |||||
* | | | | Merge pull request #7600 from ideaship/fix_escaped_html | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | fix: use print_escaped for radio button "checked" | ||||
| * | | | | fix: use print_escaped for radio button "checked" | ideaship | 2014-03-06 | 1 | -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_unshare | Thomas Müller | 2014-03-10 | 2 | -7/+40 |
|\ \ \ \ \ | | | | | | | | | | | | | we need the file_source to delete a share successfully | ||||
| * | | | | | we need the file_source to delete a share successfully | Bjoern Schiessle | 2014-03-10 | 2 | -7/+40 |
| | | | | | | |||||
* | | | | | | Merge pull request #7398 from owncloud/trash_dont_rely_on_db | Vincent Petry | 2014-03-10 | 8 | -151/+79 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | [trash] fall back if file is not in db | ||||
| * | | | | | fix mimetype detection, introduce fake etag to identify preview images | Bjoern Schiessle | 2014-03-10 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | get trash size from file cache | Bjoern Schiessle | 2014-03-10 | 5 | -78/+11 |
| | | | | | | |||||
| * | | | | | only enable previews if the encryption is disabled | Bjoern Schiessle | 2014-03-10 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | if file is not in db, fall back to restore file to the users root | Bjoern Schiessle | 2014-03-10 | 4 | -72/+62 |
| | | | | | | |||||
* | | | | | | Merge pull request #7632 from owncloud/fix-7582-master | Thomas Müller | 2014-03-10 | 1 | -11/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | we first shall check if the current session is valid - otherwise the ses... | ||||
| * | | | | | | fixing ident | Thomas Müller | 2014-03-07 | 1 | -9/+9 |
| | | | | | | | |||||
| * | | | | | | we first shall check if the current session is valid - otherwise the ↵ | Thomas Müller | 2014-03-07 | 1 | -12/+13 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | session-id will be regenerated on login via basic auth | ||||
* | | | | | | Merge pull request #7629 from owncloud/files-allfileswarningtypo | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed log warning when deleting a single file | ||||
| * | | | | | | Fixed log warning when deleting a single file | Vincent Petry | 2014-03-07 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #7631 from ichEben/master | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422 |