Morris Jobke
4d672ded24
properly mock dependencies for setup tests
2015-07-30 09:02:35 +02:00
Thomas Müller
c3cac887f5
- more injection
...
- less static calls
- use params on sql queries
- handle sql exception on database and user creation gracefully
2015-07-30 00:04:30 +02:00
Thomas Müller
114f128fc3
Moving mysql setup code over to Doctrine
2015-07-29 23:12:59 +02:00
Thomas Müller
aff11d7a79
Merge pull request #17966 from owncloud/remove-mssql
...
Remove remainings of mssql
2015-07-29 22:59:31 +02:00
Robin McCorkell
ddb32d42d2
Merge pull request #17969 from owncloud/fix-log-file-check
...
[admin settings] only retrieve log file size if file exists
2015-07-29 21:58:16 +01:00
Morris Jobke
8184527760
[admin settings] only retrieve log file size if file exists
...
* fixes #17467
2015-07-29 20:41:34 +02:00
Morris Jobke
8bc4a10dbe
fix unit tests
2015-07-29 20:14:28 +02:00
Morris Jobke
b5ea97ef81
Merge pull request #17965 from owncloud/theme-color
...
add theme-color for better Android browser integration
2015-07-29 19:59:01 +02:00
Morris Jobke
dfd92bc7e0
Merge pull request #17960 from owncloud/inline-button
...
use inline confirm button style for password-protected links, ref #15176
2015-07-29 18:48:11 +02:00
Thomas Müller
5ed38a75d6
Remove remainings of mssql
2015-07-29 18:19:31 +02:00
Jan-Christoph Borchardt
0b27bcba76
add theme-color for better Android browser integration
2015-07-29 18:16:01 +02:00
Robin McCorkell
3ef680d966
Merge pull request #17950 from owncloud/config-dontdetectfschangesinrootbydefault
...
Disable filesystem_check_changes by default
2015-07-29 15:34:02 +01:00
Jan-Christoph Borchardt
033eacefd1
use inline confirm button style for password-protected links, ref #15176
2015-07-29 16:31:45 +02:00
blizzz
332492548f
Merge pull request #17923 from owncloud/fix-17921
...
Remove Log info when no group filter is set, fixes #17921
2015-07-29 16:12:08 +02:00
Vincent Petry
943fc1b8e5
Fix watcher tests to explicitly set policy
2015-07-29 15:10:42 +02:00
Morris Jobke
f1749ddb01
Merge pull request #17813 from owncloud/update-underscore
...
update underscore to 1.8.3
2015-07-29 14:48:52 +02:00
Morris Jobke
f9f4012efe
Merge pull request #17946 from owncloud/settings-users-apprenderedforsearchbox
...
Trigger "apprendered" event in users page
2015-07-29 14:38:40 +02:00
Robin McCorkell
cb572ba017
Merge pull request #17908 from rullzer/docker_mysql
...
Add use of docker instance for MariaDB
2015-07-29 12:41:30 +01:00
blizzz
b0036ecff6
Merge pull request #17464 from owncloud/fix-17232
...
fix uncaught exception on not permitted file types when setting avatar, fixes #17232
2015-07-29 12:37:48 +02:00
blizzz
e0d5eb8989
remove unused var
2015-07-29 12:10:33 +02:00
Vincent Petry
7c9405a921
Disable filesystem_check_changes by default
...
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.
2015-07-29 12:01:12 +02:00
Vincent Petry
f4168fcf40
Trigger "apprendered" event in users page
...
This will properly update the controls bar width and display the search
box initially.
2015-07-29 11:01:51 +02:00
Roeland Jago Douma
ea9eabae50
Add possible use of docker instance for MariaDB
2015-07-29 10:44:56 +02:00
Morris Jobke
81d9066dc5
Merge pull request #17489 from owncloud/fix-share-time-as-string
...
Fix parsing of sharetime as string
2015-07-29 10:15:17 +02:00
Jenkins for ownCloud
e77b2e5317
[tx-robot] updated from transifex
2015-07-29 01:55:08 -04:00
Robin McCorkell
6d54d2fad7
Merge pull request #17912 from owncloud/detect-old-openssl-versions
...
Detect old NSS and OpenSSL versions
2015-07-28 21:26:44 +01:00
Robin McCorkell
6f72c37464
Merge pull request #17922 from owncloud/smb-storageiddoubleslash
...
Double slash for SMB storage id for compatibility
2015-07-28 19:54:11 +01:00
Vincent Petry
c4055af20b
Merge pull request #17927 from owncloud/fix_17925
...
set logger in constructor
2015-07-28 18:30:22 +02:00
Lukas Reschke
7f6c5e456b
Add unit tests
2015-07-28 16:32:11 +02:00
Bjoern Schiessle
2c8fa54881
set logger in constructor
2015-07-28 16:32:11 +02:00
Lukas Reschke
0d515de13e
Detect old NSS and OpenSSL versions
...
This will detect old NSS and OpenSSL versions and show appropriate errors in the admin interface.
Fixes https://github.com/owncloud/core/issues/17901
2015-07-28 15:32:19 +02:00
Morris Jobke
5a0d410488
tests for _parseTime with hex and empty strings
2015-07-28 14:20:55 +02:00
Morris Jobke
c34e63bb1f
Merge pull request #15543 from rullzer/mimetypedetector
...
Mimetypedetector
2015-07-28 13:35:26 +02:00
Roeland Douma
73169b0edb
Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_file
...
Remote shares should be uique
2015-07-28 13:06:25 +02:00
Vincent Petry
761ba344b7
Double slash for SMB storage id for compatibility
2015-07-28 11:41:54 +02:00
blizzz
81f5672393
Remove Log info when no group filter is set, fixes #17921
...
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.
2015-07-28 11:41:21 +02:00
Morris Jobke
ebfbb97e66
Fix parsing of sharetime as string
...
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.
2015-07-28 08:56:15 +02:00
Morris Jobke
4076f84f88
Merge pull request #17910 from owncloud/fix-modified-tooltip
...
Fix tooltip for modification time
2015-07-28 08:41:26 +02:00
Jenkins for ownCloud
c683b1d3c9
[tx-robot] updated from transifex
2015-07-28 01:55:00 -04:00
Arthur Schiwon
0967a54755
fix test after rebasing
2015-07-27 17:34:45 +02:00
Arthur Schiwon
b37d62d9d3
fix uncaught exception on not permitted file types when setting avatar, fixes #17232
2015-07-27 17:27:00 +02:00
Arthur Schiwon
85b7bde7d4
add integration tests for avatar update
2015-07-27 17:27:00 +02:00
Arthur Schiwon
68706de45b
refactor integration tests to make it easier to add new ones
2015-07-27 17:27:00 +02:00
Vincent Petry
6ada1e3276
Merge pull request #17902 from owncloud/fix_17898
...
get header size before we open the file to avoid locking exception
2015-07-27 16:58:32 +02:00
Thomas Müller
68f14a943a
Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption
...
Only set is encrypted when encryption is enabled
2015-07-27 16:06:39 +02:00
Hendrik Leppelsack
f67477206b
fixed tooltip for modified date
2015-07-27 15:56:03 +02:00
Roeland Jago Douma
d276aebf40
Pass config dir as parameter to detection class
...
In order to properly test the mimetype function:
* constructor takes path to configdir
* Added unit tests for mimetype (only if vfsStream is available)
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
88fb389eab
Proper deprecate methods
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
9cdd637050
Loading of mapping/aliases is done in class
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
141a0f0f47
Move mimetypedetection to files/type/detection
2015-07-27 14:59:45 +02:00