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

6770 Commits

Author SHA1 Message Date
Joas Schilling 5d486478d3 Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-group 
Subadmin check on removing user from group
 2017-01-23 12:10:06 +01:00
Lukas Reschke bde1150d04 Merge pull request #3004 from nextcloud/fix-installation-css 
Fixed installation page
 2017-01-22 18:28:33 +01:00
Morris Jobke 12e3b357d4
Fix default of mail_smtpmode - fixes #3102 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-19 19:59:53 -06:00
Bjoern Schiessle cdf01feba7
add action to existing brute force protection 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-18 15:25:16 +01:00
Bjoern Schiessle 32e0ec3e58
handle optional annotation parameters 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-18 15:25:16 +01:00
Joas Schilling 29a0a23918
Fix the regex for annotations with values 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-18 15:25:16 +01:00
Bjoern Schiessle df296249d6
introduce brute force protection for api calls 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-18 15:25:15 +01:00
Joas Schilling 55db07a20b
Fix CamelCasing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-18 11:45:26 +01:00
Lukas Reschke 4009d3db03 Merge pull request #3116 from nextcloud/spreed-turnserver-secret-is-sensitive 
Make sure the spreed TURN server secret stays a secret
 2017-01-17 14:49:43 +01:00
Joas Schilling ce973929e8 Merge pull request #3075 from nils/debug-no-versionhash 
Do not add version hash in debug mode
 2017-01-17 11:44:50 +01:00
Joas Schilling 30b9262a5a
Make sure the spreed TURN server secret stays a secret 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-17 11:29:10 +01:00
Joas Schilling aea1b72f54 Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions 
Markdown support for app descriptions
 2017-01-17 11:11:16 +01:00
Christoph Wurst 012708e1ba Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs 
Filter out sensitive appconfig values
 2017-01-17 11:01:42 +01:00
Nils ba3506c431 [Enhancement] Do not add version hash in debug mode 
Signed-off-by: Nils <git@to.nilsschnabel.de>
 2017-01-15 13:29:32 +01:00
Joas Schilling fcfb4205bc
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:43 +01:00
Joas Schilling 587eca3ccd
Remove the magic parsing of the description 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:42 +01:00
Joas Schilling 91beb178a7 Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation 
Change the row-format before changing the collation
 2017-01-13 14:43:06 +01:00
Morris Jobke 622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements 
create new encryption keys on password reset and backup the old one
 2017-01-13 11:28:43 +01:00
Joas Schilling 77b5d7bc86
Change the row-format before changing the collation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-12 16:54:29 +01:00
Joas Schilling 5dc6899d1a
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-12 10:49:22 +01:00
Roeland Jago Douma 005ce8aaf6 Merge pull request #3007 from Loki3000/master 
Remove non required db requests
 2017-01-11 12:37:54 +01:00
Joas Schilling ce7836378c
Filter out sensitive appconfig values 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-11 11:42:36 +01:00
Roeland Jago Douma 447e388ce9 Merge pull request #2744 from nextcloud/oc_26324 
[downstream] Fix DAV stat cache to properly cache 404
 2017-01-11 08:16:40 +01:00
Roeland Jago Douma f515c6db4a Merge pull request #2745 from nextcloud/oc_26590 
[downstream] Skip local shares in bkg scan and occ files:scan (#26590)
 2017-01-11 08:16:12 +01:00
Roeland Jago Douma a90cbb0f09 Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully 
Handle log_type "nextcloud" more gracefully
 2017-01-11 08:14:24 +01:00
John Molakvoæ (skjnldsv) e4b3ba6590
Create unified css file and merge all needed data into this file 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-10 17:50:29 +01:00
Bjoern Schiessle fcda3a20f4
create new encryption keys on password reset and backup the old one 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-10 17:04:32 +01:00
Roeland Jago Douma 00b17c3af5
Only check for local shared storages 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-10 16:14:21 +01:00
Vincent Petry 706655ef20
Skip local shares in bkg scan and occ files:scan (#26590) 
Local shares should only be scanned when doing it for the owner to
avoid repeatedly rescanning the same shared storage over and over again
for every recipient.
 2017-01-10 16:11:45 +01:00
Loki3000 7e06f051c9 remove non required sql requests 
```
SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = '';
```
 2017-01-10 17:16:56 +03:00
Loki3000 8ab16f87ac spaces added 2017-01-10 16:44:14 +03:00
Loki3000 6a74f7db11 spaces added 2017-01-10 16:43:43 +03:00
Loki3000 5c77923360 allowed '0' uid 2017-01-10 16:39:10 +03:00
Loki3000 b7e6c5ecdf allowed '0' uid 2017-01-10 16:37:18 +03:00
Morris Jobke 30689f338f Merge pull request #2914 from nextcloud/logrotate-logfile 
Get the logfile location while running the logrotate cron job instead…
 2017-01-10 14:28:09 +01:00
Morris Jobke 4dd2a1e679 Merge pull request #2943 from nextcloud/kill_old_preview_code 
Cleanup old preview code
 2017-01-10 13:50:14 +01:00
Roeland Jago Douma a5bf14ada3 Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares 
share by mail should continue to work, even if public links are disabled
 2017-01-10 13:06:20 +01:00
Joas Schilling 7fa063ceca
Better fallback for unknown log types 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-10 12:59:13 +01:00
Loki3000 74a2938f8e fix spaces 2017-01-10 14:21:23 +03:00
Loki3000 5262779101 fix brackets 2017-01-10 13:29:35 +03:00
Loki3000 b0ff59d42f remove non required db requests 2017-01-10 13:09:33 +03:00
John Molakvoæ (skjnldsv) 67467873c2
Removed jquery scss 
- Switched to setup.css
- Disable scss when displaying the update page
- Improved setup css
- Fixed loading failure of other styles on setup & update page
- Improved scss compiler with an ignore scss compilation option

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-10 11:06:03 +01:00
Loki3000 33259b41cd remove non required db requests 2017-01-10 13:05:21 +03:00
Roeland Jago Douma b847dfcee9 Merge pull request #2925 from nextcloud/remove-close-wrapper 
replace close:// streamwrapper with CallBackWrapper
 2017-01-10 10:21:10 +01:00
Loki3000 135198bf0d Default value for null user 
For guest users on every request executes query:
SELECT `uid`, `displayname` FROM `users` WHERE LOWER(`uid`) = LOWER(null)
as I see, uid can't be equal to null by design.
 2017-01-09 23:34:23 +03:00
Lukas Reschke 307d45e3bd Merge pull request #2987 from nextcloud/no-empty-bundle 
dont write a certificate bundle if the shipped ca bundle is empty
 2017-01-09 21:10:11 +01:00
Morris Jobke 9a5b9d8555 Merge pull request #2992 from nextcloud/fix_subdir_install_style 
Fix subdir install style
 2017-01-09 18:37:08 +01:00
Robin Appelman 817e974c5f
dont write a certificate bundle if the shipped ca bundle is empty 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-09 16:51:27 +01:00
Roeland Jago Douma dec4b26355
Fix subdir install style 
* We need to pass the serverroot so that it can include the right files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-09 16:19:54 +01:00
Joas Schilling fee18d6c78 Merge pull request #2814 from nextcloud/appstore_etag_validation 
Add ETag validation to appstore requests
 2017-01-09 14:56:20 +01:00