wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26023 commits 157 branches 562 tags 714 MiB
Commit graph

26023 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
3b803db6d8 Update phpseclib to 2.0 2015-08-03 09:43:45 +02:00
Jenkins for ownCloud
27bfab37bc [tx-robot] updated from transifex 2015-08-02 01:54:57 -04:00
Jenkins for ownCloud
54e94b95bc [tx-robot] updated from transifex 2015-08-01 01:55:02 -04:00
Jenkins for ownCloud
de01951da3 [tx-robot] updated from transifex 2015-07-31 01:56:30 -04:00
Roeland Douma
db91b4505c Merge pull request #17805 from owncloud/avatar-handle-errors 
[avatar] add error handlers for avatar setup
 2015-07-31 07:31:24 +02:00
Robin McCorkell
519fcee15f Merge pull request #17994 from owncloud/server-status 
correct order and capitalization of 'Server status' admin settings entry
 2015-07-30 21:31:10 +01:00
Robin McCorkell
46916914f8 Merge pull request #17993 from owncloud/simplecontainertest-fix 
Fix incorrect test naming in SimpleContainerTest
 2015-07-30 21:07:55 +01:00
Morris Jobke
e184157684 [avatar] add error handlers for avatar setup 
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
 2015-07-30 18:05:32 +02:00
Jan-Christoph Borchardt
2d130826da correct order and capitalization of 'Server status' admin settings entry, fix #17395 2015-07-30 17:34:13 +02:00
Robin McCorkell
0223221a64 Fix incorrect test naming 
`tesOverrideService()` was incorrect and wasn't getting called by
PHPUnit. Also, the unit test itself was wrong, but went unnoticed
because of point 1.
 2015-07-30 16:06:26 +01:00
Morris Jobke
5699fff889 Merge pull request #17175 from owncloud/add-download-feedback 
Add loading spinner to download icon
 2015-07-30 16:34:35 +02:00
Thomas Müller
22fd04eb41 Merge pull request #17981 from owncloud/correct-regex 
Correct regular expressions
 2015-07-30 16:07:46 +02:00
Morris Jobke
80810ae10f Merge pull request #17963 from owncloud/remove-derecated-mysql-functions 
Moving mysql setup code over to Doctrine
 2015-07-30 15:21:54 +02:00
Lukas Reschke
e95bc68ac7 Check for PDO instead of removed function for PHP 7 compatibility 2015-07-30 12:32:22 +02:00
Lukas Reschke
52cd4efc83 Add more unit tests 2015-07-30 11:25:05 +02:00
Lukas Reschke
ad4c731c4c Correct regular expressions 
Previously the regex was only matching on single characters. Meaning that file names such as "👍.txt" where possible while "👍" alone never was. This check apparently never worked as expected.
 2015-07-30 11:22:14 +02:00
Morris Jobke
4d672ded24 properly mock dependencies for setup tests 2015-07-30 09:02:35 +02:00
Jenkins for ownCloud
a07254856c [tx-robot] updated from transifex 2015-07-30 01:55:20 -04: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
Robin McCorkell
0fcb9f79cc Merge pull request #17814 from owncloud/update-moment-js 
update moment.js to 2.10.3
 2015-07-29 22:10:16 +01: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