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

31388 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
22898fa107 Use proper shortcut methods in templates 2016-04-06 10:25:04 +02:00
Morris Jobke
046506dd14 Merge pull request #23763 from owncloud/do_not_export_share_type_2 
Share type 2 is private
 2016-04-06 09:40:13 +02:00
Thomas Müller
01b26d78a0 Merge pull request #23793 from owncloud/hard-code-dav-endpoints 
All webdav endpoints within remote.php are now hardcoded - helps to p…
 2016-04-06 08:34:37 +02:00
Roeland Douma
d739af3d4a Merge pull request #23808 from owncloud/test-lock-with-strange-filename 
Test locking with strange filename
 2016-04-06 08:23:14 +02:00
Jenkins for ownCloud
fb8c8ef38b [tx-robot] updated from transifex 2016-04-06 01:56:24 -04:00
Thomas Müller
1bb40b866a Merge pull request #23811 from owncloud/move-settings-and-oc-core-to-composer 
Add OC\Core and OC\Settings to composer autoloader
 2016-04-05 17:58:07 +02:00
Thomas Müller
60f532882c Merge pull request #23794 from owncloud/handle-null-in-usermanager 
Prevent null to be passed into the closure of callForAllUsers
 2016-04-05 17:57:39 +02:00
Lukas Reschke
433c0160b6 Move OC\Core and OC\Settings to composer autoloader 2016-04-05 16:47:38 +02:00
Jörn Friedrich Dreyer
4445ef82e0 Test locking with strange filename 2016-04-05 16:13:28 +02:00
Thomas Müller
90335ee2a1 Merge pull request #23040 from owncloud/mobile-css-loading 
load mobile styles last, fix #19596
 2016-04-05 14:33:19 +02:00
Thomas Müller
64d400b5df Prevent null to be passed into the closure of callForAllUsers 2016-04-05 10:26:04 +02:00
Thomas Müller
2a7e9f08ff Merge pull request #23791 from owncloud/fix-swift-test-mkfifo 
Remove any stray socket files before creating new ones
 2016-04-05 10:00:37 +02:00
Thomas Müller
7bdde98617 All webdav endpoints within remote.php are now hardcoded - helps to prevent migration issues like #23610 - furthermore there is no need to dynamically lookup all the endpoints we already know 2016-04-05 09:59:43 +02:00
Jan-Christoph Borchardt
73a6664ca8 load mobile styles last, fix #19596 2016-04-05 09:47:39 +02:00
Thomas Müller
961bb4c3e3 Merge pull request #23677 from owncloud/db-schema-migration-feedback 
Show individual sql schema migration steps during upgrade - on web as…
 2016-04-05 09:39:35 +02:00
Robin McCorkell
d47824f4cf Remove any stray socket files before creating new ones 2016-04-05 09:17:21 +02:00
Thomas Müller
808a25bc5d Merge pull request #23767 from owncloud/remove-unrequired-randomlib 
Remove unrequired randomlib
 2016-04-05 09:17:00 +02:00
Jenkins for ownCloud
6b571ea2db [tx-robot] updated from transifex 2016-04-05 01:55:53 -04:00
Morris Jobke
96cdc07255 Merge pull request #23682 from owncloud/group_sharing_disabled_capability 
Add capability to show if group sharing is enabled
 2016-04-04 23:21:03 +02:00
Roeland Jago Douma
ab034f0593 Add intergration tests 2016-04-04 19:35:01 +02:00
Roeland Jago Douma
db5ea95e29 Add capability to show if group sharing is enabled 
fixes #23477

Now clients can correct wording to properly reflect who a user can share
with.
 2016-04-04 19:35:01 +02:00
Morris Jobke
6ecd1d9e86 Fix PHP memory leak in file_get_contents() 
* ref https://bugs.php.net/bug.php?id=61961

* ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256

* code is based on the proposal of @chriseqipe

* fixes #20261
 2016-04-04 16:48:09 +02:00
Thomas Müller
4b79fb10a2 Fix verbose output of upgrade command - not progressbar in this case and the schema migration test has one progressbar now for all tables - before we had one progressbar for each table 2016-04-04 16:20:53 +02:00
Lukas Reschke
737807a378 Remove unrequired randomlib 2016-04-04 14:30:14 +02:00
Thomas Müller
f6cea3c9c4 Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page 
In case of exception we return an html page in case the client is a b…
 2016-04-04 13:51:23 +02:00
Morris Jobke
1f7e02e4d4 Add detailed logs hidden and show them on request 2016-04-04 12:34:18 +02:00
Thomas Müller
15339efd60 Limit the message to the console to the first 30 characters in order to not break the progress bar 2016-04-04 12:34:18 +02:00
Thomas Müller
1bf4c75e8b Show individual sql schema migration steps during upgrade - on web as well as on the command line 2016-04-04 12:34:18 +02:00
Björn Schießle
53c1902706 Merge pull request #23743 from owncloud/issue-23686-files-transferownership-share-unmount 
Unmount the share before deleting it, so we don't try to use it later on
 2016-04-04 11:11:24 +02:00
Stefan Weil
62a5952a72 core: Fix typos (found by codespell) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-04 10:57:17 +02:00
Pau
e0bae32288 Fixed 'Help Translate' link 2016-04-04 10:56:36 +02:00
Bernhard Posselt
4887f0f9b5 Add better messages for sometimes obscure exceptions 
* add better messages for sometimes obscure exceptions

* fix formatting
 2016-04-04 10:55:46 +02:00
Thomas Müller
64d68eb2da Merge pull request #23722 from owncloud/also-hide-password-for-private-key-password-update 
Also replace password in updatePrivateKeyPassword
 2016-04-04 10:54:59 +02:00
Joas Schilling
1d542e4ed2 Merge pull request #23728 from owncloud/sanitize-more-data-for-config-report 
Sanitize more data in config report
 2016-04-04 09:47:02 +02:00
Joas Schilling
ac330daef2 Inject the Mount Manager 2016-04-04 09:08:55 +02:00
Roeland Jago Douma
d3959ee152 Share type 2 is private 
This was added to the factory for legacy reasons when converting from
old to new sharing code. It is not used anymore so can be deleted. Which
means we no longer expose internal types.
 2016-04-04 09:00:06 +02:00
Jan-Christoph Borchardt
a0e2eae7de Merge pull request #23638 from owncloud/new-placeholder-colours-generator 
New colour generator
 2016-04-03 12:26:22 +02:00
Jenkins for ownCloud
deca08a683 [tx-robot] updated from transifex 2016-04-02 01:55:25 -04:00
Joas Schilling
3dac3a01c5 Unmount the share before deleting it, so we don't try to use it later on 2016-04-01 21:05:55 +02:00
John Molakvoæ
dcc28a3ad7 New colour generator 2016-04-01 18:00:47 +02:00
Vincent Petry
8d11c3b87b Merge pull request #23487 from owncloud/core-globalajaxerrorwhengoingaway 
Detect user navigating away, don't interpret as ajax error
 2016-04-01 17:03:55 +02:00
Lukas Reschke
a5f2f22c12 Sanitize more data in config report 
This sanitizes the following keys as well:

- `proxyuserpwd`
- `shared_secret` of `log.condition`
- `license-key`
- `password` of `redis`
 2016-04-01 13:03:34 +02:00
Lukas Reschke
e7ac5dccb6 Merge pull request #23719 from owncloud/pr-16857-printcss-followup 
Initialise the printcss array
 2016-04-01 10:56:01 +02:00
Lukas Reschke
09b14ceffc Also replace password in updatePrivateKeyPassword 
Fixes https://github.com/owncloud/core/issues/23717
 2016-04-01 10:32:23 +02:00
Joas Schilling
0235a79b4e Initialise the printcss array 2016-04-01 09:46:15 +02:00
Jenkins for ownCloud
cce6194368 [tx-robot] updated from transifex 2016-04-01 01:56:19 -04:00
Thomas Müller
63b01a3616 Merge pull request #22834 from owncloud/webdav_property_for_share_permissions 
Add sharePermissions webdav property
 2016-03-31 23:18:53 +02:00
Thomas Müller
690eef26dd Merge pull request #23274 from Senorsen/add-urlencode-ftp-sftp 
Add urlencode to username part of ftp and sftp links
 2016-03-31 23:18:10 +02:00
Thomas Müller
2714dfce21 Merge pull request #23713 from owncloud/small_encryption_fix 
make sure that we always remove the file again from the cache after t…
 2016-03-31 23:13:52 +02:00
Morris Jobke
1fac22c2c8 Merge pull request #23564 from owncloud/public-ajaxbasicauth 
Return 401 DummyBasicAuth in case of ajax call in public link page
 2016-03-31 22:23:12 +02:00