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

23452 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
8ebb198ef3 Add a unit test for the naming conflict on the mountpoint name 2015-03-17 16:55:03 +01:00
Joas Schilling
ba3e4ede39 Use insertIfNotExists() instead of manual logic 2015-03-17 16:03:24 +01:00
Joas Schilling
05c4848954 Correctly get the unique mountpoint name when mounting the share 
Previously the mount name was checked for uniqueness prior to inserting the
share. This caused problems, when two shares with the same name where done
or folder, mount point, local share with the same name was done, between
sending and accepting of the remote share
 2015-03-17 16:03:24 +01:00
Thomas Müller
d96b97043b Merge pull request #14944 from owncloud/fix-php-doc-and-co 
Fix PHPDoc and Co.
 2015-03-17 11:34:07 +01:00
Thomas Müller
98a42dbccc Merge pull request #14927 from oparoz/raw-mimetypes 
Introducing the Raw media types
 2015-03-17 11:32:09 +01:00
Lukas Reschke
e4c6b0abf5 Merge pull request #14931 from owncloud/issue/14881-closures-for-navigation-entries 
Issue/14881 closures for navigation entries
 2015-03-17 11:28:27 +01:00
Lukas Reschke
b1c19f74a1 Merge pull request #12085 from owncloud/add-swift-mailer 
Migrate OC_Mail to SwiftMailer
 2015-03-17 11:15:39 +01:00
Lukas Reschke
db033e4e19 Fix PHPDoc and Co. 
Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240
 2015-03-17 10:37:09 +01:00
Vincent Petry
6525911439 Merge pull request #14929 from owncloud/s2s-scanner-warnings 
Fix scanFile signature warnings
 2015-03-17 09:51:45 +01:00
Jenkins for ownCloud
b51b4f0a2c [tx-robot] updated from transifex 2015-03-17 01:55:43 -04:00
Morris Jobke
fc0aa0b6ae Merge pull request #14936 from owncloud/fix-setup-config 
Fix setup config namespace
 2015-03-16 18:47:42 +01:00
Vincent Petry
7bc09f8f06 Fix setup config 2015-03-16 17:57:34 +01:00
Vincent Petry
6f687fa6ae Merge pull request #14923 from owncloud/fix-preference-key-definition 
Fix user preference key definition for insertIfNotExists()
 2015-03-16 17:14:09 +01:00
Thomas Müller
54e1edbf03 Merge pull request #13733 from mmattel/Try_to_write_logtimezone_during_installation 
Write the parameter 'logtimezone' into config.php during setup
 2015-03-16 17:04:06 +01:00
Vincent Petry
669ff45625 Merge pull request #14877 from owncloud/smb-constructor-noconnect 
Wait with getting the timezone from the smb server until we need it
 2015-03-16 17:01:49 +01:00
Joas Schilling
ec1d5011b6 Add tests for the navigation manager (closure) behaviour 2015-03-16 16:46:17 +01:00
Vincent Petry
b9d9405135 Fix scanFile signature warnings 2015-03-16 16:45:11 +01:00
Olivier Paroz
bef12488c3 Introducing the Raw mimetypes 2015-03-16 16:25:04 +01:00
Joas Schilling
970846624f Allow registering closures for navigation entries 
This speeds up all pages that don't use the navigation by 0.04sec per app,
because we don't need to create the routing anymore, unless we really need to.
 2015-03-16 16:17:43 +01:00
Joas Schilling
c2a5bd6a01 Also add a note that clob does not work in the compare array 2015-03-16 15:41:00 +01:00
Joas Schilling
06b2446269 The key is over configkey, user and app, not the value 
stupid me :(
 2015-03-16 15:37:12 +01:00
Lukas Reschke
7a70fffa6c Don't fallback to Plaintext per default for legacy class 2015-03-16 14:10:03 +01:00
Lukas Reschke
d7c7808a5e Add debug log message back 2015-03-16 13:01:17 +01:00
Lukas Reschke
e32f1582c7 Show more detailed error message 2015-03-16 12:47:06 +01:00
Lukas Reschke
dfd70337d6 Adjust unit test 2015-03-16 12:47:05 +01:00
Lukas Reschke
f92f3a1a6e Incorporate review changes 2015-03-16 12:47:05 +01:00
Lukas Reschke
283476a2f7 Use new IMailer and add unit-tests for lostcontroller 2015-03-16 12:47:05 +01:00
Lukas Reschke
13486a5ada Migrate to SwiftMail 
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.

Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014

Conflicts:
	3rdparty
	lib/private/server.php
	lib/public/iservercontainer.php
	tests/lib/mail.php
	tests/settings/controller/mailsettingscontrollertest.php

Conflicts:
	3rdparty
	lib/private/mail.php
	lib/private/server.php
	lib/public/iservercontainer.php
	settings/ajax/lostpassword.php
	settings/application.php
 2015-03-16 12:47:05 +01:00
Thomas Müller
1075914f8a Merge pull request #14883 from owncloud/imagepng_expects_resource_issue 
validate resource's integrity before using it
 2015-03-16 12:22:27 +01:00
Georg Ehrke
09b05373ed validate resource's integrity before using it 2015-03-16 10:57:01 +01:00
Morris Jobke
997a7a2668 Merge pull request #14766 from owncloud/fix-insertifnotexists-poc 
Allow specifying the compare-array for insertIfNotExists()
 2015-03-16 10:31:36 +01:00
Thomas Müller
1e0d8f1774 Merge pull request #14133 from rullzer/fix_10600 
Always display max upload size in admin panel
 2015-03-16 10:05:57 +01:00
Thomas Müller
bbaf97ca43 Merge pull request #14644 from owncloud/trash-expire-command 
Expire files from the trash in the background
 2015-03-16 10:04:05 +01:00
Thomas Müller
6927773648 Merge pull request #14776 from owncloud/fix-14629-master 
verify the file name length not to exceed 255 characters + verify path d...
 2015-03-16 09:58:41 +01:00
Thomas Müller
b159c7f274 Merge pull request #14848 from owncloud/kill-curl-fallback-master 
drop any fallback code related to curl
 2015-03-16 09:56:31 +01:00
Jenkins for ownCloud
c1a3394f48 [tx-robot] updated from transifex 2015-03-16 01:55:15 -04:00
Morris Jobke
5d74534f06 Merge pull request #14899 from owncloud/setupwarning-text 
Put notice about checking logs in setup warning
 2015-03-15 20:20:32 +01:00
Jenkins for ownCloud
84b6ca9b81 [tx-robot] updated from transifex 2015-03-15 01:54:38 -04:00
Robin McCorkell
69d376fbf1 Put notice about checking logs in setup warning 2015-03-15 01:25:30 +00:00
Joas Schilling
82138d4255 Merge pull request #14872 from owncloud/issue/14870-avatar-user-non-object 
Fix getting the avatar of a non-existing user
 2015-03-14 11:43:18 +01:00
Jenkins for ownCloud
8c5be2bc48 [tx-robot] updated from transifex 2015-03-14 01:54:45 -04:00
Thomas Müller
918b86a5bc Merge pull request #14871 from owncloud/use-proper-error-type 
Use proper error type and clean-up code
 2015-03-13 23:30:49 +01:00
Thomas Müller
b8eb0b7cb6 Merge pull request #14880 from owncloud/drop-example-backend 
Drop example user backend
 2015-03-13 23:00:03 +01:00
Joas Schilling
30357aaac0 No user no avatar easy as that 2015-03-13 17:35:34 +01:00
Lukas Reschke
e77d2ff2b4 Remove outdated comment 2015-03-13 16:19:52 +01:00
Lukas Reschke
bf9030e874 Drop example user backend 
We already provide an interface for application developers, this file is outdated and thus should get removed.

Addresses No. 3 from https://github.com/owncloud/core/issues/14847
 2015-03-13 16:12:32 +01:00
Morris Jobke
0d9f149dd9 Merge pull request #14867 from owncloud/drop-OC_User_HTTP 
Remove OC_User_HTTP
 2015-03-13 15:53:22 +01:00
Joas Schilling
5d71eb5670 Color avatars of non-existing users gray and display X instead 2015-03-13 15:29:52 +01:00
Joas Schilling
61ec37431a Fix order of expected and actual on assertEquals() calls 2015-03-13 15:29:52 +01:00
Joas Schilling
8304f5f508 Fix getting the avatar of a non-existing user 2015-03-13 15:29:52 +01:00