summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * | | | | fix unit testsMorris Jobke2015-07-291-2/+2
| | | | | |
| * | | | | Remove remainings of mssqlThomas Müller2015-07-2914-282/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #17969 from owncloud/fix-log-file-checkRobin McCorkell2015-07-291-1/+4
|\ \ \ \ \ | | | | | | | | | | | | [admin settings] only retrieve log file size if file exists
| * | | | | [admin settings] only retrieve log file size if file existsMorris Jobke2015-07-291-1/+4
|/ / / / / | | | | | | | | | | | | | | | * fixes #17467
* | | | | Merge pull request #17965 from owncloud/theme-colorMorris Jobke2015-07-293-0/+3
|\ \ \ \ \ | | | | | | | | | | | | add theme-color for better Android browser integration
| * | | | | add theme-color for better Android browser integrationJan-Christoph Borchardt2015-07-293-0/+3
| |/ / / /
* | | | | Merge pull request #17960 from owncloud/inline-buttonMorris Jobke2015-07-293-2/+10
|\ \ \ \ \ | |/ / / / |/| | | | use inline confirm button style for password-protected links, ref #15176
| * | | | use inline confirm button style for password-protected links, ref #15176Jan-Christoph Borchardt2015-07-293-2/+10
| | | | |
* | | | | Merge pull request #17950 from ↵Robin McCorkell2015-07-293-2/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | owncloud/config-dontdetectfschangesinrootbydefault Disable filesystem_check_changes by default
| * | | | Fix watcher tests to explicitly set policyVincent Petry2015-07-291-0/+3
| | | | |
| * | | | Disable filesystem_check_changes by defaultVincent Petry2015-07-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent detecting remote changes done in the data folder / root storage by default. In the rare cases where the data folder is shared with other apps/users outside ownCloud and change detection is needed, the admin will have to set the option explicitly from now on. Note that this doesn't affect external storages which have their own setting in the mount options.
* | | | | Merge pull request #17923 from owncloud/fix-17921blizzz2015-07-291-8/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Remove Log info when no group filter is set, fixes #17921
| * | | | remove unused varblizzz2015-07-291-2/+0
| | | | |
| * | | | Remove Log info when no group filter is set, fixes #17921blizzz2015-07-281-6/+0
| | | | | | | | | | | | | | | The log message is superfluous and too noisy. If an admin decides not to use groups, he does not need to be reminded about it on almost every request.
* | | | | Merge pull request #17813 from owncloud/update-underscoreMorris Jobke2015-07-294-561/+768
|\ \ \ \ \ | | | | | | | | | | | | update underscore to 1.8.3
| * | | | | update underscore to 1.8.3Morris Jobke2015-07-274-561/+768
| | | | | |
* | | | | | Merge pull request #17946 from owncloud/settings-users-apprenderedforsearchboxMorris Jobke2015-07-291-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Trigger "apprendered" event in users page
| * | | | | | Trigger "apprendered" event in users pageVincent Petry2015-07-291-0/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | This will properly update the controls bar width and display the search box initially.
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 02:36:44 +0000