mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,106 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

38106 Commits

Author SHA1 Message Date
Nextcloud bot 4b0f50c456
[tx-robot] updated from transifex 2017-04-08 00:07:45 +00:00
Morris Jobke ca9d25169d Merge pull request #4136 from nextcloud/expire-date-for-all-shares 
Unified sharing options
 2017-04-07 17:14:05 -05:00
Roeland Jago Douma 9adfa60eb3 Merge pull request #4255 from nextcloud/appmenu-tappable 
Increase clickable area of app icon
 2017-04-07 22:29:38 +02:00
Roeland Jago Douma 6c0cafb10f Merge pull request #4253 from nextcloud/downstream-27599 
make JobList::next() lock free
 2017-04-07 22:18:40 +02:00
Roeland Jago Douma bf30090be5
Parse date trough moment 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-07 22:16:29 +02:00
Morris Jobke 8838ed4c2e Merge pull request #4244 from nextcloud/welcome-email 
New layout for welcome email
 2017-04-07 14:52:28 -05:00
Jan-Christoph Borchardt 50609f0d7a Increase clickable area of app icon 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-07 21:01:22 +02:00
Jan-Christoph Borchardt 637920f669 Fix share dropdown opacity issue 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-07 20:44:54 +02:00
Jan-Christoph Borchardt 8db3419df1 Fix font-weight of Unshare entry 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-07 20:31:26 +02:00
Jörn Friedrich Dreyer c993c363e0
make JobList::next() lock free 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-07 13:07:09 -05:00
Morris Jobke 4c60360bf7 Merge pull request #4221 from nextcloud/provisioning-api-for-account-info 
Allow to change account info via provisioning api
 2017-04-07 12:48:44 -05:00
Lukas Reschke 8daf3d4a70
Update autoloader 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Lukas Reschke 281ad406e8
Add support for theming 
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Lukas Reschke 1be75e8db8
Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Morris Jobke 0560e69913
New layout for welcome email 
* thanks to @espina2 for make this nice design
* the button says "Set password" if the admin didn't specified a password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-07 12:03:32 -05:00
Lukas Reschke 325f925e14 Merge pull request #4249 from nextcloud/dont-force-accept-language-anymore 
Don't force the use of Accept-Language anymore
 2017-04-07 17:05:09 +02:00
Bjoern Schiessle 11b46389af
adjust to changes in the theming app 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:44:00 +02:00
Bjoern Schiessle 0dc13d098f
reset password field properties before we hide it 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:44:00 +02:00
Bjoern Schiessle c7b1a48da7
add datepicker to the popover 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:44:00 +02:00
Bjoern Schiessle 3bce6a7a6f
allow to edit single files shared by mail. This is useful for collaborative editing documents 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:44:00 +02:00
Bjoern Schiessle 3323d01db1
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:43:59 +02:00
Bjoern Schiessle 676a4c781a
update capabilities 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:43:59 +02:00
Joas Schilling 3d628783d9
Allow to change account info via provisioning api 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-07 12:50:47 +02:00
Joas Schilling 9f3d9b5b23
Don't force the use of Accept-Language anymore 
This is not intended anymore, since it falls back to force english
when the header is not set. Also 0228bc6e66
makes clear that the order should be:

1. User setting
2. Accept language
3. Admin default

This is the case since the commit from above, unless via OCS and DAV.
Both forced to accept-language falling back to english.
By removing the force, it now also matches the w3 priority list:
https://www.w3.org/International/questions/qa-lang-priorities

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-07 11:10:04 +02:00
Nextcloud bot 536650c02f
[tx-robot] updated from transifex 2017-04-07 00:09:11 +00:00
Joas Schilling 287bae8c5f Merge pull request #4153 from nextcloud/fix-upload 
Fix upload of folders in Chrome
 2017-04-06 09:56:41 +02:00
Morris Jobke 6e72fd5f9f
Fix upload of folders in Chrome 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-06 00:50:58 -05:00
Morris Jobke b084ceec3d Merge pull request #4224 from nextcloud/dont-list-on-public-calendar-endpoint 
Don't list on public calendar endpoints
 2017-04-05 20:55:39 -05:00
Nextcloud bot 7d9688c89e
[tx-robot] updated from transifex 2017-04-06 00:07:50 +00:00
Lukas Reschke 63288ebc50
Don't list on public calendar endpoints 
There is no need to allow listing here.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-05 22:43:05 +02:00
Roeland Jago Douma 56797fd695 Merge pull request #3526 from nextcloud/token-save-scope 
Save the scope of an auth token in the session
 2017-04-05 22:05:11 +02:00
Lukas Reschke 1d3e391ad8
Add integration tests for token auth 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-05 17:58:33 +02:00
Robin Appelman baec42e80a
Save the scope of an auth token in the session 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-05 17:58:33 +02:00
Roeland Jago Douma 00558de782 Merge pull request #3781 from nextcloud/fac-56-log-spam-with-external-storages 
Also add the root of external storages to the file id list
 2017-04-05 15:21:38 +02:00
Jos Poortvliet 98312a9a58 Merge pull request #4215 from nextcloud/issue-template 
Rename config section
 2017-04-05 11:01:33 +02:00
Joas Schilling e3a3ff98ab
Rename config section 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-05 11:00:33 +02:00
Roeland Jago Douma 6bdd3a167d Merge pull request #4123 from nextcloud/allow-password-reset-with-email 
Allow to reset the password with the email as an input
 2017-04-05 09:12:41 +02:00
Roeland Jago Douma ddd157a84c Merge pull request #3741 from nextcloud/user-settings-design 
User mgmt settings design improvements
 2017-04-05 09:02:58 +02:00
Nextcloud bot 84035862f7
[tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00
Jan-Christoph Borchardt 94d4d20c39
proper padding for checkboxes in app-settings 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-04 16:49:43 -05:00
Jan-Christoph Borchardt 602819d6ab
correct sorting of user management settings, wording 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-04 16:49:43 -05:00
Morris Jobke fa4107893d Merge pull request #4138 from nextcloud/resources_match_fullid 
Match slashes in ../{id} resource routes
 2017-04-04 15:52:53 -05:00
Morris Jobke b78876236d Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-selection 
Redirect to 2FA selection screen
 2017-04-04 15:47:35 -05:00
Roeland Jago Douma 72b8784e2a Merge pull request #4204 from nextcloud/append-fixes-swift 
fix fseek (Swift backend) against string not resource by removing append support
 2017-04-04 21:15:34 +02:00
Arthur Schiwon 30c95b51fb
fix fseek against string not resource by removing append support 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-04 20:25:59 +02:00
Morris Jobke 52eaf6cfbb Merge pull request #3310 from duritong/patch-1 
only chmod logfile if necessary
 2017-04-04 11:42:26 -05:00
Joas Schilling 75657c1a6e Merge pull request #4071 from nextcloud/issue-173-database-conversion-failure 
Make sure blob columns are correctly converted as parameters
 2017-04-04 16:29:53 +02:00
Lukas Reschke e0227cb458 Merge pull request #2095 from nextcloud/bruteforcesetttings 
Introduce bruteforce settings
 2017-04-04 11:57:43 +02:00
Roeland Jago Douma da178db98e Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12 
Make public links work with master key
 2017-04-04 11:46:13 +02:00
Roeland Jago Douma efb21a948e Merge pull request #4093 from nextcloud/endorse-password-protection 
Endorse password protection
 2017-04-04 11:04:21 +02:00