summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-12257-3226/+4581
|
* Merge pull request #8168 from owncloud/only-encode-dangerous-charLukas Reschke2014-04-111-1/+1
|\ | | | | Only encode dangerous dangerous characters
| * Only encode dangerous dangerous charactersLukas Reschke2014-04-111-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-1Lukas Reschke2014-04-111-2/+2
|\ | | | | Update crypt.php
| * Update crypt.phpScott Arciszewski2014-03-241-2/+2
| | | | | | Use a 256-bit random value
| * Update crypt.phpScott Arciszewski2014-03-191-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ßle2014-04-113-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 stringsVolkan Gezer2014-04-053-7/+8
| | |
* | | Typo fix.Volkan Gezer2014-04-111-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1142-250/+281
| | |
* | | Merge pull request #5857 from owncloud/type-ahead-share-by-mail-masterThomas Müller2014-04-112-0/+48
|\ \ \ | | | | | | | | introduce auto completion on share email - integrated with the contactsm...
| * | | Fix copy/paste error :PThomas Tanghus2014-03-251-1/+1
| | | |
| * | | 'ID' => 'id' and check existence of EMAILThomas Tanghus2014-03-251-1/+5
| | | |
| * | | introduce auto completion on share email - integrated with the ↵Thomas Müller2013-11-142-0/+44
| | | | | | | | | | | | | | | | contactsmanager api
* | | | Merge pull request #8076 from owncloud/enable-dav-browserLukas Reschke2014-04-101-0/+1
|\ \ \ \ | | | | | | | | | | Re-enable the sabredav browser plugin to fix sync client setup
| * | | | Re-enable the sabredav browser pluginRobin Appelman2014-04-061-0/+1
| | | | |
* | | | | Merge pull request #8139 from owncloud/fix-middleware-registrationBernhard Posselt2014-04-102-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 Posselt2014-04-092-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | early and thus not having url parameters
* | | | | | Merge pull request #8107 from owncloud/dav-negativetimestampfixThomas Müller2014-04-101-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed Sabre Node implementation to correctly return timestamps as int
| * | | | | | Fixed Sabre Node implementation to correctly return timestamps as intVincent Petry2014-04-091-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-enableautowatchThomas Müller2014-04-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Enable autowatch for karma
| * | | | | | | Enable autowatch for karmaVincent Petry2014-04-081-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-requirementsThomas Müller2014-04-102-5/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add requirements to routing
| * | | | | | | | add requirements to routingBernhard Posselt2014-04-092-5/+31
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #8138 from owncloud/allow-app-in-routes.phpThomas Müller2014-04-101-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üller2014-04-091-1/+9
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | own method
* | | | | | | | Merge pull request #8027 from owncloud/routes-ocsTom Needham2014-04-101-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Load all routes when matching an ocs route
| * | | | | | | | Load all routes when matching an ocs routeRobin Appelman2014-04-031-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #8018 from owncloud/ocs_result_success_is_100Vincent Petry2014-04-102-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | OC_OCS_Result Class, Only accept 100 code as success
| * | | | | | | | | Fix test case for api response codetomneedham2014-04-031-1/+1
| | | | | | | | | |
| * | | | | | | | | Only accept success as 100 like the OCS spec doestomneedham2014-04-021-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #7825 from owncloud/hash-streamVincent Petry2014-04-101-3/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use streams when generating hashes of remote files
| * | | | | | | | | | use binary safe readRobin Appelman2014-04-021-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Use streams when generating hashes of remote filesRobin Appelman2014-04-021-3/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #8053 from owncloud/preview-hook-rootVincent Petry2014-04-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pass the correct root to the preview on post_write
| * | | | | | | | | | | Pass the correct root to the preview on post_writeRobin Appelman2014-04-041-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-10193-2422/+2616
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #8129 from owncloud/core-svgsupportThomas Tanghus2014-04-092-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Moved SVGSupport call to use OC.Util.SVGSupport()
| * | | | | | | | | | | Moved SVGSupport call to use OC.Util.SVGSupport()Vincent Petry2014-04-092-6/+6
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #8128 from owncloud/fix/undefined-index-storageJoas Schilling2014-04-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Fix Undefined index: storage in share.php
| * | | | | | | | | | Fix Undefined index: storage in share.phpJoas Schilling2014-04-091-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/filepickersvgMorris Jobke2014-04-096-56/+120
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix file picker SVG issues
| * | | | | | | | | | Fix SVG close button of file pickerVincent Petry2014-04-041-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Fix file picker to correctly show SVG file iconsVincent Petry2014-04-041-1/+6
| | | | | | | | | | |
| * | | | | | | | | | Moved code to replace svg with png to OC.UtilVincent Petry2014-04-045-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_jsVincent Petry2014-04-091-5/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | remove obsolete code
| * | | | | | | | | | | remove obsolete codeJörn Friedrich Dreyer2014-04-091-5/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #7837 from owncloud/fix_7530blizzz2014-04-092-7/+237
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | LDAP: fix determining objectclasses takes long
| * | | | | | | | | | | add comment to clearify when a skip in the foreach happensArthur Schiwon2014-04-091-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | define varArthur Schiwon2014-03-211-0/+1
| | | | | | | | | | | |