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

48915 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
8432583dc6
Merge pull request #14813 from nextcloud/fix/sentry/unset 
Check if elements are set in installer
 2019-03-25 08:57:34 +01:00
Roeland Jago Douma
fb1e555b5a
Merge pull request #14816 from nextcloud/dependabot/npm_and_yarn/build/handlebars-4.1.1 
Bump handlebars from 4.1.0 to 4.1.1 in /build
 2019-03-23 12:33:24 +01:00
Roeland Jago Douma
b04bdad65e
Merge pull request #14812 from nextcloud/bugfix/noid/collections-access-type 
Force boolean type for access parameter
 2019-03-23 12:32:59 +01:00
Roeland Jago Douma
d94b56d5e4
Merge pull request #14805 from nextcloud/fix/backgroundrepair 
Properly inject EventDispatched in BackgroundRepair
 2019-03-23 08:24:22 +01:00
dependabot[bot]
f410519da4
Bump handlebars from 4.1.0 to 4.1.1 in /build 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/v4.1.1/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-23 02:12:57 +00:00
Roeland Jago Douma
c48582a22f
Merge pull request #14798 from nextcloud/fix/collaboration_translation_string 
Allow string to be translated
 2019-03-22 20:57:33 +01:00
Roeland Jago Douma
df2ee4d607
Merge pull request #14810 from nextcloud/feature/create-user-select-username 
Select the username input after creating a user successfully
 2019-03-22 20:55:47 +01:00
Roeland Jago Douma
f021db956c
Check if elements are set in installer 
Since we now have all the apps from the appstore we need to do a bit
more checking.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-22 16:54:35 +01:00
Roeland Jago Douma
fad750b0b6
Allow string to be translated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-03-22 16:04:53 +01:00
Julius Härtl
826821a7da
Force boolean type for access parameter 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-22 16:00:44 +01:00
Christoph Wurst
a719948c5c
Select the username input after creating a user successfully 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-03-22 14:03:15 +01:00
Roeland Jago Douma
eb783d0eb7
Merge pull request #14802 from nextcloud/print-backupcodes-monospace 
Use monospaced font when printing twofactor backup codes.
 2019-03-22 12:58:38 +01:00
Joachim Bauch
5a786136da
Use monospaced font when printing twofactor backup codes. 
This helps differentiating similar characters like "I" / "1".

Signed-off-by: Joachim Bauch <bauch@struktur.de>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-03-22 11:01:56 +01:00
Roeland Jago Douma
3ecdf743bb
Properly inject EventDispatched in BackgroundRepair 
Else it will just be null when called

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-22 10:29:36 +01:00
Morris Jobke
b1b2378758
Merge pull request #14573 from nextcloud/version/noid/16.0.0beta1 
16.0.0 Beta 1
 2019-03-22 09:23:52 +01:00
Morris Jobke
40a6342206
16.0.0 Beta 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-21 22:37:15 +01:00
Morris Jobke
243cef1c3a
Merge pull request #14058 from vpecinka/master 
Avoid replacement by user object
 2019-03-21 22:36:59 +01:00
Vlastimil Pecinka
1c3abda280
Store user object later in the code 
Signed-off-by: Vlastimil Pecinka <pecinka@email.cz>
 2019-03-21 21:57:47 +01:00
Morris Jobke
973ccd8c5c
Merge pull request #14315 from nextcloud/feature/12033/calendar-user-address-set 
implement principal property search for calendar user address set property
 2019-03-21 21:32:45 +01:00
Morris Jobke
f5c0ea852e
Merge pull request #13721 from oole/bug/12729_postgresql_duplicate_key_value 
Issue 12729 postgresql duplicate key value
 2019-03-21 21:18:32 +01:00
Morris Jobke
f889beae7e
Fix PHPDoc 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-21 17:05:57 +01:00
Georg Ehrke
d74e49b3e6
implement principal property search for calendar user address set property 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-03-21 16:32:41 +01:00
Morris Jobke
5564a302fe
Merge pull request #14790 from nextcloud/bugfix/noid/fix-ocm/ocs-provider-setup-checks 
Fix setup checks for ocm/ocs-provider
 2019-03-21 16:31:15 +01:00
Roeland Jago Douma
432eb98516
Merge pull request #14786 from nextcloud/bugfix/noid/remove-unused-member 
Remove unused member "util"
 2019-03-21 15:00:08 +01:00
Morris Jobke
19db60f1f5
Fix setup checks for ocm/ocs-provider 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-21 14:26:59 +01:00
Joas Schilling
494d737f7e
Remove unused member "util" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-21 12:42:35 +01:00
Ole Ostergaard
0d778fcc4e Code cleanup. 
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
 2019-03-21 11:42:00 +01:00
Ole Ostergaard
63350423d4 Add insertIgnoreConflict to IDBConnection interface. 
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
 2019-03-21 11:42:00 +01:00
Ole Ostergaard
d62da82bf9 Add supression of SqlInjectionChecker. 
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
 2019-03-21 11:42:00 +01:00
Ole Ostergaard
c9b6487393 Add PostgreSQL specific implementation for includeIgnoreConflict. 
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
 2019-03-21 11:42:00 +01:00
Ole Ostergaard
a48ea8cffa Add insertIgnoreConflict to Adapter and use it for for executing the file locking. 
Signed-off-by: Ole Ostergaard <ole.c.ostergaard@gmail.com>
 2019-03-21 11:42:00 +01:00
Morris Jobke
0155edc195
Merge pull request #14778 from nextcloud/user_ldap_createuser_fix 
Fix user creation using LDAP Plugin
 2019-03-21 11:32:22 +01:00
Vinicius Cubas Brand
61572a5b2e
LDAP plugin: force createUser to return new user's DN 
LDAP plugins must change the createUser method to return the DN, as we
need this to update the cache.

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2019-03-21 10:20:46 +01:00
Vinicius Cubas Brand
a2c38148e7
Cache cleaning when subadmin adds user to group 
This commit fix an error happening when the subadmin tries to create an
user, adding him/her to the group s/he is subadmin of, using a LDAP
User/Group plugin.

This just forces the cache to be reset after an user is added to a
group.

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2019-03-21 10:20:46 +01:00
Vinicius Cubas Brand
c4dbc428f9
fix user creation using LDAP Plugin 
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2019-03-21 10:20:46 +01:00
Morris Jobke
651495e3ae
Merge pull request #14776 from nextcloud/fix/files/size-color 
Use max contrast variable to cap the generated colours
 2019-03-21 09:59:07 +01:00
Morris Jobke
2389b616a3
Merge pull request #14695 from nextcloud/enhancement/grid/sharing-in-menu 
Show sharing in menu in grid view
 2019-03-21 09:56:50 +01:00
Morris Jobke
aee0b7693b
Merge pull request #14606 from nextcloud/bugfix/stricter-check-trusted-proxy 
Make check for empty trusted proxies more strict
 2019-03-21 09:15:27 +01:00
John Molakvoæ (skjnldsv)
ec09f121af
Use max contrast variable to cap the generated colours 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-21 08:45:01 +01:00
John Molakvoæ (skjnldsv)
ff164db935
Add link icon for public link too 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-21 08:16:00 +01:00
John Molakvoæ (skjnldsv)
4c884f1b23
Put sharing entry all above 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-21 08:14:24 +01:00
John Molakvoæ (skjnldsv)
4ad922d4f6
Show sharing in menu in grid view 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-21 08:14:16 +01:00
Nextcloud bot
6ea5beccd7
[tx-robot] updated from transifex 2019-03-21 01:13:49 +00:00
Morris Jobke
6fae7ae5ce
Merge pull request #14774 from nextcloud/fix/bundle_enable_tests 
Temp disable bundle tests
 2019-03-20 22:29:56 +01:00
Roeland Jago Douma
093c75802c
Temp disable bundle tests 
The bundle acceptance tests fails after #14578 sometimes. This is
because of a race condition. not all apps have compatible 16 versions
yet. So trying to enable them results in those apps doing 💥.

Because of #14578 we do show them now. So we try to enable them. However
depending on which requests finishes first the disable button for the
audit app either shows up or now.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-20 20:44:11 +01:00
Daniel Kesselberg
ff629ad158
Trigger warning if empty array or false and X-Forwarded-Host is present 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-03-20 20:00:20 +01:00
Roeland Jago Douma
03dc79f665
Merge pull request #14578 from nextcloud/enh/force_enable_apps 
Force enable apps
 2019-03-20 19:22:38 +01:00
Roeland Jago Douma
b72d270a9b
Merge pull request #14753 from nextcloud/revert-13097-feature/11319/where-is-your-data 
Revert "Where is your data?"
 2019-03-20 19:20:50 +01:00
Morris Jobke
f8859e91dd
Merge pull request #14766 from nextcloud/backport/14709/master 
groupname like username - allow share with both
 2019-03-20 19:08:44 +01:00
Morris Jobke
ab7858d1a9 Update lib/private/Share20/Manager.php 
tabulator change

Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
 2019-03-20 15:33:35 +00:00