Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 | ||||
| * | Only encode dangerous dangerous characters | Lukas Reschke | 2014-04-11 | 1 | -1/+1 |
|/ | | | | | There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded. This may fix issues like https://github.com/owncloud/calendar/pull/394 | ||||
* | Merge pull request #7807 from sarciszewski/patch-1 | Lukas Reschke | 2014-04-11 | 1 | -2/+2 |
|\ | | | | | Update crypt.php | ||||
| * | Update crypt.php | Scott Arciszewski | 2014-03-24 | 1 | -2/+2 |
| | | | | | | Use a 256-bit random value | ||||
| * | Update crypt.php | Scott Arciszewski | 2014-03-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit? Also, 183 bytes = 1464 bits. Here's a safe alternative: 2048 bits, with comment-code sanity | ||||
* | | Merge pull request #8069 from ↵ | Björn Schießle | 2014-04-11 | 3 | -7/+8 |
|\ \ | | | | | | | | | | | | | owncloud/fix-localization-issues-with-file-encrypt-app Fix some localization issues with file encryption/decryption strings | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | introduce auto completion on share email - integrated with the contactsm... | ||||
| * | | | 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 ↵ | Thomas Müller | 2013-11-14 | 2 | -0/+44 |
| | | | | | | | | | | | | | | | | contactsmanager api | ||||
* | | | | Merge pull request #8076 from owncloud/enable-dav-browser | Lukas Reschke | 2014-04-10 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Re-enable the sabredav browser plugin to fix sync client setup | ||||
| * | | | | 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 to... | ||||
| * | | | | | register middleware as string to not force request to be instantiated too ↵ | Bernhard Posselt | 2014-04-09 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | early and thus not having url parameters | ||||
* | | | | | | 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 | ||||
| * | | | | | | Fixed Sabre Node implementation to correctly return timestamps as int | Vincent Petry | 2014-04-09 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Negative timestamps were returned as string and were confusing other Sabre API like Sabre_DAV_Property_GetLastModified. This fix makes sure the timestamp is returned as int when defined. | ||||
* | | | | | | | Merge pull request #8112 from owncloud/karma-enableautowatch | Thomas Müller | 2014-04-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Enable autowatch for karma | ||||
| * | | | | | | | Enable autowatch for karma | Vincent Petry | 2014-04-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way unit tests can be run in multiple browsers with the command line and tests will re-run automatically when files are changed. | ||||
* | | | | | | | | Merge pull request #8137 from owncloud/routeing-requirements | Thomas Müller | 2014-04-10 | 2 | -5/+31 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add requirements to routing | ||||
| * | | | | | | | | 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... | ||||
| * | | | | | | | | To isolate the variable scope used inside the $file it is required in it's ↵ | Thomas Müller | 2014-04-09 | 1 | -1/+9 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | own method | ||||
* | | | | | | | | Merge pull request #8027 from owncloud/routes-ocs | Tom Needham | 2014-04-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Load all routes when matching an ocs route | ||||
| * | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | OC_OCS_Result Class, Only accept 100 code as success | ||||
| * | | | | | | | | | 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 streams when generating hashes of remote files | ||||
| * | | | | | | | | | | 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 | ||||
| * | | | | | | | | | | | 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() | ||||
| * | | | | | | | | | | | 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 | ||||
| * | | | | | | | | | | Fix Undefined index: storage in share.php | Joas Schilling | 2014-04-09 | 1 | -1/+1 |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There parameter was removed when the code was cleaned up: {"app":"PHP","message":"Undefined index: storage at E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160", "level":0,"time":"2014-04-09T12:56:23+00:00"} | ||||
* | | | | | | | | | | Merge pull request #8049 from owncloud/filepickersvg | Morris Jobke | 2014-04-09 | 6 | -56/+120 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix file picker SVG issues | ||||
| * | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moved code that replaces the "svg" extension for the given file to core as OC.Util.replaceSVGIcon. - Added unit test for OC.Util.replaceSVGIcon - Moved "replaceSVG" to OC.Util.replaceSVG and deprecated the global "replaceSVG" function. - Added alias for SVGSupport() as OC.Util.hasSVGSupport() (for now) | ||||
* | | | | | | | | | | | Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js | Vincent Petry | 2014-04-09 | 1 | -5/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | remove obsolete code | ||||
| * | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | LDAP: fix determining objectclasses takes long | ||||
| * | | | | | | | | | | | add comment to clearify when a skip in the foreach happens | Arthur Schiwon | 2014-04-09 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | define var | Arthur Schiwon | 2014-03-21 | 1 | -0/+1 |
| | | | | | | | | | | | |