upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 08:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
39294 commits 951 branches 1208 tags 8.3 GiB
Commit graph

39294 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
2d8ec64ee5
[tx-robot] updated from transifex 2017-05-29 00:08:44 +00:00
Nextcloud bot
df3efa4984
[tx-robot] updated from transifex 2017-05-28 00:08:24 +00:00
Nextcloud bot
2e223cd1dc
[tx-robot] updated from transifex 2017-05-27 00:08:42 +00:00
Nextcloud bot
0ed02da5dd
[tx-robot] updated from transifex 2017-05-26 00:08:26 +00:00
Nextcloud bot
13d1c95db1
[tx-robot] updated from transifex 2017-05-25 00:08:13 +00:00
Nextcloud bot
9055109243
[tx-robot] updated from transifex 2017-05-24 00:08:31 +00:00
Roeland Jago Douma
d00d96c902 Merge pull request #5073 from nextcloud/external-get-for-group-sql-type-12 
[12] use the correct param type when getting external storages for groups
 2017-05-23 22:39:34 +02:00
Robin Appelman
1e06e92bb0
use the correct param type when getting external storages for groups 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-23 16:49:59 +02:00
Roeland Jago Douma
7593fa3464 Merge pull request #5005 from nextcloud/bugfix-stable12/fix_replacing_4mbunicode_for_calendar_properties_table 
[stable12] fix replacing of 4MB Unicode Chars in cal props table
 2017-05-23 13:43:56 +02:00
Roeland Jago Douma
446559979c Merge pull request #5017 from nextcloud/stable12-5016 
[stable12] Reset opcache if update is detected
 2017-05-23 11:36:57 +02:00
Nextcloud bot
6e005e0ffa
[tx-robot] updated from transifex 2017-05-23 00:08:39 +00:00
Lukas Reschke
98e26f8b5c Merge pull request #5015 from nextcloud/stable12-5014 
[stable12] Update Opcache recommendation
 2017-05-22 10:18:41 +02:00
Lukas Reschke
93eeb40136
v12.0.0.29 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-22 10:11:27 +02:00
Lukas Reschke
aee501a3bc Merge pull request #5025 from nextcloud/add-missing-version-requirement-to-oauth 
Add missing version requirement to OAuth2 app
 2017-05-22 10:10:22 +02:00
Joas Schilling
21b6af3e1e
Add missing version requirement to OAuth2 app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-22 09:01:34 +02:00
Morris Jobke
e0e814dfae Merge pull request #5020 from nextcloud/stable12-5009 
[stable12] Update acceptance tests for issue #4921
 2017-05-22 01:49:05 -05:00
Daniel Calviño Sánchez
424979c32e Update acceptance tests for issue #4921 
Acceptance tests opened the details view by clicking on the middle of
the file row, but due to the changes made in issue #4921 that now opens
the file instead; this commit updates the acceptance tests to open the
details view through the "Details" item in the file actions menu.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-21 22:50:15 -05:00
Nextcloud bot
9325003a72
[tx-robot] updated from transifex 2017-05-22 00:08:32 +00:00
Morris Jobke
3c832f201f Reset opcache if update is detected 
This even works if opcache_reset is in the disabled_functions php.ini setting.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-21 18:40:53 -05:00
Morris Jobke
9acc590a27 Update Opcache recommendation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-21 18:24:06 -05:00
Lukas Reschke
6d9a6f03fb Merge pull request #5008 from nextcloud/fix_scss_cache_12 
Fix scss cache 12
 2017-05-21 22:52:20 +02:00
Roeland Jago Douma
32ee610f45
Increase version 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-21 22:12:52 +02:00
Roeland Jago Douma
cf1f77537d
Set SCSS dependencies to memcache on compile 
Else when an upgrade happens we will recompile all the SCSS files all
the time (until the cache expires).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-21 22:12:47 +02:00
Lukas Reschke
b6f5e623bb
v12.0.0 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-21 17:11:40 +02:00
Georg Ehrke
f75b56fc5d
fix replacing of 4MB Unicode Chars in cal props table 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-21 13:27:16 +02:00
Morris Jobke
482805d16f Merge pull request #4982 from nextcloud/stable12-oauth-not-disable 
[stable12] Mark OAuth app as always enabled
 2017-05-20 19:12:24 -05:00
Nextcloud bot
fa47ed7979
[tx-robot] updated from transifex 2017-05-21 00:08:35 +00:00
Lukas Reschke
551a189ae8 Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-20 17:15:19 -05:00
Morris Jobke
394023949e Merge pull request #4998 from nextcloud/fix-for-sharing-stable-12 
fix for sharing stable12
 2017-05-20 17:03:52 -05:00
Lukas Reschke
e23569ed68 Merge pull request #4996 from nextcloud/stable12-version 
12.0.0RC3
 2017-05-20 20:31:24 +02:00
Daniel Hansson
8817c65120 fix for sharing stable12 
Signed-off-by: Daniel Hansson <daniel@techandme.se>
 2017-05-20 17:15:14 +02:00
Lukas Reschke
e6683f4007
12.0.0RC3 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-20 14:21:47 +02:00
Nextcloud bot
df61c9e283
[tx-robot] updated from transifex 2017-05-20 00:08:37 +00:00
Lukas Reschke
4bf9df9cf1 [stable12] Mark OAuth app as always enabled 
At the moment we don't support disabling the OAuth app

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-19 17:28:10 -05:00
Morris Jobke
697e14bf74 Merge pull request #4977 from nextcloud/rename-secure-drop-stable12 
rename secure drop back to files drop
 2017-05-19 17:06:07 -05:00
Morris Jobke
d37ac1862f Merge pull request #4980 from nextcloud/fix-missing-argument-2-getAppContainer 
Fix missing argument 2 for Settings classes
 2017-05-19 17:05:18 -05:00
Joas Schilling
fa95fb6862
Fix missing argument 2 for Settings classes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-19 22:30:55 +02:00
Bjoern Schiessle
c4dd1d970f
rename secure drop back to files drop because of name collision with securedrop.org 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-19 21:58:01 +02:00
Lukas Reschke
ebd15f50d9 Merge pull request #4976 from nextcloud/stable12-4910 
[stable12] Fix logo being too big on log in page
 2017-05-19 21:56:11 +02:00
Lukas Reschke
6e2139f60e Merge pull request #4975 from nextcloud/stable12-4974 
Fixes visible sidebar even if hidden is applied
 2017-05-19 21:47:56 +02:00
Lukas Reschke
e0277fa9b7 Merge pull request #4973 from nextcloud/stable12-4972 
Fix group restriction regression
 2017-05-19 21:46:14 +02:00
Lukas Reschke
9e667d81bb
12.0.0RC2 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-19 21:19:07 +02:00
Julius Härtl
c190dfbe53
Scale logo only for custom ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-19 21:01:41 +02:00
Jan-Christoph Borchardt
053dffb169
Fix logo being too big on log in page, fix #4585 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-05-19 21:01:34 +02:00
Morris Jobke
5a6af19076 Fixes visible sidebar even if hidden is applied 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-19 13:05:57 -05:00
Morris Jobke
5fbfebac35 Fix group restriction regression 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-19 12:09:49 -05:00
Lukas Reschke
cc2d06606d Merge pull request #4957 from nextcloud/backport-4956-resource-loading-for-ever 
[stable12] Stop infinit loop on invalid settings css/js file
 2017-05-19 16:59:55 +02:00
Lukas Reschke
32558991a6 Merge pull request #4962 from nextcloud/backport-4905 
Allow automatic DI for apps that don't register the container in app.php
 2017-05-19 16:18:31 +02:00
Joas Schilling
aa83127686
Allow automatic DI for apps that don't register the container in app.php 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-19 13:49:36 +02:00
Lukas Reschke
90837b9175 Merge pull request #4949 from nextcloud/workaround-4948 
Lowercase the scriptname again
 2017-05-19 12:37:53 +02:00