Christoph Wurst
3f492dd826
load file sorting mode from the db
2016-04-13 11:28:42 +02:00
Thomas Müller
838e9e3126
Merge pull request #23958 from owncloud/use-6-months-as-threshold-for-ssl
...
Use 6 months as SSL STS header threshold
2016-04-13 11:10:10 +02:00
Thomas Müller
e90a3b5ba7
Merge pull request #23954 from stweil/master
...
misc: Fix some typos
2016-04-13 11:08:58 +02:00
Thomas Müller
4856d95135
Merge pull request #23921 from owncloud/show-app-download-tooltip
...
Show tooltip if the app is downloaded from a remote server
2016-04-13 11:08:38 +02:00
Joas Schilling
739542816a
Merge pull request #23945 from owncloud/fix_oc_share_permissions
...
always return the complete permissions the file was shared with
2016-04-13 10:20:25 +02:00
Morris Jobke
e03d289b70
Use 6 months as SSL STS header threshold
...
* this uses 6 months (6 * 30 * 24 * 60 * 60 = 15552000)
* old value was half a year (365 / 2 * 24 * 60 * 60 = 15768000)
* fixes #23957
2016-04-13 08:47:34 +02:00
Jenkins for ownCloud
a2da7614a0
[tx-robot] updated from transifex
2016-04-13 01:54:59 -04:00
Lukas Reschke
c0a6619f47
Merge pull request #23953 from owncloud/small_share_manager_fix
...
set $share to null if getShareByToken() failed
2016-04-13 00:49:09 +02:00
Lukas Reschke
ef93ec8bc2
Add test
2016-04-12 21:32:40 +02:00
Stefan Weil
ee5f5eebe5
misc: Fix some typos
...
Some of them were found by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 18:36:39 +02:00
Björn Schießle
499d131a09
always return the complete permissions the file was shared with
2016-04-12 17:56:56 +02:00
Björn Schießle
f17ad18865
set $share to null if getShareByToken() failed
2016-04-12 17:26:09 +02:00
Thomas Müller
e9a9af3493
Revert "Document an example wait timeout for MySQL in case the web hoster is killing the connection too early - fixes #15407"
...
This reverts commit acad7b30be
.
2016-04-12 15:09:50 +02:00
Thomas Müller
acad7b30be
Document an example wait timeout for MySQL in case the web hoster is killing the connection too early - fixes #15407
2016-04-12 15:08:12 +02:00
Stefan Weil
16df1c5188
apps: Fix typos (found by codespell) ( #23862 )
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 12:52:51 +02:00
Thomas Müller
fdee771aca
Add unit testing capabilities for templates ( #23708 )
...
Add unit testing capabilities for templates
2016-04-12 12:49:11 +02:00
Lukas Reschke
276b8a5831
Exclude autoload_static.php ( #23935 )
...
Composer 1.1 has since yesterday a new performance improvement that will be automatically used for PHP >= 5.6, however this file is incompatible with older PHP versions and thus we need to exclude it from the checks.
Note that this performance improvement is only used on >= 5.6 so ownCloud will still run fine on older PHP versions as well.
2016-04-12 12:07:27 +02:00
Hendrik Leppelsack
c7482eee4e
Checkboxes ( #23063 )
...
* remove ie8 fixes for checkboxes
* add indeterminate style to checkboxes
* add styles for radio inputs
* add missing checkbox-mixed-disabled icon
* fix white radios
* remove unnecessary png file
2016-04-12 09:47:14 +02:00
Roeland Douma
495a964ca2
Migrate post_groupDelete hook to share manager ( #23841 )
...
The hook now calls the share manager that will call the responsible
shareProvider to do the proper cleanup.
* Unit tests added
Again nothing should change it is just to cleanup old code
2016-04-12 09:46:25 +02:00
Roeland Douma
4ddf9f98f1
Don't calculate permissions twice ( #23917 )
...
There is no need to calculate the permissions twice.
Saves some is_dir and file_exists calls.
2016-04-12 09:45:59 +02:00
Christoph Wurst
7365bd798a
Show tooltip if the app is downloaded from a remote server
...
fixes #14405
2016-04-12 09:39:53 +02:00
Jenkins for ownCloud
59080bef51
[tx-robot] updated from transifex
2016-04-12 02:08:35 -04:00
Joas Schilling
8e16e7bf34
Merge pull request #23856 from owncloud/share_remove_addtogroup_hooks
...
Remove pre/post_addToGroup hooks for shares
2016-04-11 15:05:20 +02:00
Morris Jobke
ddbb9b7ec4
Catch the AutoloadNotAllowedException also for legacy jobs ( #23901 )
...
* same as #18839 for legacy jobs
* avoids spamming the log with useless entries
2016-04-11 14:06:11 +02:00
Joshua Ruehlig
329849f2c2
To be safe don't unload until end ( #23752 )
...
* To be safe don't unload until end
* unlink needs to be before return to actually do anything
2016-04-11 14:04:57 +02:00
Morris Jobke
929a28421a
Merge pull request #23798 from owncloud/federated-unshare-background-job
...
re-try to send unshare notification if remote server is not available
2016-04-11 11:13:00 +02:00
Thomas Müller
8652ef28aa
Merge pull request #23868 from owncloud/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2016-04-11 10:38:02 +02:00
Thomas Müller
35b8c0dd68
Merge pull request #22615 from owncloud/add-blacklisted-files-to-capabilities
...
Add blacklisted_files to capabilities
2016-04-11 10:10:10 +02:00
Thomas Müller
e2c4a0cecd
Merge pull request #23860 from owncloud/followup-23304-opening-empty-file
...
Correctly return an empty string for empty files
2016-04-11 10:08:24 +02:00
Jenkins for ownCloud
c6f65a3c79
[tx-robot] updated from transifex
2016-04-11 01:54:50 -04:00
Thomas Müller
f9683aaf3d
Merge pull request #23863 from owncloud/fix_unit_tests
...
Fix unit tests warnings
2016-04-10 21:59:39 +02:00
Thomas Müller
4d09e2453e
Merge pull request #23891 from owncloud/add-download-icon-white
...
Added white download icons
2016-04-10 21:59:21 +02:00
Thomas Müller
7fc1d52b75
Merge pull request #23893 from owncloud/add-VCFExportPlugin
...
Adding VCFExportPlugin
2016-04-10 20:35:13 +02:00
skjnldsv
408bdd65c2
Added white download icons
2016-04-10 13:54:17 +02:00
Thomas Müller
24c2252ff4
Adding VCFExportPlugin
2016-04-10 12:43:15 +02:00
Jenkins for ownCloud
a29e732607
[tx-robot] updated from transifex
2016-04-10 01:54:49 -04:00
Jenkins for ownCloud
e68c4b1d73
[tx-robot] updated from transifex
2016-04-09 12:28:39 -04:00
Scrutinizer Auto-Fixer
3ebeb07a30
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-08 15:11:37 +00:00
Roeland Jago Douma
2c77bfa0d0
Fix dav comments
2016-04-08 15:23:23 +02:00
Roeland Jago Douma
7f4f0b20ad
Fix encryption tests
2016-04-08 15:23:17 +02:00
Roeland Jago Douma
4c9e257b27
Fix filesplugin
2016-04-08 15:23:13 +02:00
Roeland Jago Douma
2a0244df27
Fix mappertest
2016-04-08 15:23:09 +02:00
Roeland Jago Douma
f9ade49c7e
Fix notification tests
2016-04-08 15:23:06 +02:00
Roeland Jago Douma
b9b19cef41
Fix avatar controller tests
2016-04-08 15:23:00 +02:00
Roeland Jago Douma
e65e7a5ad7
Fix ShareManager tests
2016-04-08 15:22:57 +02:00
Roeland Jago Douma
db0c3bd535
Fix Share20OCSTest
2016-04-08 15:22:49 +02:00
Thomas Müller
6f3eeeeb36
Merge pull request #23510 from owncloud/birthdays-on-shared-addressbooks
...
Propagate birthdays of shared addressbooks to the sharee's birthday c…
2016-04-08 15:19:38 +02:00
Thomas Müller
88a366b314
Merge pull request #23839 from owncloud/sabre-dav-3.0.9
...
Update 3rdparty with 3.0.9 sabre/dav
2016-04-08 15:00:26 +02:00
Thomas Müller
1d3d43b1e9
Merge pull request #23553 from owncloud/lock-ttl-execution-time
...
Make lock ttl configurable
2016-04-08 14:53:26 +02:00
Thomas Müller
53acb4a65f
Merge pull request #23736 from owncloud/move_public_webdav_auth_to_share_manager
...
Move public webdav auth to share manager
2016-04-08 14:52:15 +02:00