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

40155 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
c9d2e31d52
Remove old code + add Middleware 
* Add proper middleware for shareinfo
* Remove old shareinfo routes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-10 13:49:09 +02:00
Roeland Jago Douma
8a539ec0f6
Move shareinfo over to proper controller 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-10 13:49:06 +02:00
Roeland Jago Douma
073216e827 Merge pull request #6057 from nextcloud/fix-require-once 
Fix require once for actionInclude
 2017-08-10 07:52:21 +02:00
Nextcloud bot
0ef9f943b2
[tx-robot] updated from transifex 2017-08-10 00:08:15 +00:00
Morris Jobke
5aa25fcdd5 Fix require once for actionInclude 
* regression from #5791

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-09 23:51:49 +02:00
Morris Jobke
0b1a1a58e6 Merge pull request #6051 from nextcloud/redis-cluster 
Enable redis cluster CI step
 2017-08-09 23:03:50 +02:00
Morris Jobke
f83a783d91 Fix redis-cluster support on drone 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-09 22:45:25 +02:00
Morris Jobke
3b955a1625 Merge pull request #5791 from nextcloud/add-php7.2-tests 
[CI] Add PHP 7.2 testing container
 2017-08-09 22:08:02 +02:00
Roeland Jago Douma
c6f6413bb1
Fix ldap tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 21:10:15 +02:00
Roeland Jago Douma
c81e79f8b9
Fix files_sharing CacheTests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 16:15:27 +02:00
Roeland Jago Douma
1ea7f14f0a
Fix SessionTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 16:13:54 +02:00
Roeland Jago Douma
26bf0ca9d4
Fix RepairMimeTypeTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 16:04:57 +02:00
Roeland Jago Douma
db27bbf90d
Fix CacheTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 16:01:09 +02:00
Roeland Jago Douma
ba7cf03daf
Fix LostControllerTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 15:51:13 +02:00
Roeland Jago Douma
9717cdfb9e
If there is no content don't error 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 15:51:13 +02:00
Roeland Jago Douma
459ae6d94a
User proper anonymous function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 15:51:12 +02:00
Roeland Jago Douma
8b0051eb40
Fix encryption test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 15:51:08 +02:00
Roeland Jago Douma
3bd104ef7c
Fix LoginController 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-09 15:12:02 +02:00
Lukas Reschke
70d42afb93
Use non-deprecated INTL_IDNA_VARIANT_UTS46 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-09 15:12:02 +02:00
Lukas Reschke
c78e999b21
Make definition compatible 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-09 15:12:02 +02:00
Lukas Reschke
0857780eb0
Update PHP 7.2 container 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-09 15:12:01 +02:00
Lukas Reschke
e9dc4f107a
Make declaration compatible 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-09 15:12:01 +02:00
Lukas Reschke
db6d785644
Add PHP 7.2 testing container 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-09 15:12:01 +02:00
Morris Jobke
e08768ee04 Merge pull request #6047 from nextcloud/fix-6017-select-indexed-columns 
Use indexed column path_hash to find the parent
 2017-08-09 13:53:23 +02:00
Morris Jobke
c2f7396d6b Merge pull request #6031 from nextcloud/master-5937 
display error icon on non-success
 2017-08-09 13:44:34 +02:00
Morris Jobke
bcfaaf5294 Merge pull request #6048 from nextcloud/fix-migration-generation 
Fix typo in template for migration generation
 2017-08-09 13:42:36 +02:00
Morris Jobke
576f370ddc Merge pull request #6009 from nextcloud/symfony_translations 
Use symfony/translation for L10N plurals
 2017-08-09 13:41:10 +02:00
Morris Jobke
395325d5c5 Merge pull request #6049 from nextcloud/drone-update 
Update syntax to drone 0.8
 2017-08-09 12:30:12 +02:00
Marin Treselj
09d77b8973 Display success and error icons 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-09 11:12:48 +02:00
Morris Jobke
428b8b53a5 Update syntax to drone 0.8 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-09 11:10:21 +02:00
Joas Schilling
f877096a28
Fix typo in template for migration generation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-09 11:01:08 +02:00
Joas Schilling
66b61eb67d
Use indexed column path_hash to find the parent 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-09 10:56:16 +02:00
Nextcloud bot
8549fcf6e4
[tx-robot] updated from transifex 2017-08-09 00:08:20 +00:00
Lukas Reschke
9707ef9ba7 Merge pull request #5982 from nextcloud/fix-loading-icon-inside-upload-button-in-theming-app 
Fix loading icon inside upload button in Theming app
 2017-08-08 18:41:57 +02:00
Maxence Lange
efa062e5ff display error icon on non-success 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-08-08 16:30:48 +02:00
Morris Jobke
d7645ee928 Merge pull request #5972 from nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button 
Replace loading icon GIF with pure CSS in login button
 2017-08-08 14:40:35 +02:00
Nextcloud bot
481002a00b
[tx-robot] updated from transifex 2017-08-08 00:08:10 +00:00
Roeland Jago Douma
ed3b391e47
Use symfony/translation for L10N plurals 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-07 19:53:36 +02:00
Daniel Calviño Sánchez
2398e845c9 Fix loading icon inside upload button in Theming app 
Pull request #5969 fixed the vertical alignment of loading icon and
status message in Theming app, but in doing so it broke the loading icon
inside the upload button.

When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-07 15:04:43 +02:00
Daniel Calviño Sánchez
92d28fdc68 Ignore clicks on login button icon so they are received by the button 
Visually, the icon positioned on the login button is part of the login
button, so clicking on the icon should be the same as clicking on the
button. As the icon is a different element this commit sets the icon to
ignore mouse events so they are received and handled by the login button
instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-07 14:28:04 +02:00
Morris Jobke
de911f6e5c Merge pull request #5998 from nextcloud/drone_mysqlmb4_71 
Add mysqlmb4 php7.1 drone job
 2017-08-07 08:48:23 +02:00
Roeland Jago Douma
e64ba1d343
Add mysqlmb4 php7.1 drone job 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-06 20:13:04 +02:00
Morris Jobke
7a3d746d0d Merge pull request #5997 from nextcloud/drone_mysqlmb4_70 
Add myslqmb4 php 7.0 drone
 2017-08-06 14:44:28 +02:00
Roeland Jago Douma
68d6e788e4
Add myslqmb4 php 7.0 drone 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-06 13:07:34 +02:00
Morris Jobke
1247bd8755 Merge pull request #5995 from nextcloud/drone_mysql_71 
Add PHP 7.1 mysql job to drone
 2017-08-06 12:32:59 +02:00
Roeland Jago Douma
5164f25a54
Add PHP 7.1 mysql job to drone 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-06 10:45:10 +02:00
Roeland Jago Douma
2d7e7212fa Merge pull request #5990 from nextcloud/drone_mysql_70 
Also run mysql test on php7.0
 2017-08-06 10:35:57 +02:00
Nextcloud bot
eb2442b871
[tx-robot] updated from transifex 2017-08-06 00:08:24 +00:00
Roeland Jago Douma
c0f9a397d7
Also run mysql test on php7.0 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-05 19:59:37 +02:00
Nextcloud bot
21f2fe5cb9
[tx-robot] updated from transifex 2017-08-05 00:08:08 +00:00