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

40250 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
b53c4c0db9
Fix template functions 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
a4ffbc09ec
Fix lib/public/User.php 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
c25e782dd6
Fix settings/Controller/ 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Roeland Jago Douma
e1da8a769b
AppData is no longer internal 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:15 +02:00
Roeland Jago Douma
75771a108b
Fix OCSController 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:15 +02:00
Roeland Jago Douma
e945f2bc3a
Fix ContactsMenuController 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:15 +02:00
Roeland Jago Douma
aa6d8fcdbf
Fix AvatarController 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
d321e9792e
Add |null to PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
28098a7602
Fix \OCP\Util 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
80b649c471
Suppress deprecated function in \OCP\JSON 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
5424d6a40d
Add proper PHPDoc 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
b4d4db0e39
Take IUser instead of User 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
084bac3530
Return '0' instead of null 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:15 +02:00
Lukas Reschke
e1f52fc901
Stricter phan config fixes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:13 +02:00
Nextcloud bot
456392e627
[tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Roeland Jago Douma
fa2f122e09 Merge pull request #5890 from nextcloud/fix-403-and-404-redirect 
Fix 403 and 404 redirect
 2017-07-31 22:14:52 +02:00
Roeland Jago Douma
f71dc7523f
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Roeland Jago Douma
3548603a88
Fix middleware implementations signatures 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Roeland Jago Douma
72eb610b3d
Prop argument type for Middleware 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-31 16:54:19 +02:00
Roeland Jago Douma
973b859cdd Merge pull request #5910 from benediktg/test-php-7.1 
Also test PHP 7.0 with PostgreSQL
 2017-07-31 16:18:48 +02:00
Lukas Reschke
bef4f015ee
Remove setUidAsDisplayName 
This code is a leftover from the old Shibboleth implementation from ownCloud days, nowadays it causes more issues than it does good (such as https://github.com/nextcloud/user_saml/pull/137). Let's remove it for the future thus.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-31 15:52:53 +02:00
Marin Treselj
f53db38c03 Change id to class in the main share template 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-31 12:19:19 +02:00
Benedikt Geissler
8a3f3e8c4a Drop PHP 7.1 test 
Signed-off-by: Benedikt Geissler <benedikt@g5r.eu>
 2017-07-31 12:12:55 +02:00
Benedikt Geissler
ade7d89e36 Also test PHP 7.0 and 7.1 with PostgreSQL 
Signed-off-by: Benedikt Geissler <benedikt@g5r.eu>
 2017-07-31 12:12:55 +02:00
Morris Jobke
7b2c08a31a Merge pull request #5905 from nextcloud/ocp-config 
Use IConfig instead of static OCP\Config
 2017-07-31 10:54:40 +02:00
Roeland Jago Douma
3c4ac6060a Merge pull request #5908 from nextcloud/add-css-icon 
Add css class for toogle preview icon
 2017-07-31 08:59:36 +02:00
Roeland Jago Douma
baee0b4bcc Merge pull request #5913 from nextcloud/fix-anchor-name 
Fix anchor name for federated sharing settings
 2017-07-31 08:51:23 +02:00
Roeland Jago Douma
13469ec49c Merge pull request #5922 from nextcloud/master-add-brackets-on-concat-method 
[master]Add brackets around concat statements so comparing the result works as intended
 2017-07-31 08:49:59 +02:00
Morris Jobke
a309fa7d6b Disable default activity email for incoming shares 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-31 08:19:54 +02:00
Nextcloud bot
97d06a7698
[tx-robot] updated from transifex 2017-07-31 00:08:02 +00:00
Nextcloud bot
98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot
b43abf7512
[tx-robot] updated from transifex 2017-07-29 00:08:31 +00:00
Joas Schilling
50912fb94f
Add brackets around concat statements so comparing the result works as intended 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-28 15:36:26 +02:00
Marin Treselj
086ce709f7 Fixes nextcloud/gallery#269 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-28 14:44:29 +02:00
Morris Jobke
09e7d12157 Merge pull request #5915 from nextcloud/update-drone 
Update drone
 2017-07-28 12:15:40 +02:00
Morris Jobke
c85b7e6ae3 Move all DB tests to top, because they are long running 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-28 09:21:24 +02:00
Morris Jobke
0948365809 Update all drone images to latest version 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-28 09:20:28 +02:00
Morris Jobke
c43abe43b0 Send an email once a file/folder is shared with a user 
* only if user has set an email address
* only for user shares (no group shares for now)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-28 08:36:11 +02:00
Morris Jobke
fae327799b Fix anchor name for federated sharing settings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-28 08:21:25 +02:00
Nextcloud bot
baa6db3539
[tx-robot] updated from transifex 2017-07-28 00:08:05 +00:00
Morris Jobke
dc58206ded Merge pull request #5852 from nextcloud/preview_trash_cleanup 
Preview trash cleanup
 2017-07-27 17:24:47 +02:00
Morris Jobke
2bc924af96 Add css class for toogle preview icon 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-27 17:13:12 +02:00
Morris Jobke
c7757b07f8 Merge pull request #5644 from nextcloud/add-occ-app-install 
add occ app:install command
 2017-07-27 15:36:30 +02:00
Lukas Reschke
f22ab3e665
Add metadata to \OCP\AppFramework\Http\Response::throttle 
Fixes https://github.com/nextcloud/server/issues/5891

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-27 14:17:45 +02:00
Morris Jobke
c27498db71 Use IConfig instead of static OCP\Config 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-27 13:43:18 +02:00
Morris Jobke
63aa12e38c Merge pull request #5895 from nextcloud/fix-password-change 
Fix show password button for password change
 2017-07-27 13:29:13 +02:00
Nextcloud bot
65ade4b6d5
[tx-robot] updated from transifex 2017-07-27 00:08:03 +00:00
Morris Jobke
8f0a0c805e Fix show password button for password change 
* fix the show password button on the personal page
* before: if the password change failed the show password icon was not shown again
* after: show password icon is visible

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-26 22:54:23 +02:00
Morris Jobke
50b355fa84 Merge pull request #5614 from nextcloud/fix-enabling-external-storage-via-web 
Allow to enable the external storage app via the web ui
 2017-07-26 22:30:29 +02:00
Lukas Reschke
eb8cd4b80e Merge pull request #5888 from nextcloud/overlay-on-show-password 
This fix the overlay of the complexity bar
 2017-07-26 16:55:54 +02:00