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

16643 commits

Author SHA1 Message Date
Joas Schilling
89238164e1 Fix comparisons in the dav app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:55:07 +02:00
Joas Schilling
0ebdf871e0 Fix comparisons in encryption app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:54:07 +02:00
Roeland Jago Douma
c8452803ef Merge pull request #5897 from nextcloud/add-share-mail-for-user-share 
Send an email once a file/folder is shared with a user
 2017-08-01 13:27:15 +02:00
Roeland Jago Douma
bc54e6ff7c
Use ITimeFactory 
* Inject the timefacotry so we can mock it properly in the tests.
* Extended unit tests to cover the new paths

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 11:23:40 +02:00
Bjoern Schiessle
3ffff08819
we don't need to remove the job manually here, even if we ask once more the other server will decline and the background job will be removed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
80c08e8fd0
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
9c9cb1a6db
cleanup constructors 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
06b9e58081
expire requestSharedSecret job after 30 days 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
51d85eb2f8
expire getShareadSecret job after 30 days 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:51 +02:00
Roeland Jago Douma
2fae696d35
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
61a6adff14
Fix sabre test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
ede15f0988
Fix L10N::t 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
fd465d4e49
[files_external] Fix phpdoc 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
fc369dd86e
[DAV] Fix URLUtil::splitPath usage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
f57a3aa81b
[DAV][CalDAV] Fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Roeland Jago Douma
201bbb962c
Fix Comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Roeland Jago Douma
19b039e6e0
[files_external] fix commands 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Roeland Jago Douma
b7c8e9ed88
[files_external] Fix phpdoc 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
dfd8125aeb
Replace wrong PHPDocs 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
d321e9792e
Add |null to PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
e1f52fc901
Stricter phan config fixes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:13 +02:00
Nextcloud bot
456392e627
[tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Roeland Jago Douma
f71dc7523f
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Roeland Jago Douma
3548603a88
Fix middleware implementations signatures 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Marin Treselj
f53db38c03 Change id to class in the main share template 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-31 12:19:19 +02:00
Morris Jobke
7b2c08a31a Merge pull request #5905 from nextcloud/ocp-config 
Use IConfig instead of static OCP\Config
 2017-07-31 10:54:40 +02:00
Roeland Jago Douma
baee0b4bcc Merge pull request #5913 from nextcloud/fix-anchor-name 
Fix anchor name for federated sharing settings
 2017-07-31 08:51:23 +02:00
Morris Jobke
a309fa7d6b Disable default activity email for incoming shares 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-31 08:19:54 +02:00
Nextcloud bot
97d06a7698
[tx-robot] updated from transifex 2017-07-31 00:08:02 +00:00
Nextcloud bot
98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot
b43abf7512
[tx-robot] updated from transifex 2017-07-29 00:08:31 +00:00
Morris Jobke
fae327799b Fix anchor name for federated sharing settings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-28 08:21:25 +02:00
Nextcloud bot
baa6db3539
[tx-robot] updated from transifex 2017-07-28 00:08:05 +00:00
Morris Jobke
dc58206ded Merge pull request #5852 from nextcloud/preview_trash_cleanup 
Preview trash cleanup
 2017-07-27 17:24:47 +02:00
Morris Jobke
c27498db71 Use IConfig instead of static OCP\Config 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-27 13:43:18 +02:00
Nextcloud bot
65ade4b6d5
[tx-robot] updated from transifex 2017-07-27 00:08:03 +00:00
Joas Schilling
28290d8691 Allow to enable the external storage app via the web ui 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-26 14:30:21 +02:00
Nextcloud bot
da31a30edb
[tx-robot] updated from transifex 2017-07-26 00:08:06 +00:00
Lukas Reschke
3faef644a1 Merge pull request #5864 from nextcloud/legacy_user 
Remove legacy OC_User_Backend and OC_User_Interface
 2017-07-25 17:15:11 +02:00
Morris Jobke
89a7b007f2 Fix comments 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-25 08:57:58 +02:00
Nextcloud bot
11e182fff2
[tx-robot] updated from transifex 2017-07-25 00:08:02 +00:00
Roeland Jago Douma
b930f32e89
Remove legacy OC_User_Backend and OC_User_Interface 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 20:42:55 +02:00
Morris Jobke
e785b849c7 Merge pull request #5835 from nextcloud/cleanup_testing_app 
Cleanup testing app
 2017-07-24 15:03:15 +02:00
Morris Jobke
c775d5e497 Merge pull request #5514 from nextcloud/assembly-stream-seek 
refactor chunked assembly stream
 2017-07-24 15:00:03 +02:00
Roeland Jago Douma
7f6a72b65d
Move over locking controller 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 13:44:03 +02:00
Roeland Jago Douma
10efec246d
Move over Config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 13:43:00 +02:00
Roeland Jago Douma
d1993c32e5
Move Application to AppInfo 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 13:42:58 +02:00
Roeland Jago Douma
6d4731024a
Some app fixes of phpstorm inspections 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 11:42:07 +02:00
Roeland Jago Douma
549845aa73
Delete trash using node API to trigger preview deletion 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-24 11:14:12 +02:00
Nextcloud bot
d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Jarkko Lehtoranta
69f6d42b17 LDAP: Simplify conditions in establishConnection 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta
6a62b4784a LDAP: Add testStartTlsNegotiationFailure unit test 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta
3a6511eac8 LDAP: Add testBindWithInvalidCredentials unit test 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta
6103677a91 LDAP: Use imported exception in Connection class 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta
79fbed4064 LDAP: Clean-up doConnect 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta
d87375cbaa LDAP: Throw an exception if disabling LDAP referrals fails 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta
97e14cccf2 LDAP: Fix testUseBackupServer unit test 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta
de9a9bc004 LDAP: Throw an exception if Start TLS fails 
This ensures that only a secure connection to the LDAP server will be used,
if Start TLS has been enabled.

Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta
ee2c6e8215 LDAP: Remove unnecessary "recursion" fix 
This reverts commit 86d72b9a61
"LDAP: fix possible recursion".

Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta
039a836d4a LDAP: Don't handle invalid credentials as a connection error 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta
4e2e592635 LDAP: Connect to backup server only if it exists + handle errors 
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
 2017-07-23 14:50:01 +03:00
Nextcloud bot
46332b0d8e
[tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Morris Jobke
b6c67f585e Merge pull request #5827 from nextcloud/improve-public-share-header 
Add filename and sharer in public page
 2017-07-22 10:59:33 +02:00
Nextcloud bot
ce7c62d9bb
[tx-robot] updated from transifex 2017-07-22 00:08:07 +00:00
Morris Jobke
50fc5a1e25 Merge pull request #5823 from nextcloud/improve-error-handling 
Improve error handling for accepting federated shares
 2017-07-21 22:54:14 +02:00
Morris Jobke
b2b4691e48 Add filename and sharer in public page 
* shows the filename and sharer on the public page
* allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting
* remove link on logo that redirects to login (fixes #5720)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-21 18:55:37 +02:00
Arthur Schiwon
25439919f8
fix phpdoc return types (no code change) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-07-21 14:55:12 +02:00
Arthur Schiwon
9b2f171cbd
do not attempt to recognise cert issue by using LDAPTLS_REQCERT 
first, it does not work (at least not everywhere/reliably), second if it
did it was not reset properly. Removes a bit of complexity.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-07-21 14:55:11 +02:00
Robin Appelman
89b747d066
refactor chunked assembly stream 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-21 12:49:39 +02:00
Roeland Jago Douma
86d2fe516e Merge pull request #5753 from nextcloud/fed-unshare-fail-remote 
still remove the federated share even if we cant notify the remote
 2017-07-21 12:45:01 +02:00
Bjoern Schiessle
8b3dfcc429
use OCSv2 to make sure that the error also arrives at the web front-end 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-21 12:09:13 +02:00
Bjoern Schiessle
e78040d250
improved error handling 
check if table was updated successfully and only then send a notification
mail and return "true".

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-21 12:07:32 +02:00
Morris Jobke
407a500745 Merge pull request #5803 from nextcloud/fix-public-links 
fix preview for public links
 2017-07-21 09:34:36 +02:00
Morris Jobke
3d9fd4d0d1 Merge pull request #5817 from nextcloud/add-basic-sql-injection-checker 
Add Phan plugin to check for SQL injections
 2017-07-21 09:25:24 +02:00
Nextcloud bot
964d5338dc
[tx-robot] updated from transifex 2017-07-21 00:08:06 +00:00
Lukas Reschke
3d2600b039
Add Phan plugin to check for SQL injections 
This adds a phan plugin which checks for SQL injections on code using our QueryBuilder, while it isn't perfect it should already catch most potential issues.

As always, static analysis will sometimes have false positives and this is also here the case. So in some cases the analyzer just doesn't know if something is potential user input or not, thus I had to add some `@suppress SqlInjectionChecker` in front of those potential injections.

The Phan plugin hasn't the most awesome code but it works and I also added a file with test cases.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-20 22:48:13 +02:00
Björn Schießle
c0e9b374f1 Merge pull request #5629 from nextcloud/add-recovery-key-on-public-upload 
Add recovery key on public upload
 2017-07-20 14:07:57 +02:00
Bjoern Schiessle
473824fa06
make sure that we always have a owner 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-20 11:40:17 +02:00
Bjoern Schiessle
20a6b22db6
Add recovery key on public upload 
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-20 11:40:14 +02:00
Bjoern Schiessle
ae8a3ce085
fix preview for public links 
in case a user is already logged in on the same server from
which the public link comes from, we need to setup the owners
file system in order to show the preview

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-20 11:24:52 +02:00
Joas Schilling
0b3266531b
Fix copy and paste error on activity descriptions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-20 09:31:14 +02:00
Nextcloud bot
26c42d3d30
[tx-robot] updated from transifex 2017-07-20 00:08:04 +00:00
Joas Schilling
3ff3c338c9 Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens 
Only use readable chars in Share Tokens
 2017-07-19 16:40:18 +02:00
Roeland Jago Douma
d5e3428af5 Merge pull request #5776 from nextcloud/install-phan 
Run phan over code base
 2017-07-19 13:45:31 +02:00
Lukas Reschke
d8ec399454
Run phan over code base 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:11 +02:00
Morris Jobke
e48ca730fe Add Android and iOS URLs to theming app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-19 10:20:47 +02:00
Roeland Jago Douma
e2298e0a71
Allow overwriting of IOS theming values 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-19 08:22:45 +02:00
Nextcloud bot
0ee83ac56b
[tx-robot] updated from transifex 2017-07-19 00:08:22 +00:00
Joas Schilling
984933e586
Only use readable chars in Share Tokens 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-18 15:44:34 +02:00
Roeland Jago Douma
1ac6eae7d5 Merge pull request #5739 from nextcloud/comradekingu-patch-4 
Spelling: Bigversal and LDAP
 2017-07-18 09:09:46 +02:00
Morris Jobke
58f72309cc Merge pull request #5736 from smueller18/patch-2 
do not show hyphen in og:title if slogan does not exist
 2017-07-18 09:04:47 +02:00
Roeland Jago Douma
4b1f258198 Merge pull request #5735 from nextcloud/comradekingu-patch-1 
Spelling: Shortening and binding
 2017-07-18 08:52:09 +02:00
Morris Jobke
99555faffd Merge pull request #5737 from nextcloud/comradekingu-patch-2 
Spelling: command-line, Consider narrowing
 2017-07-18 08:49:48 +02:00
Morris Jobke
7642492cfe Merge pull request #5741 from nextcloud/comradekingu-patch-6 
Spelling: sent, an invitation, - successful
 2017-07-18 08:49:06 +02:00
Morris Jobke
79cf7d610f Merge pull request #5740 from nextcloud/comradekingu-patch-5 
Spelling: log out, : Bigversal
 2017-07-18 08:48:08 +02:00
Nextcloud bot
b1b843e572
[tx-robot] updated from transifex 2017-07-18 00:08:02 +00:00
Roeland Jago Douma
1956ea0e13 Merge pull request #5743 from nextcloud/comradekingu-patch-7 
Spelling: - your
 2017-07-17 14:42:13 +02:00
Robin Appelman
7fa02905aa
still remove the federated share even if we cant notify the remote 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-17 14:19:44 +02:00
Nextcloud bot
125767265d
[tx-robot] updated from transifex 2017-07-17 00:08:02 +00:00
Allan Nordhøy
1d24c82e38 - your 
This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here.
 2017-07-15 11:39:50 +02:00
Nextcloud bot
a23cdd04bb
[tx-robot] updated from transifex 2017-07-15 00:08:54 +00:00
Allan Nordhøy
de6b7668c1 sent, an invitation, - successful 2017-07-14 17:28:57 +02:00
Allan Nordhøy
6ab8b90e94 log out, : Bigversal 2017-07-14 17:02:48 +02:00
Allan Nordhøy
ddc804aa32 : Bigversal and LDAP 2017-07-14 15:46:05 +02:00
Allan Nordhøy
4b8c1eaa91 command-line, Consider narrowing 2017-07-14 15:32:47 +02:00
Stephan Müller
7cf3dc4e29 do not show hyphen in og:title if slogan does not exist 2017-07-14 15:26:44 +02:00
Allan Nordhøy
66cbf90853 Spelling: Shortening and binding 2017-07-14 15:24:55 +02:00
Nextcloud bot
3865c77279
[tx-robot] updated from transifex 2017-07-14 00:08:37 +00:00
Joas Schilling
e335121d5e Merge pull request #5070 from nextcloud/theming-vs-themes 
Prefer custom theme over the theming app
 2017-07-13 13:41:31 +02:00
Nextcloud bot
261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Roeland Jago Douma
86a496d94a Merge pull request #5567 from nextcloud/public-capabilities 
Public capabilities API
 2017-07-12 13:04:54 +02:00
Roeland Jago Douma
08d3cb9107 Merge pull request #5685 from nextcloud/jail-propagator 
Fix propagating changes within jail wrapper
 2017-07-12 12:14:51 +02:00
Julius Härtl
ce5ad7e7f4
Prefer custom theme over theming app 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-12 11:42:15 +02:00
Nextcloud bot
13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Morris Jobke
9e2d1caba2 Merge pull request #5681 from nextcloud/upstream-fix-circles 
upstream fix circles
 2017-07-11 18:03:06 +02:00
Robin Appelman
dfe662ad42
Fix propagating changes within jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-11 17:55:04 +02:00
Morris Jobke
4153e1de79 Merge pull request #5672 from nextcloud/upload-hidden-filelist 
properly block file upload to non-active filelist
 2017-07-11 15:15:49 +02:00
Robin Appelman
e1d6ca3c53
fix test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-11 14:03:11 +02:00
Maxence Lange
6e7be6acfd upstream 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-07-11 13:21:24 +02:00
Morris Jobke
7df7d0ff3b Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select-dropdowns 
Fix unselecting items on multi select dropdowns
 2017-07-10 23:39:43 +02:00
Morris Jobke
22693aec47 Merge pull request #5669 from nextcloud/fix-remote-share-activity-emails 
Fix remote share activity emails
 2017-07-10 16:16:54 +02:00
Robin Appelman
12c9b1efb0
properly block file upload to non-active filelist 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-10 14:32:10 +02:00
Roger Szabo
0ebec6f9a4 Rectify variable $uid->$user 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-07-10 18:46:39 +08:00
Joas Schilling
33cb45d4a3
Fix owner cloud id in unshare activity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-10 12:20:56 +02:00
Joas Schilling
b69ddfba8b
Fix activity emails for accept/decline of remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-10 12:10:36 +02:00
Morris Jobke
c7b28064e3 Merge pull request #5649 from nextcloud/fix-5611 
fix alignment of radio button and its label in encryption settings
 2017-07-10 09:26:05 +02:00
Daniel Calviño Sánchez
46e813e749 Enable the toggleSelect extension in multi-select dropdowns 
The toggleSelect extension for Select2 makes possible to unselect items
in a multi-select dropdown by clicking on them; this behaviour should be
enabled in all the multi-select dropdowns used in the server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-07-10 03:38:22 +02:00
Nextcloud bot
4f7fafb5c5
[tx-robot] updated from transifex 2017-07-10 00:08:41 +00:00
Nextcloud bot
cf8db31bce
[tx-robot] updated from transifex 2017-07-09 00:08:31 +00:00
Nextcloud bot
f59062ce83
[tx-robot] updated from transifex 2017-07-08 00:08:27 +00:00
Arthur Schiwon
c46006934c
fix alignment of radio button and its label in encryption settings 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-07-07 16:59:28 +02:00
Morris Jobke
b4deba2078 Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails 
Use PNGs for icons in activity emails
 2017-07-07 11:05:00 +02:00
Tobias Brunner
f8735a3205 recognize groupOfUniqueNames as valid LDAP group object 
This was already partly done in f88109b but was missed in the
fetchGroups function.
 2017-07-07 08:29:58 +02:00
Nextcloud bot
d23bc9a99a
[tx-robot] updated from transifex 2017-07-07 00:08:24 +00:00
Bjoern Schiessle
001a9c02dd
adjust encryption tests to the new master key default 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:12 +02:00
Bjoern Schiessle
c46b158e10
update sharing test to new master key default 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:12 +02:00
Bjoern Schiessle
f186a5cfb1
fix and extend dav test to also test the master-key setup 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:11 +02:00
Bjoern Schiessle
d668e17769
since the default for the master key changed we need to write the setting explicitely to the database if we migrate from a older version 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:11 +02:00
Bjoern Schiessle
66debbe18e
add occ command to disable the master key again 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:11 +02:00
Bjoern Schiessle
5f75468aa4
improve status messages 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:11 +02:00
Bjoern Schiessle
28a7e72868
after the master key was loaded we are ready to go, no re-login needed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:10 +02:00
Bjoern Schiessle
da51ec38f4
only collect detailed access list if it is really needed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:33:08 +02:00
Bjoern Schiessle
9c5ba2f12c
make master key the new default 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:33:03 +02:00
Nextcloud bot
984953ef4a
[tx-robot] updated from transifex 2017-07-06 00:08:44 +00:00
Morris Jobke
60398b919b Merge pull request #5231 from nextcloud/migrations 
Migrations
 2017-07-05 17:32:40 +02:00
Morris Jobke
ca565644b3 Merge pull request #5621 from nextcloud/fix-sorting-of-favorite-files-in-file-list 
Fix sorting of favorite files in file list
 2017-07-05 17:31:41 +02:00
Morris Jobke
6879573b2e Merge pull request #5580 from nextcloud/admin-audit-update 
Admin audit update
 2017-07-05 16:16:00 +02:00
Daniel Calviño Sánchez
be56374c51 Fix sorting of favorite files 
The sort comparator checks the "isFavorite" property of the FileInfo
objects to compare. That property is set when the file list is loaded
and the response from the server is parsed, and thus a freshly loaded
file list has the proper sorting for favorite files. However, the
property is not set in other cases, like when the FileInfo objects are
derived from FileInfoModels due to a file being marked as a favorite or
a text editor being closed, which causes the file to be sorted in the
wrong position.

There is no need to add the property in those situations, though; in all
cases the TagsPlugin adds a "tags" array property that contains an
OC.TAG_FAVORITE tag, so that tag can be checked instead of "isFavorite".
Moreover, although "isFavorite" was added by the main "_parseFileInfo"
function it did not really belong there but to the "FileInfoParser" from
the TagsPlugin; however, as that property now is not used anywhere it
was removed altogether.

A cleaner solution would have been to make the sort comparator
extensible by plugins like other behaviours of the file list and then
add the sorting logic related to favorite files to the TagsPlugin.
However, right now only the TagsPlugin would need to alter the main
sorting logic, and it seems like a corner case anyway. Even if it is
implemented as a plugin, favorite files is a core feature, so for the
time being it will be taken into account directly in the main sorting
logic; making the sort comparator extensible by plugins is defered until
there are other use cases for that.

Fixes #5410

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-07-05 15:01:23 +02:00
Joas Schilling
fe6e8c2710 Fix dropping tables and handle the prefix automatically 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
543c181ec5 Move twofactor_backupcodes to migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
blizzz
d8af9d4c9b Merge pull request #5557 from nextcloud/dont-log-passwords-on-dav-exceptions-either 
Don't log passwords on dav exceptions
 2017-07-05 11:58:32 +02:00
Morris Jobke
e836efe68b Merge pull request #5569 from GitHubUser4234/ldap_password_renew_nc12fix 
Ldap password renewal fixes for NC12
 2017-07-05 11:49:13 +02:00
Nextcloud bot
1cbb7a18d8
[tx-robot] updated from transifex 2017-07-05 00:08:26 +00:00
Morris Jobke
67f4a79be7 Merge pull request #5549 from nextcloud/update-info 
Update admin.php
 2017-07-04 19:11:31 +02:00
Morris Jobke
711d861d8b Merge pull request #5556 from nextcloud/files_external_sftp_2048_4096 
[Files external] Add support for 2048 and 4096 bit RSA key generation
 2017-07-04 17:37:25 +02:00
Morris Jobke
f3c25e177f Merge pull request #5407 from nextcloud/5157-simple-logo 
Simplified Nextcloud logo icon #2
 2017-07-04 12:56:05 +02:00
Nextcloud bot
c94dbddd12
[tx-robot] updated from transifex 2017-07-03 00:08:21 +00:00
Marin Treselj
02dd7f5965
Revert background-size as requested, issue will be fixed separately 
Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
 2017-07-02 14:15:09 +02:00
Marin Treselj
3470d0a44e
Simplified Nextcloud logo icon 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-02 14:14:49 +02:00
Nextcloud bot
cc4373c901
[tx-robot] updated from transifex 2017-07-02 00:08:14 +00:00
Joas Schilling
a4a99fa7b9
Log console commands 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-01 12:19:01 +02:00
Joas Schilling
a5430b68ff
Listen to app enable/disable events 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-01 12:06:14 +02:00
Joas Schilling
669f684434
Move logic to Application class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-01 11:41:21 +02:00
Joas Schilling
8260d4bf73
Move to PSR-4 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-01 11:33:20 +02:00
Nextcloud bot
d49276082e
[tx-robot] updated from transifex 2017-07-01 00:08:28 +00:00
Roger Szabo
51ecc7ce11 suppress superflous php error on rejected password change 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-06-30 18:36:33 +08:00
Julius Härtl
42d9be4529
Expose theming capabilities to public 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-30 11:08:54 +02:00
Roeland Jago Douma
e3127b8899
Remove unused member 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-06-30 09:13:36 +02:00
Nextcloud bot
2afb4857cc
[tx-robot] updated from transifex 2017-06-30 00:08:23 +00:00
blizzz
72d3bfcf56 Merge pull request #4890 from nextcloud/unify-settings 
Unify settings
 2017-06-29 20:02:09 +02:00
Joas Schilling
b27819785e
Don't log passwords on dav exceptions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-29 17:20:10 +02:00
Roeland Jago Douma
e0ef960848 Merge pull request #5526 from nextcloud/trashbin-error-log 
Improve logging of trash bin inconsistencies
 2017-06-29 11:06:50 +02:00
Roeland Jago Douma
25e08bc8a0
Allow 2048 and 4096 bit SFTP keys 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-06-29 09:32:24 +02:00
Nextcloud bot
928b6a376e
[tx-robot] updated from transifex 2017-06-29 00:08:26 +00:00
Nextcloud bot
045d04332e
[tx-robot] updated from transifex 2017-06-28 00:08:18 +00:00
Jos Poortvliet
43301fddaf Update admin.php 
add a note on our staged roll-out.
 2017-06-27 17:00:06 +02:00
Arthur Schiwon
793de6a8d0
move encryption to security (and behind two factor things) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-27 12:21:18 +02:00
Nextcloud bot
3b80b72c04
[tx-robot] updated from transifex 2017-06-27 00:08:17 +00:00
Arthur Schiwon
da53162656
We're on 13 now… 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-26 11:03:41 +02:00
Nextcloud bot
6e52c8a794
[tx-robot] updated from transifex 2017-06-26 00:08:31 +00:00
Nextcloud bot
665ded38aa
[tx-robot] updated from transifex 2017-06-25 00:08:18 +00:00
Nextcloud bot
4526b8d6a3
[tx-robot] updated from transifex 2017-06-24 00:08:29 +00:00
Morris Jobke
b4fa812a3d Improve logging of trash bin inconsistencies 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-23 16:09:00 -05:00
Morris Jobke
944e560155 Merge pull request #5517 from nextcloud/enhanced-failure-logging 
Enhance the logging if the part file can not be renamed
 2017-06-23 16:06:03 -05:00
Arthur Schiwon
39ca06e6b9
fix setting up encryption section 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 13:38:33 +02:00
Arthur Schiwon
c5df6db631
move twofactor_* into security 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 13:18:08 +02:00
Arthur Schiwon
b7ce492c59
adapt encryption 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
f6ecc46cfa
adapt twofactore_backupcodes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
1ace1657b6
adapt federatedfilesharing 
also drops IE8 switch

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Arthur Schiwon
9c85f55202
remove obsolete file 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00
Robin Appelman
0dcce5a835
move personal external storage settings to it's own section 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-23 12:37:42 +02:00
Morris Jobke
eb9aedf44b Enhance the logging if the part file can not be renamed 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-22 17:50:14 -05:00
Morris Jobke
d611d9c126 Merge pull request #5498 from nextcloud/allow-to-force-a-language 
Allow to force a language and set it via the ocs api
 2017-06-22 12:47:00 -05:00
Roger Szabo
bf9412df63 set needsPasswordReset flag correctly 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-06-22 15:58:30 +08:00
Roger Szabo
1d8e73b108 css for button adjustment for nc12 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-06-22 15:53:11 +08:00
Morris Jobke
18824d476e Merge pull request #5474 from nextcloud/wording-4925 
Improve wording of various error messages
 2017-06-21 17:28:54 -05:00
Jan-Christoph Borchardt
fd63577089 Improve wording of various error messages 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-06-21 14:51:59 -05:00
Joas Schilling
fa717d9706
Add unit tests for the new code 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-21 12:21:21 +02:00
Joas Schilling
7816c54625
Allow to force a language and set it via the ocs api 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-21 11:34:52 +02:00
Roger Szabo
0fcbc0954c pass missing function parameter 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-06-21 14:40:44 +08:00
Nextcloud bot
146c699eb4
[tx-robot] updated from transifex 2017-06-21 00:08:15 +00:00
Joas Schilling
ca3a6ec607
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-20 14:25:24 +02:00
Joas Schilling
90fa27694a
Use PNG version of the icons for shipped activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-20 13:48:51 +02:00
Nextcloud bot
2660a3b49c
[tx-robot] updated from transifex 2017-06-20 00:08:41 +00:00
Morris Jobke
09a027ddff Merge pull request #5450 from nextcloud/fix-appmenu-more-theming 
Fix more icon in apps menu on bright backgrounds
 2017-06-19 08:28:02 -05:00
Robin Appelman
c9ef998f17 Merge pull request #5091 from nextcloud/shared-cache-during-init 
dont die if we try to access the shared cache while setting up the shared storage
 2017-06-19 13:47:59 +02:00
Nextcloud bot
76d10bc46b
[tx-robot] updated from transifex 2017-06-19 00:08:20 +00:00
Julius Härtl
adf2f88873
Fix more icon in apps menu on bright backgrounds 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-17 10:14:21 +02:00
Nextcloud bot
26d6c4a64a
[tx-robot] updated from transifex 2017-06-17 00:08:26 +00:00
Robin Appelman
cc0ff6f5e3 Merge pull request #5177 from Bekcpear/master 
Fix upload remaining time
 2017-06-16 14:11:55 +02:00
Joas Schilling
698a7cb7f0 Merge pull request #5124 from nextcloud/allow-dirlisting-with-unreadable-items 
Allow dir-listing also when one child is blocked by access control
 2017-06-16 10:47:08 +02:00
Bekcpear
8267e5e007 Fix uploadrate value of 'original-title' attribute 
The unit of `data.bitrate` is bit, but the argument unit of
`humanFileSize` function is byte, so it should be divided by 8.

Signed-off-by: Yaojin Qian <i@ume.ink>
 2017-06-16 15:35:51 +08:00
Bekcpear
82e263ed04 Fix upload remaining time 
The upload remaining time is always 'a few second' whatever a big or a
small file uploading.
This commit fixes it. The `new Date().getMilliseconds()` only return a
three digits number. When time arrived the next second, the millisecond
start from ZERO again. So `new Date().getTime()` is the righe choice.
And remaining time variables shoule be initialized when the file starts
uploading, otherwise the remaining time of a new upload will always be
'Infinity years' until you refresh the page.

Signed-off-by: Yaojin Qian <i@ume.ink>
 2017-06-16 15:33:10 +08:00
Nextcloud bot
74654288e6
[tx-robot] updated from transifex 2017-06-16 00:08:44 +00:00
Morris Jobke
ca3c69c8ae Merge pull request #5298 from nextcloud/bugfix/4885/calendar_shares_url_special_char_issue 
urldecode group principals in Cal- and CardDAV backend
 2017-06-14 23:10:40 -05:00
Morris Jobke
ac565cecad Merge pull request #5300 from nextcloud/bugfix/noid/fix_proppatch_requests_to_groupshares 
allow users to send PropPatch request when calendar is group-shared with them
 2017-06-14 23:00:39 -05:00
Morris Jobke
db14089d6c Merge pull request #5375 from nextcloud/share-folder-for-remote-shares 
Use the share_folder config for remote shares
 2017-06-14 22:42:06 -05:00
Nextcloud bot
7a269ae872
[tx-robot] updated from transifex 2017-06-15 00:08:40 +00:00
Morris Jobke
2398d40d98 Merge pull request #5384 from nextcloud/allow-to-share-to-local-users-via-email 
Allow to find local users by their email address
 2017-06-14 18:03:24 -05:00
Joas Schilling
f28511cac6
Add unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-14 15:32:34 +02:00
Joas Schilling
4f98852f52
Make sure to only add system users once 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-14 15:07:21 +02:00
blizzz
f3f3d077ae Merge pull request #5207 from nextcloud/ldap-remove-userwebdavauth-check 
remove check, user_webdavauth is not an app anymore for long
 2017-06-14 10:32:14 +02:00
Nextcloud bot
dc61fb999d
[tx-robot] updated from transifex 2017-06-14 00:08:39 +00:00
Morris Jobke
f38f2baa5a Merge pull request #5295 from nextcloud/bugfix/5077/allow_proppatches_to_birthday_calendar 
allow PropPatch requests to contact_birthdays
 2017-06-13 18:11:13 -05:00
Morris Jobke
69fd3a3c7b Merge pull request #5380 from nextcloud/global-scale-settings 
fix "add to your nextcloud" input field
 2017-06-13 14:41:32 -05:00
Morris Jobke
e7b5c5c268 Merge pull request #5372 from nextcloud/we-shall-monkey-patch-auth-headers-for-clients-that-dont-follow-specs 
Prevent sending second WWW-Authenticate header
 2017-06-13 12:36:31 -05:00
Morris Jobke
eafaa2f238 Merge pull request #5378 from patschi/fix-5349 
Fix #5349, no themed icon when dragging folder
 2017-06-13 12:21:17 -05:00
Morris Jobke
666e4de55f Merge pull request #5305 from nextcloud/add-quota-to-files-view 
Add quota to the files view
 2017-06-13 12:19:27 -05:00
Joas Schilling
ae693129db
Allow to find local users by their email address 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 18:07:47 +02:00
Bjoern Schiessle
2b3549610b
fix 'add to your nextcloud' input field, this is not an email address 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-13 17:46:46 +02:00
Morris Jobke
4a256aa6e4 Do not show icon for quota bar 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-13 10:30:26 -05:00
Lukas Reschke
2f7f6e28a2 Merge pull request #5373 from nextcloud/i-like-you-all-but-would-like-you-more-if-you-dont-ignore-red-ci-states 
Remove duplicate dependencies entry
 2017-06-13 17:22:11 +02:00
Morris Jobke
40802f3acd Merge pull request #5364 from nextcloud/fix-strings 
fix config switch description
 2017-06-13 10:21:42 -05:00
Patrik Kernstock
144fc1b5de Fix #5349, no themed icon when dragging folder 
Signed-off-by: Patrik Kernstock <info@pkern.at>
 2017-06-13 17:11:05 +02:00
Joas Schilling
b5beaf7ef4
Use the share_folder config for remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 14:30:25 +02:00
Lukas Reschke
64c1cee027
Remove duplicate dependencies entry 
🙈

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-06-13 14:02:34 +02:00
Lukas Reschke
633396001f
Prevent sending second WWW-Authenticate header 
Overrides \Sabre\DAV\Auth\Backend\AbstractBearer::challenge to prevent sending a second WWW-Authenticate header which is standard-compliant but most DAV clients simply fail hard.

Fixes https://github.com/nextcloud/server/issues/5088

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-06-13 13:54:52 +02:00
Joas Schilling
b7761be4d9 Merge pull request #5302 from nextcloud/fix_5047 
use the email address configured in Nextcloud as sender instead of the users email address
 2017-06-13 12:19:41 +02:00
Joas Schilling
27690e0fb4
Remove unused element 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 11:17:45 +02:00
Morris Jobke
2fe2b5a1d0
Put the quota bar to the bottom 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-13 11:17:45 +02:00
Joas Schilling
b481fa40ef
Adjust the unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 11:17:44 +02:00
Joas Schilling
3a17131995
Remove the colored corners 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 11:17:44 +02:00
Joas Schilling
fcdcd3f283
Add an event so apps can add hidden fields to the files page 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 11:17:44 +02:00
Joas Schilling
b0171a7584
Only set the active item when there is one (not the case for quota) 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 11:17:44 +02:00
Joas Schilling
d8f10e96a2
Content will come from the external app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 11:17:43 +02:00
Joas Schilling
06a925d888
Remove useless translation and make it better on unlimited 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 11:17:43 +02:00
Jan-Christoph Borchardt
3f549609b9
Style quota entry in files view 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-06-13 11:17:43 +02:00
Joas Schilling
0554dba69e
Add quota to the files view 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 11:17:42 +02:00
Bjoern Schiessle
ceab119c29
fix config switch description, this is only about searching for users, to enable/disable the possibility to publish users data we have a seperate config switch below 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-13 10:35:06 +02:00
Morris Jobke
6a06df824e Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docs 
Version and dependency are now required
 2017-06-12 22:33:16 -05:00