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

45860 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Wurst
79a0ee4f4a
Consolidate personal two-factor provider settings 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-02 22:56:33 +02:00
Morris Jobke
6b730b4c47
Merge pull request #11390 from nextcloud/feature/11043/apptoken_v3 
Apptoken v3: imrpove token handling on external password change
 2018-10-02 21:45:10 +02:00
Morris Jobke
19d552e00b
Merge pull request #11336 from nextcloud/bugfix/3342/database-name-prefix-sqlite 
Allow --database-name and --database-table-prefix for sqlite from occ
 2018-10-02 21:44:03 +02:00
Morris Jobke
34751e05a6
Merge pull request #11553 from nextcloud/header-overflow 
Fix header overflow, fix more apps menu, fix #11552
 2018-10-02 21:30:11 +02:00
Morris Jobke
c70e3c55e4
Merge pull request #11549 from nextcloud/feature/background_job_to_check 
Add job to check users for backup code reminders
 2018-10-02 20:42:17 +02:00
Roeland Jago Douma
36bf522c8b
Add job to check users for backup code reminders 
Now that we can enforce 2FA we also should notify users that have
enabled 2FA but do not yet have backup codes generated.

This adds a repair step that inserts a background job to do this.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 20:41:56 +02:00
Christoph Wurst
98bac99522
Merge pull request #11484 from nextcloud/babel-fix-and-dynamic-import-settings 
Babel fix and dynamic import settings
 2018-10-02 20:41:39 +02:00
Morris Jobke
00569a0173
Merge pull request #8282 from Cybso/config-logfilemode 
Make logfile's mode configurable.
 2018-10-02 20:28:01 +02:00
Morris Jobke
4de134385f
Merge pull request #11111 from kevin147147/patch-4 
Added kinetic scrolling for iOS to apps dropdown menu
 2018-10-02 20:25:07 +02:00
Jan-Christoph Borchardt
2665965918
Fix header overflow, fix more apps menu, fix #11552 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-02 20:16:20 +02:00
Roeland Jago Douma
19f84f7b54
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 19:50:54 +02:00
Roeland Jago Douma
d9febae5b2
Update all the publickey tokens if needed on web login 
* On weblogin check if we have invalid public key tokens
* If so update them all with the new token

This ensures that your marked as invalid tokens work again if you once
login on the web.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 19:50:54 +02:00
Roeland Jago Douma
00e99af586
Mark token as invalid if the password doesn't match 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 19:50:44 +02:00
Roeland Jago Douma
efef053960
Add column to DB to store expired passwords 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 19:50:44 +02:00
Roeland Jago Douma
0c18b4decc
Merge pull request #11185 from nextcloud/bugfix/noid/redirect-guests-to-login-on-mention-notification 
Redirect guests to login if they follow the link of a comment mention…
 2018-10-02 19:43:09 +02:00
Morris Jobke
01082d04fd
Merge pull request #10909 from nextcloud/feature/noid/trash-add-droppable-zone 
Added Trash-Dropzone to easily dispose of files and folders
 2018-10-02 19:36:38 +02:00
Morris Jobke
7005ff420e
Fix tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-02 18:37:57 +02:00
Roland Tapken
d17856a1e9
Make logfile's mode configurable. 
The file logger currently resets the mode of the logfile to 0640.

When the webserver is running as a different user than the cron job
(but both are in the same group) the files mode has to be 0660. The
current implementation breaks logging for the user that is not the
owner of the logfile.

This patch introduces a new config option 'logfilemode' that expects
an octal value (defaults to 0640). Unless the value is lower or equal
than 0 the logfiles mode will be resetted to this value.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-10-02 18:27:06 +02:00
John Molakvoæ (skjnldsv)
834f3df19a
Fix generateUrl for webpack 
OC.generateUrl(OC.linkTo('contacts', 'js/')) will append index.php, we
should not have that!

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-02 17:26:08 +02:00
John Molakvoæ (skjnldsv)
b7d82e9262
Bump check script 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-02 17:26:07 +02:00
John Molakvoæ (skjnldsv)
5cec23d840
Babel fix and dynamic import on settings 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-02 17:26:07 +02:00
Roeland Jago Douma
c2ef47ee13
Merge pull request #10757 from coliff/patch-1 
remove  type="text/javascript" from index.html
 2018-10-02 17:21:13 +02:00
Roeland Jago Douma
3aa3fb4709
Merge pull request #11526 from nextcloud/3rdparty/symfony/3.4.16 
[3rdparty] Bump symfony packages to 3.4.16
 2018-10-02 17:17:07 +02:00
Roeland Jago Douma
ac8d4b2f31
Merge pull request #11527 from nextcloud/fix/10926/share_indexes 
Add uid_owner and uid_initiator share tabe indices
 2018-10-02 17:16:07 +02:00
Morris Jobke
25790ece89
Merge pull request #11536 from nextcloud/adjust-dialog-radius 
Adjust border-radius-large to fit with padding of modals
 2018-10-02 17:15:59 +02:00
Roeland Jago Douma
67c76ffcea
Merge pull request #11535 from nextcloud/bugfix/11031/theming-unsafe-eval 
Manually instantiate jscolor to avoid csp errors
 2018-10-02 16:43:05 +02:00
Jan-Christoph Borchardt
79317975e6
Adjust border-radius-large to 10px 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-02 11:33:49 +02:00
John Molakvoæ
afef15b07b
Merge pull request #11500 from nextcloud/enhancement/revamp-2fa-login-provider-selection 
Improve 2FA provider selection screen
 2018-10-02 10:37:18 +02:00
Christoph Wurst
d01905200a
Merge pull request #11433 from nextcloud/feature/all_lax_cookies2 
Make authenticated cookies lax
 2018-10-02 10:28:05 +02:00
Julius Härtl
4f19466108
Manually instantiate jscolor to avoid csp errors 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-02 10:16:45 +02:00
Roeland Jago Douma
5581e0e9eb
Merge pull request #11084 from nextcloud/feature/qbmapper-insert-or-update 
Add QBMapper::insertOrUpdate()
 2018-10-02 10:03:31 +02:00
Morris Jobke
ac1d291b72
Merge pull request #11529 from nextcloud/breadcrumbs-fix 
Fix breadcrumbs
 2018-10-02 08:58:27 +02:00
Joas Schilling
e375107aa4
Redirect guests to login if they follow the link of a comment mention-notification 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-02 08:40:34 +02:00
Felix Nüsse
df7e016104
Refactored Variablename to trashElement 
Signed-off-by: Felix Nüsse <Felix.nuesse@t-online.de>
 2018-10-02 08:15:05 +02:00
Felix Nüsse
91d1154ee0
Fixed highlightdelay on first drag 
Signed-off-by: Felix Nüsse <Felix.nuesse@t-online.de>
 2018-10-02 08:15:05 +02:00
Felix Nüsse
5c2360961e
Added Dropzone-Highlighting to Trash 
Signed-off-by: Felix Nüsse <Felix.nuesse@t-online.de>
 2018-10-02 08:15:05 +02:00
Felix Nüsse
2b0fbf7b89
Added Trash-Dropzone to easily dispose of files and folders 
Signed-off-by: Felix Nüsse <Felix.nuesse@t-online.de>
 2018-10-02 08:15:05 +02:00
Christoph Wurst
3f594fc1b7
Document possibly thrown excption of QBMapper::insertOrUpdate 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-02 08:09:28 +02:00
Christoph Wurst
40fdff5b80
Add QBMapper::insertOrUpdate() 
This allows elegant upserts where the entity ID is provided (e.g. by an
external system) and when that data is fed into our database multiple
times.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-02 08:09:27 +02:00
Roeland Jago Douma
7526971c95
Merge pull request #11508 from nextcloud/files-list-width-sharing 
Reduce the min-width of the files table so it works on sharing pages on mobile
 2018-10-02 08:06:28 +02:00
John Molakvoæ (skjnldsv)
a11c31733d
Fix breadcrumbs 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-02 07:55:17 +02:00
Nextcloud bot
77c6e41063
[tx-robot] updated from transifex 2018-10-02 00:12:55 +00:00
Roeland Jago Douma
ff3a210d64
[3rdparty] Bump symfony packages to 3.4.16 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-02 00:03:37 +02:00
Roeland Jago Douma
b82cbe04df
Add uid_owner and uid_initiator share tabe indices 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-01 23:59:36 +02:00
Christoph Wurst
feb5842a7d Restructure and redesign two-factor auth provider selection 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-01 23:58:54 +02:00
Jan-Christoph Borchardt
9cd048c092
Reduce the min-width of the files table so it works on sharing pages on mobile 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-01 23:34:29 +02:00
Roeland Jago Douma
28eaacd59f
Merge pull request #11523 from nextcloud/usermgmt-design 
User management: Fix header text alignment and new user "confirm" button
 2018-10-01 23:31:23 +02:00
Morris Jobke
8799c6ee5b
Merge pull request #11522 from nextcloud/filepicker-design 
Filepicker design improvements
 2018-10-01 22:59:12 +02:00
Jan-Christoph Borchardt
21f3ac0ab0
Widen new user 'confirm' button, fix #10917 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-01 22:42:57 +02:00
Roeland Jago Douma
40a3dbf878
Merge pull request #11521 from nextcloud/enhancement/2fa-provider-icons 
Let 2FA providers provide their custom icons (dark/light)
 2018-10-01 22:31:15 +02:00