Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix contribute link | Volkan Gezer | 2014-04-12 | 1 | -1/+1 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-12 | 257 | -3226/+4581 |
* | Merge pull request #8168 from owncloud/only-encode-dangerous-char | Lukas Reschke | 2014-04-11 | 1 | -1/+1 |
|\ | |||||
| * | Only encode dangerous dangerous characters | Lukas Reschke | 2014-04-11 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #7807 from sarciszewski/patch-1 | Lukas Reschke | 2014-04-11 | 1 | -2/+2 |
|\ | |||||
| * | Update crypt.php | Scott Arciszewski | 2014-03-24 | 1 | -2/+2 |
| * | Update crypt.php | Scott Arciszewski | 2014-03-19 | 1 | -2/+2 |
* | | Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encr... | Björn Schießle | 2014-04-11 | 3 | -7/+8 |
|\ \ | |||||
| * | | Fix some localization issues with file encryption/decription strings | Volkan Gezer | 2014-04-05 | 3 | -7/+8 |
* | | | Typo fix. | Volkan Gezer | 2014-04-11 | 1 | -1/+1 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-11 | 42 | -250/+281 |
* | | | Merge pull request #5857 from owncloud/type-ahead-share-by-mail-master | Thomas Müller | 2014-04-11 | 2 | -0/+48 |
|\ \ \ | |||||
| * | | | Fix copy/paste error :P | Thomas Tanghus | 2014-03-25 | 1 | -1/+1 |
| * | | | 'ID' => 'id' and check existence of EMAIL | Thomas Tanghus | 2014-03-25 | 1 | -1/+5 |
| * | | | introduce auto completion on share email - integrated with the contactsmanage... | Thomas Müller | 2013-11-14 | 2 | -0/+44 |
* | | | | Merge pull request #8076 from owncloud/enable-dav-browser | Lukas Reschke | 2014-04-10 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Re-enable the sabredav browser plugin | Robin Appelman | 2014-04-06 | 1 | -0/+1 |
* | | | | | Merge pull request #8139 from owncloud/fix-middleware-registration | Bernhard Posselt | 2014-04-10 | 2 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | register middleware as string to not force request to be instantiated too ear... | Bernhard Posselt | 2014-04-09 | 2 | -5/+5 |
* | | | | | | Merge pull request #8107 from owncloud/dav-negativetimestampfix | Thomas Müller | 2014-04-10 | 1 | -3/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed Sabre Node implementation to correctly return timestamps as int | Vincent Petry | 2014-04-09 | 1 | -3/+6 |
* | | | | | | | Merge pull request #8112 from owncloud/karma-enableautowatch | Thomas Müller | 2014-04-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Enable autowatch for karma | Vincent Petry | 2014-04-08 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #8137 from owncloud/routeing-requirements | Thomas Müller | 2014-04-10 | 2 | -5/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add requirements to routing | Bernhard Posselt | 2014-04-09 | 2 | -5/+31 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #8138 from owncloud/allow-app-in-routes.php | Thomas Müller | 2014-04-10 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | To isolate the variable scope used inside the $file it is required in it's ow... | Thomas Müller | 2014-04-09 | 1 | -1/+9 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #8027 from owncloud/routes-ocs | Tom Needham | 2014-04-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Load all routes when matching an ocs route | Robin Appelman | 2014-04-03 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #8018 from owncloud/ocs_result_success_is_100 | Vincent Petry | 2014-04-10 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix test case for api response code | tomneedham | 2014-04-03 | 1 | -1/+1 |
| * | | | | | | | | | Only accept success as 100 like the OCS spec does | tomneedham | 2014-04-02 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #7825 from owncloud/hash-stream | Vincent Petry | 2014-04-10 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | use binary safe read | Robin Appelman | 2014-04-02 | 1 | -1/+1 |
| * | | | | | | | | | | Use streams when generating hashes of remote files | Robin Appelman | 2014-04-02 | 1 | -3/+5 |
* | | | | | | | | | | | Merge pull request #8053 from owncloud/preview-hook-root | Vincent Petry | 2014-04-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Pass the correct root to the preview on post_write | Robin Appelman | 2014-04-04 | 1 | -1/+1 |
* | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-10 | 193 | -2422/+2616 |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #8129 from owncloud/core-svgsupport | Thomas Tanghus | 2014-04-09 | 2 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Moved SVGSupport call to use OC.Util.SVGSupport() | Vincent Petry | 2014-04-09 | 2 | -6/+6 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #8128 from owncloud/fix/undefined-index-storage | Joas Schilling | 2014-04-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix Undefined index: storage in share.php | Joas Schilling | 2014-04-09 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #8049 from owncloud/filepickersvg | Morris Jobke | 2014-04-09 | 6 | -56/+120 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix SVG close button of file picker | Vincent Petry | 2014-04-04 | 1 | -0/+5 |
| * | | | | | | | | | | Fix file picker to correctly show SVG file icons | Vincent Petry | 2014-04-04 | 1 | -1/+6 |
| * | | | | | | | | | | Moved code to replace svg with png to OC.Util | Vincent Petry | 2014-04-04 | 5 | -55/+109 |
* | | | | | | | | | | | Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js | Vincent Petry | 2014-04-09 | 1 | -5/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | remove obsolete code | Jörn Friedrich Dreyer | 2014-04-09 | 1 | -5/+0 |
* | | | | | | | | | | | | Merge pull request #7837 from owncloud/fix_7530 | blizzz | 2014-04-09 | 2 | -7/+237 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | add comment to clearify when a skip in the foreach happens | Arthur Schiwon | 2014-04-09 | 1 | -0/+1 |