Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow setupchecks to specify a warning level | Roeland Jago Douma | 2015-07-30 | 4 | -12/+56 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-30 | 112 | -172/+144 |
| | |||||
* | Merge pull request #17814 from owncloud/update-moment-js | Robin McCorkell | 2015-07-29 | 5 | -3493/+4078 |
|\ | | | | | update moment.js to 2.10.3 | ||||
| * | update moment.js to 2.10.3 | Morris Jobke | 2015-07-22 | 5 | -3493/+4078 |
| | | |||||
* | | Merge pull request #17966 from owncloud/remove-mssql | Thomas Müller | 2015-07-29 | 14 | -284/+11 |
|\ \ | | | | | | | Remove remainings of mssql | ||||
| * | | fix unit tests | Morris Jobke | 2015-07-29 | 1 | -2/+2 |
| | | | |||||
| * | | Remove remainings of mssql | Thomas Müller | 2015-07-29 | 14 | -282/+9 |
| | | | |||||
* | | | Merge pull request #17969 from owncloud/fix-log-file-check | Robin McCorkell | 2015-07-29 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | [admin settings] only retrieve log file size if file exists | ||||
| * | | | [admin settings] only retrieve log file size if file exists | Morris Jobke | 2015-07-29 | 1 | -1/+4 |
|/ / / | | | | | | | | | | * fixes #17467 | ||||
* | | | Merge pull request #17965 from owncloud/theme-color | Morris Jobke | 2015-07-29 | 3 | -0/+3 |
|\ \ \ | | | | | | | | | add theme-color for better Android browser integration | ||||
| * | | | add theme-color for better Android browser integration | Jan-Christoph Borchardt | 2015-07-29 | 3 | -0/+3 |
| |/ / | |||||
* | | | Merge pull request #17960 from owncloud/inline-button | Morris Jobke | 2015-07-29 | 3 | -2/+10 |
|\ \ \ | |/ / |/| | | use inline confirm button style for password-protected links, ref #15176 | ||||
| * | | use inline confirm button style for password-protected links, ref #15176 | Jan-Christoph Borchardt | 2015-07-29 | 3 | -2/+10 |
| | | | |||||
* | | | Merge pull request #17950 from ↵ | Robin McCorkell | 2015-07-29 | 3 | -2/+5 |
|\ \ \ | |/ / |/| | | | | | | | | owncloud/config-dontdetectfschangesinrootbydefault Disable filesystem_check_changes by default | ||||
| * | | Fix watcher tests to explicitly set policy | Vincent Petry | 2015-07-29 | 1 | -0/+3 |
| | | | |||||
| * | | Disable filesystem_check_changes by default | Vincent Petry | 2015-07-29 | 2 | -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-17921 | blizzz | 2015-07-29 | 1 | -8/+0 |
|\ \ \ | | | | | | | | | Remove Log info when no group filter is set, fixes #17921 | ||||
| * | | | remove unused var | blizzz | 2015-07-29 | 1 | -2/+0 |
| | | | | |||||
| * | | | Remove Log info when no group filter is set, fixes #17921 | blizzz | 2015-07-28 | 1 | -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-underscore | Morris Jobke | 2015-07-29 | 4 | -561/+768 |
|\ \ \ \ | | | | | | | | | | | update underscore to 1.8.3 | ||||
| * | | | | update underscore to 1.8.3 | Morris Jobke | 2015-07-27 | 4 | -561/+768 |
| | | | | | |||||
* | | | | | Merge pull request #17946 from owncloud/settings-users-apprenderedforsearchbox | Morris Jobke | 2015-07-29 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Trigger "apprendered" event in users page | ||||
| * | | | | | Trigger "apprendered" event in users page | Vincent Petry | 2015-07-29 | 1 | -0/+4 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | This will properly update the controls bar width and display the search box initially. | ||||
* | | | | | Merge pull request #17908 from rullzer/docker_mysql | Robin McCorkell | 2015-07-29 | 1 | -11/+44 |
|\ \ \ \ \ | | | | | | | | | | | | | Add use of docker instance for MariaDB | ||||
| * | | | | | Add possible use of docker instance for MariaDB | Roeland Jago Douma | 2015-07-29 | 1 | -11/+44 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #17464 from owncloud/fix-17232 | blizzz | 2015-07-29 | 9 | -98/+340 |
|\ \ \ \ \ | | | | | | | | | | | | | fix uncaught exception on not permitted file types when setting avatar, fixes #17232 | ||||
| * | | | | | fix test after rebasing | Arthur Schiwon | 2015-07-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fix uncaught exception on not permitted file types when setting avatar, ↵ | Arthur Schiwon | 2015-07-27 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | fixes #17232 | ||||
| * | | | | | add integration tests for avatar update | Arthur Schiwon | 2015-07-27 | 5 | -2/+144 |
| | | | | | | |||||
| * | | | | | refactor integration tests to make it easier to add new ones | Arthur Schiwon | 2015-07-27 | 4 | -95/+189 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #17489 from owncloud/fix-share-time-as-string | Morris Jobke | 2015-07-29 | 2 | -0/+37 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix parsing of sharetime as string | ||||
| * | | | | | tests for _parseTime with hex and empty strings | Morris Jobke | 2015-07-28 | 2 | -0/+6 |
| | | | | | | |||||
| * | | | | | Fix parsing of sharetime as string | Morris Jobke | 2015-07-28 | 2 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases the ajax/share.php will return the share time as string. If this is the case it would get parsed completely wrong and cause the share dropdown to not work anymore. This change will properly cast the string to an interger and also fallback if this is not possible. | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-29 | 70 | -0/+86 |
| | | | | | | |||||
* | | | | | | Merge pull request #17912 from owncloud/detect-old-openssl-versions | Robin McCorkell | 2015-07-28 | 4 | -11/+221 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Detect old NSS and OpenSSL versions | ||||
| * | | | | | | Detect old NSS and OpenSSL versions | Lukas Reschke | 2015-07-28 | 4 | -11/+221 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will detect old NSS and OpenSSL versions and show appropriate errors in the admin interface. Fixes https://github.com/owncloud/core/issues/17901 | ||||
* | | | | | | | Merge pull request #17922 from owncloud/smb-storageiddoubleslash | Robin McCorkell | 2015-07-28 | 2 | -1/+16 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Double slash for SMB storage id for compatibility | ||||
| * | | | | | | | Double slash for SMB storage id for compatibility | Vincent Petry | 2015-07-28 | 2 | -1/+16 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #17927 from owncloud/fix_17925 | Vincent Petry | 2015-07-28 | 2 | -13/+177 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | set logger in constructor | ||||
| * | | | | | | Add unit tests | Lukas Reschke | 2015-07-28 | 2 | -13/+176 |
| | | | | | | | |||||
| * | | | | | | set logger in constructor | Bjoern Schiessle | 2015-07-28 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #15543 from rullzer/mimetypedetector | Morris Jobke | 2015-07-28 | 6 | -90/+521 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Mimetypedetector | ||||
| * | | | | | | Pass config dir as parameter to detection class | Roeland Jago Douma | 2015-07-27 | 3 | -12/+214 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to properly test the mimetype function: * constructor takes path to configdir * Added unit tests for mimetype (only if vfsStream is available) | ||||
| * | | | | | | Proper deprecate methods | Roeland Jago Douma | 2015-07-27 | 2 | -14/+5 |
| | | | | | | | |||||
| * | | | | | | Loading of mapping/aliases is done in class | Roeland Jago Douma | 2015-07-27 | 3 | -34/+48 |
| | | | | | | | |||||
| * | | | | | | Move mimetypedetection to files/type/detection | Roeland Jago Douma | 2015-07-27 | 4 | -172/+64 |
| | | | | | | | |||||
| * | | | | | | Added mimetype detector | Roeland Jago Douma | 2015-07-27 | 6 | -1/+333 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | * Copied unit tests from old functions | ||||
* | | | | | | Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_file | Roeland Douma | 2015-07-28 | 2 | -0/+49 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Remote shares should be uique | ||||
| * | | | | | Added test | Roeland Jago Douma | 2015-07-15 | 1 | -0/+36 |
| | | | | | | |||||
| * | | | | | Cannot share the same file multiple times with remote user | Roeland Jago Douma | 2015-07-15 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for #17183 It should not be possible to create multiple remote shares from user A to user B of the same file/folder. |