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

48258 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxence Lange
e87e93debf phpdoc 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-01-31 07:38:00 -01:00
Christoph Wurst
6c47f09d60
Remove unused OC._matchMedia helper 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-31 09:15:13 +01:00
Christoph Wurst
72c88c767c
Use Backbone.noConflict in the bundle as well 
Move the patched Backbone to its own module again

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-31 08:47:30 +01:00
Filis Futsarov
18ae9d267a
Comment fix. 2019-01-30 23:23:09 +01:00
Roeland Jago Douma
85d6d7b87c
Merge pull request #12636 from nextcloud/fix-12597 
handle mail send error gracefully
 2019-01-30 20:05:23 +01:00
Georg Ehrke
16fec60e8f
Add Apple Provisioning profile 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-01-30 19:50:02 +01:00
Daniel Kesselberg
e78f4cec15
Don't cast tokenId to string 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-01-30 19:10:59 +01:00
Daniel Kesselberg
a687a657e8
Add test for destroy with invalid user 
Some code cleanup
- willReturn instead of will(returnValue)
- Annotation for mocked objects

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-01-30 19:10:59 +01:00
Daniel Kesselberg
17b82c5d76
Add token name for delete activity 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-01-30 19:10:58 +01:00
Daniel Kesselberg
f24fa2051d
Publish event for app token create/update/delete 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-01-30 19:10:53 +01:00
Daniel Kesselberg
9104e028a3
Remove deleteFromOpcodeCache & clearOpcodeCache 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-01-30 17:36:14 +01:00
Morris Jobke
be6475784a
Merge pull request #13924 from nextcloud/fix/initial-state-key 
Add a key parameter to the new initial state API
 2019-01-30 17:07:36 +01:00
Daniel Kesselberg
1638f89e89
Don't call apc_delete_file and apc_clear_cache anymore 
There is no apc for PHP7+ so there is no need to check if exist.
accelerator_reset looks even more ancient.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-01-30 16:28:47 +01:00
Morris Jobke
681437d23d
Merge pull request #12785 from nextcloud/head-menu-half-height-fix 
Unify headers menu design, fix click area
 2019-01-30 16:25:30 +01:00
Christoph Wurst
7e3e3bed50
Fix typos and unused return values 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-30 16:08:46 +01:00
Christoph Wurst
0e6cb988a1
Add a key parameter to the new initial state API 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-30 16:08:08 +01:00
Roeland Jago Douma
49ae3a3daa
Merge pull request #13903 from nextcloud/refactor/ocp-appconfig-comments-whatsnew-bundle 
Move OCP.AppConfig, OCP.Comments and OCP.WhatsNew to the server bundle
 2019-01-30 15:51:36 +01:00
Bjoern Schiessle
8ed004d6ae
fix typo 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-30 15:25:07 +01:00
Bjoern Schiessle
ab01402599
log full exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-30 15:25:07 +01:00
Bjoern Schiessle
a94358062d
handle mail send error gracefully 
log the error in case a notification mail of a new share couldn't
be send to the recipient and finish the share operation successfully

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-30 15:25:07 +01:00
Morris Jobke
29a5661614
Merge pull request #13908 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/vue-loader-15.6.2 
Bump vue-loader from 15.6.1 to 15.6.2 in /apps/accessibility
 2019-01-30 15:03:56 +01:00
dependabot[bot]
c14ff3a0bf
Merge pull request #13907 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-loader-15.6.2 2019-01-30 13:15:30 +00:00
Christoph Wurst
9a46c9ed31
Move OCP.AppCOnfig, OCP.Comments and OCP.WhatsNew to the server bundle 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-30 13:56:01 +01:00
Morris Jobke
fda74eb9b9
Merge pull request #13891 from nextcloud/remove-external-failure-notification 
Remove warning in case of external storage error
 2019-01-30 11:54:20 +01:00
Roeland Jago Douma
95d1cf4817
Merge pull request #13412 from nextcloud/forward-password-policy 
forward error message from password policy
 2019-01-30 11:12:02 +01:00
dependabot[bot]
7f5d20b04f
Bump vue-loader from 15.6.1 to 15.6.2 in /apps/accessibility 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.1 to 15.6.2.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-30 11:05:07 +01:00
dependabot[bot]
de573cedd7
Bump vue-loader from 15.6.1 to 15.6.2 in /apps/updatenotification 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.1 to 15.6.2.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-30 10:44:12 +01:00
John Molakvoæ (skjnldsv)
818c23d9f1
Scrolling on apps popovermenu 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-01-30 10:30:20 +01:00
John Molakvoæ
53fd4997cc
Merge pull request #12364 from tomasz-grobelny/file_range_select 
Ability to select file ranges with mouse or touchscreen
 2019-01-30 10:21:23 +01:00
Roeland Jago Douma
ecc8cccc42
Merge pull request #13237 from rcdailey/nfs-write-checks 
Improve data directory write checking for NFS mounts
 2019-01-30 09:36:50 +01:00
Roeland Jago Douma
502c0df2d9
Merge pull request #13752 from rummatee/issue7629 
fix opacity for add-new-folder button
 2019-01-30 09:25:47 +01:00
Roeland Jago Douma
0769829615
Merge pull request #13830 from nextcloud/fix/shared_versions 
Allow shared versions again in legacy backend
 2019-01-30 09:21:11 +01:00
Roeland Jago Douma
7b67ebe99f
Merge pull request #13897 from nextcloud/fix-updating-the-password-of-a-link-share-when-passwords-are-enforced 
Fix updating the password of a link share when passwords are enforced
 2019-01-30 09:16:05 +01:00
Roeland Jago Douma
60ae0a4757
Merge pull request #13886 from nextcloud/trashbin-original-location-fallback 
add fallback for trashbin original location
 2019-01-30 09:02:11 +01:00
Roeland Jago Douma
9d4e71f64d
Merge pull request #13646 from nextcloud/enh/13488/initialstate 
Allow apps to register an initial state
 2019-01-30 08:36:23 +01:00
Roeland Jago Douma
f30877ea7c
Provide initial state 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-29 22:21:54 +01:00
Roeland Jago Douma
139055c1dd
Merge pull request #13880 from nextcloud/enh/expose_subadmin_to_ocp 
Expose subadmin to OCP
 2019-01-29 22:13:41 +01:00
Roeland Jago Douma
6b653635a7
Merge pull request #13881 from nextcloud/refactor/jquery-plugins-bundle 
Move jQuery plugins into modules and add them to the bundle
 2019-01-29 22:09:12 +01:00
Tomasz Grobelny
08919eb193 Merge branch 'master' into operation_progress_improvements3 
Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
 2019-01-29 21:26:44 +01:00
Roeland Jago Douma
15abcff2a1
Expose subadmin to OCP 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-29 20:47:35 +01:00
Daniel Calviño Sánchez
2c151f4efb Fix updating the password of a link share when passwords are enforced 
The password input was shown in the popup menu when passwords were not
enforced, or when they were enforced but no password was set, which
prevented updating/changing the password once set. As the password input
should be shown too when password are enforced and a password is set no
condition is needed, so now the password input is always shown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-29 20:26:22 +01:00
Roeland Jago Douma
deb7d2364f
Merge pull request #13869 from nextcloud/enh/clean_pending_2fa_session_on_password_change 
Clean pending 2FA authentication on password reset
 2019-01-29 19:50:15 +01:00
Michael Weimann
6c52821389
Make the where is your data section optional 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-29 19:42:12 +01:00
Maxence Lange
b8e324177e removing default value in param $chunk 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-01-29 17:13:29 -01:00
Maxence Lange
adde9a685c +generateChunks() 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-01-29 16:53:49 -01:00
John Molakvoæ (skjnldsv)
812567ae58
Remove warning in case of external storage error 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-01-29 16:23:04 +01:00
Roeland Jago Douma
050b9135d5
Merge pull request #13883 from nextcloud/fix-dropping-a-folder-on-a-folder-row 
Fix dropping a folder on a folder row
 2019-01-29 15:44:21 +01:00
Robin Appelman
9a220214b8
add fallback for trashbin original location 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-29 15:14:04 +01:00
Morris Jobke
754932c756
Merge pull request #13865 from nextcloud/fix/noid/ldap-pagedsearch-multiplebases 
fix paged search with multiple bases (LDAP)
 2019-01-29 14:22:33 +01:00
Roeland Jago Douma
ac8a6e2244
Clean pending 2FA authentication on password reset 
When a password is reste we should make sure that all users are properly
logged in. Pending states should be cleared. For example a session where
the 2FA code is not entered yet should be cleared.

The token is now removed so the session will be killed the next time
this is checked (within 5 minutes).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-29 13:08:56 +01:00