aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove "use" statementLukas Reschke2015-08-052-4/+6
| | | | Ref https://bugs.php.net/bug.php?id=66773
* Use StringUtils::equals on CSRF token and add unit testsLukas Reschke2015-08-042-5/+99
|
* Merge pull request #18024 from owncloud/phpseclib-2.0Thomas Müller2015-08-046-25/+28
|\ | | | | Update phpseclib to 2.0 for increased PHP7 compatibility
| * Rebase upon newest masterLukas Reschke2015-08-041-0/+0
| |
| * Update phpseclib to 2.0Andreas Fischer2015-08-036-25/+28
| |
* | Merge pull request #18050 from owncloud/php7-catch-type-errorMorris Jobke2015-08-041-2/+2
|\ \ | | | | | | [PHP 7] Change type hint to also accept Errors
| * | [PHP 7] Change type hint to also accept ErrorsLukas Reschke2015-08-041-2/+2
| | | | | | | | | | | | | | | | | | PHP 7 changed the exception types and thus our error handler needs to be able to catch this. Without this in some cases just a white page is shown instead of an error message.
* | | Merge pull request #18052 from owncloud/fix-php7-SearchResultSorter-2Thomas Müller2015-08-041-7/+0
|\ \ \ | |/ / |/| | [PHP7] Remove pointless unit test
| * | Remove pointless unit testThomas Müller2015-08-041-7/+0
|/ /
* | Merge pull request #18037 from owncloud/shared-propagate-check-recipientThomas Müller2015-08-032-7/+16
|\ \ | | | | | | fix infinite loops with propagating etags on reshares
| * | fix infinite loops with propagating etags on resharesRobin Appelman2015-08-032-7/+16
|/ /
* | Merge pull request #17820 from owncloud/dav-exception-log-classMorris Jobke2015-08-031-0/+1
|\ \ | | | | | | also log the class for dav exceptions
| * | also log the class for dav exceptionsRobin Appelman2015-07-241-0/+1
| | |
* | | Merge pull request #18009 from owncloud/enc_always_update_file_cacheThomas Müller2015-08-032-8/+9
|\ \ \ | | | | | | | | let the encryption storage wrapper always update the file cache
| * | | always update file cache, the cache can handle partial data correctly if the ↵Bjoern Schiessle2015-07-312-8/+9
| | | | | | | | | | | | | | | | file doesn't already exists in the file cache
* | | | Merge pull request #17989 from owncloud/enc_only_update_file_cache_onceBjörn Schießle2015-08-032-7/+22
|\ \ \ \ | | | | | | | | | | only update database on the first run
| * | | | only update database on the first run (first run = we have a version number ↵Bjoern Schiessle2015-07-312-7/+22
| | | | | | | | | | | | | | | | | | | | from the old encryption app)
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-032-2/+2
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-026-0/+12
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-0132-6/+74
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-31202-896/+390
| | |
* | | Merge pull request #17805 from owncloud/avatar-handle-errorsRoeland Douma2015-07-314-6/+59
|\ \ \ | | | | | | | | [avatar] add error handlers for avatar setup
| * | | [avatar] add error handlers for avatar setupMorris Jobke2015-07-304-6/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add colon to translated string use placeholder in t() Adding a size limitation for avatar upload Unit test for file size Fix typo & display server side error message
* | | | Merge pull request #17994 from owncloud/server-statusRobin McCorkell2015-07-302-13/+14
|\ \ \ \ | | | | | | | | | | correct order and capitalization of 'Server status' admin settings entry
| * | | | correct order and capitalization of 'Server status' admin settings entry, ↵Jan-Christoph Borchardt2015-07-302-13/+14
| | | | | | | | | | | | | | | | | | | | fix #17395
* | | | | Merge pull request #17993 from owncloud/simplecontainertest-fixRobin McCorkell2015-07-301-4/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix incorrect test naming in SimpleContainerTest
| * | | | | Fix incorrect test namingRobin McCorkell2015-07-301-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `tesOverrideService()` was incorrect and wasn't getting called by PHPUnit. Also, the unit test itself was wrong, but went unnoticed because of point 1.
* | | | | | Merge pull request #17175 from owncloud/add-download-feedbackMorris Jobke2015-07-308-13/+147
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add loading spinner to download icon
| * | | | | move updateFileActionSpinner to OCA.Files.FileActionsMorris Jobke2015-07-223-24/+24
| | | | | |
| * | | | | refactor this to proper separation of concernsMorris Jobke2015-07-153-19/+39
| | | | | |
| * | | | | refactoring into proper methodsMorris Jobke2015-07-074-58/+65
| | | | | |
| * | | | | Fix unit tests and introduce better mocks of the HTMLMorris Jobke2015-07-072-7/+7
| | | | | |
| * | | | | Add proper download started feedbackMorris Jobke2015-07-073-12/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * this code adds a cookie when a special get parameter is set * the content of this get parameter is used as value for the cookie * the cookie expires after 20 seconds * the JS code checks every 500 milliseconds for the cookie -> if the cookie is set the request returned and the download is started
| * | | | | Make download status fully visibleMorris Jobke2015-07-071-0/+8
| | | | | |
| * | | | | Reduce timeout for download spinner to 2 secondsMorris Jobke2015-07-072-2/+2
| | | | | |
| * | | | | Add loading spinner to multi select download buttonMorris Jobke2015-07-071-0/+20
| | | | | |
| * | | | | Fix layout of disabled links in the file listMorris Jobke2015-07-072-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | * also disable download button after click
| * | | | | Add loading spinner to download iconMorris Jobke2015-07-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | * vanishes after 7 seconds
* | | | | | Merge pull request #17981 from owncloud/correct-regexThomas Müller2015-07-302-2/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Correct regular expressions
| * | | | | Add more unit testsLukas Reschke2015-07-301-0/+2
| | | | | |
| * | | | | Correct regular expressionsLukas Reschke2015-07-302-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Previously the regex was only matching on single characters. Meaning that file names such as ":+1:.txt" where possible while ":+1:" alone never was. This check apparently never worked as expected.
* | | | | | Merge pull request #17963 from owncloud/remove-derecated-mysql-functionsMorris Jobke2015-07-309-155/+253
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Moving mysql setup code over to Doctrine
| * | | | | Check for PDO instead of removed function for PHP 7 compatibilityLukas Reschke2015-07-302-12/+38
| | | | | |
| * | | | | properly mock dependencies for setup testsMorris Jobke2015-07-301-1/+7
| | | | | |
| * | | | | - more injectionThomas Müller2015-07-306-67/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - less static calls - use params on sql queries - handle sql exception on database and user creation gracefully
| * | | | | Moving mysql setup code over to DoctrineThomas Müller2015-07-295-95/+109
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-30112-172/+144
| | | | | |
* | | | | | Merge pull request #17814 from owncloud/update-moment-jsRobin McCorkell2015-07-295-3493/+4078
|\ \ \ \ \ \ | |/ / / / / |/| | | | | update moment.js to 2.10.3
| * | | | | update moment.js to 2.10.3Morris Jobke2015-07-225-3493/+4078
| | | | | |
* | | | | | Merge pull request #17966 from owncloud/remove-mssqlThomas Müller2015-07-2914-284/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove remainings of mssql
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 11:30:18 +0000