upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 16:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
39768 commits 1001 branches 1208 tags 8.5 GiB
Commit graph

39768 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
f29384a057 Merge pull request #6243 from nextcloud/stable12-circles-token 
using CircleProvider on token
 2017-08-26 13:49:25 +02:00
Nextcloud bot
2c6bc236cb
[tx-robot] updated from transifex 2017-08-26 00:08:36 +00:00
Roeland Jago Douma
8c0042c30c Merge pull request #6258 from nextcloud/stable12_6244 
[stable12] [drone] Give redis a change to fireup
 2017-08-25 11:29:21 +02:00
Roeland Jago Douma
a9ee70b688
[drone] Give redis a change to fireup 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-25 10:40:02 +02:00
Nextcloud bot
992c91e288
[tx-robot] updated from transifex 2017-08-25 00:09:08 +00:00
Morris Jobke
4c2f194589 Merge pull request #6114 from nextcloud/stable12_5852 
[stable12] Delete trash using node API to trigger preview deletion
 2017-08-24 02:59:44 +02:00
Morris Jobke
5fab554bd2 Merge pull request #6108 from nextcloud/backport-6080-12 
[stable12] Add buttom border for header
 2017-08-24 02:58:03 +02:00
Morris Jobke
1928863ee7 Merge pull request #6233 from nextcloud/stable12_6218 
[stable12] [3rdparty] Fix sabre/xml empty prop parsing
 2017-08-24 02:56:28 +02:00
Nextcloud bot
9baf03d28c
[tx-robot] updated from transifex 2017-08-24 00:09:00 +00:00
Roeland Jago Douma
81acf70bca Merge pull request #6240 from nextcloud/12-6239 
[stable12] Show "Uploading..." in web UI for long uploads
 2017-08-23 19:16:50 +02:00
Maxence Lange
0d4803e6dc using CircleProvider on token 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2017-08-23 16:58:32 +02:00
Morris Jobke
4cf7c351ea Merge pull request #6237 from nextcloud/12-drone-ci-images 
[stable12] Use docker images without XDebug and with Opcache
 2017-08-23 16:48:26 +02:00
Morris Jobke
618014130e Merge pull request #6166 from nextcloud/stable12-bump-dompurify 
[Stable12] Bump dompurify
 2017-08-23 16:43:33 +02:00
Roeland Jago Douma
9b3e70f554 Merge pull request #6151 from nextcloud/backport-6099-no-exception-on-sharee-error 
[stable12] Catch exceptions on error of cloud id resolution
 2017-08-23 15:59:33 +02:00
Roeland Jago Douma
a62620feeb Merge pull request #6148 from nextcloud/backport-6047-select-indexed-columns 
[stable12] Use indexed column path_hash to find the parent
 2017-08-23 15:58:59 +02:00
Morris Jobke
47f87bbf8c
Show "Uploading..." in web UI for long uploads 
If the estimated upload time is bigger than 4 hours it shows the text
"Uploading..." because the time then doesn't give any good hint to the
user anyways.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-23 15:53:48 +02:00
Morris Jobke
b1e268e2c1
Use docker images without XDebug and with Opcache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-23 15:28:25 +02:00
Roeland Jago Douma
96509ae621
[3rdparty] Fix sabre/xml empty prop parsing 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-23 14:33:14 +02:00
Nextcloud bot
8f20b4566a
[tx-robot] updated from transifex 2017-08-23 00:09:04 +00:00
Roeland Jago Douma
efdf1a4bb5 Merge pull request #6197 from nextcloud/stable12-check-encoding-log 
[Stable12] check encoding log
 2017-08-22 09:09:35 +02:00
Nextcloud bot
8e8af07e79
[tx-robot] updated from transifex 2017-08-22 00:08:29 +00:00
Morris Jobke
4617f5f656 Merge pull request #6207 from nextcloud/12-6201 
[stable12] Increase contrast of dropdown menu text, fix accessibility & visibility issues
 2017-08-21 22:10:14 +02:00
Jan-Christoph Borchardt
599398e4a0 Increase contrast of dropdown menu text, fix accessibility & visibility issues 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-21 16:34:53 +02:00
Morris Jobke
a90d6090a7 Merge pull request #6195 from nextcloud/12-6194 
[stable12] Use correct l10n for app password menu
 2017-08-21 12:24:31 +02:00
Lukas Reschke
179b850e4d
Ensure log message is UTF-8 encoded 
PHP's json_encode only accept proper UTF-8 strings, loop over all
elements to ensure that they are properly UTF-8 compliant or convert
them manually.

Without this somebody passing an invalid User Agent may make json_encode
return false which will get logged as empty newline.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-21 10:21:54 +02:00
Morris Jobke
296f71dd9a Use correct l10n for app password menu 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-21 09:22:52 +02:00
Nextcloud bot
de8fe9cbd9
[tx-robot] updated from transifex 2017-08-21 00:08:22 +00:00
Nextcloud bot
6ea56593a7
[tx-robot] updated from transifex 2017-08-20 00:08:24 +00:00
Nextcloud bot
366c73a185
[tx-robot] updated from transifex 2017-08-19 00:08:36 +00:00
Morris Jobke
ddf7e0629c Merge pull request #6173 from nextcloud/12-6161 
[stable12] Enable object storage tests again
 2017-08-18 23:02:10 +02:00
Nextcloud bot
7e0c00b576
[tx-robot] updated from transifex 2017-08-18 00:08:25 +00:00
Morris Jobke
37bc43c19c Enable object storage tests again 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-17 19:35:26 +02:00
Lukas Reschke
b88072d336
Build merged JS 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-17 12:36:32 +02:00
Lukas Reschke
8cb3624aab
Bump DOMPurify to 1.0.0 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-17 12:36:16 +02:00
Roeland Jago Douma
73e7560655 Merge pull request #6127 from nextcloud/12-6126 
[stable12] Trigger search after re-focus
 2017-08-17 09:16:28 +02:00
Nextcloud bot
948d6742ce
[tx-robot] updated from transifex 2017-08-17 00:08:23 +00:00
Morris Jobke
3326118bdc Merge pull request #6150 from nextcloud/backport-6128-primary-font-color-in-capabilities 
[stable12] Add the primary font color to the capabilities as well
 2017-08-16 21:51:57 +02:00
Joas Schilling
8f68e0a153
Document that it throws 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-16 13:57:45 +02:00
Joas Schilling
bd80121fc6
Catch exceptions on error of cloud id resolution 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-16 13:57:30 +02:00
Joas Schilling
5474e298a1
Add the primary font color to the capabilities as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-16 11:51:15 +02:00
Morris Jobke
669c82afea Merge pull request #6111 from nextcloud/backport-6098-12 
[stable12] Fix federation scope dropdown
 2017-08-16 11:25:11 +02:00
Joas Schilling
fa8e202e65 Merge pull request #6112 from nextcloud/backport-5920-12 
[stable12] Top bar buttons in share view are wrong positioned
 2017-08-16 11:12:53 +02:00
Joas Schilling
ccb758ade3
Use indexed column path_hash to find the parent 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-16 10:49:30 +02:00
Nextcloud bot
7913d33de9
[tx-robot] updated from transifex 2017-08-16 00:08:42 +00:00
Morris Jobke
faa83c3250 Trigger search after re-focus 
If the share input field is unfocused, the autocomplete list is closed. Once
the field was focused again it was not properly opened again. This adds a
trigger to redo the search and show the results again.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-15 13:40:35 +02:00
Roeland Jago Douma
32b69cd40b
Delete trash using node API to trigger preview deletion 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-15 08:52:13 +02:00
Nextcloud bot
cd2d5b0b27
[tx-robot] updated from transifex 2017-08-15 00:08:25 +00:00
Marin Treselj
83616aea4f Make sure this still works in other apps. 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-14 22:24:09 +02:00
Marin Treselj
eaa00ea2c8 Change id to class in the main share template 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-14 22:24:00 +02:00
Marin Treselj
84b0790b99 Fixes nextcloud/gallery#269 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-14 22:21:42 +02:00