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

32323 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
8a40003169 fix phpdoc 2016-05-24 13:58:08 +02:00
Robin Appelman
c031eafd84 Fix cert bundle path 2016-05-24 13:44:43 +02:00
Vincent Petry
4635ed7748
Fix autoloading for new google SDK lib 2016-05-24 12:22:30 +02:00
Francesco Rovelli
c23bc91198
Add new files 2016-05-24 12:22:30 +02:00
Francesco Rovelli
49bec94959
enable autoload of lib in google storage 2016-05-24 12:22:30 +02:00
Francesco Rovelli
c1583f03ab
Update google-api-php-client from 1.0.6-beta to 1.1.7 2016-05-24 12:22:30 +02:00
Vincent Petry
4ffc936624 Merge pull request #24806 from owncloud/fix-path-to-3rdparty-after-move-to-lib-Lib 
Fix import path for 3rdparty dropbox autoloader
 2016-05-24 12:21:55 +02:00
Joas Schilling
3eba0c479f
Fix import path for 3rdparty dropbox autoloader 
We moved the file by one level
 2016-05-24 12:15:53 +02:00
Vincent Petry
fdddc11f63 Merge pull request #22929 from owncloud/bugfix-removequota-subadmins 
Bugfix removequota subadmins
 2016-05-24 12:13:57 +02:00
Vincent Petry
c60ef7deb8 Merge pull request #24619 from owncloud/files_external-psr4 
Move files_external to PSR-4
 2016-05-24 11:54:12 +02:00
Vincent Petry
f8bbbba306 Merge pull request #24682 from f4bsch/master 
dont update search onResize
 2016-05-24 11:47:47 +02:00
Vincent Petry
452542747c Merge pull request #24788 from owncloud/config-filesystem_check_changes 
clarify filesystem_check_changes in config.sample.php
 2016-05-24 10:31:20 +02:00
Vincent Petry
ee1f4602f3 Merge pull request #24787 from owncloud/fix-update-issue-on-master 
Add the background jobs after the table was updated
 2016-05-24 10:14:00 +02:00
Vincent Petry
1d1cb79321 Merge pull request #23395 from owncloud/mysql-check-speedup 
Speedup schema cloning for MySQL
 2016-05-24 10:00:38 +02:00
Joas Schilling
64538740ec
Fix missing imports 2016-05-24 08:41:22 +02:00
Joas Schilling
f14dff680d
Move remaining classes to PSR-4 2016-05-24 08:41:22 +02:00
Joas Schilling
4576891f10
Move Lib\Storage to PSR-4 2016-05-24 08:41:22 +02:00
Joas Schilling
b9fd7d4cc7
Move Config to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling
6ea54e73e8
Move Lib\Backend to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling
6d7a1b9bd4
Move Lib\Auth to PSR-4 2016-05-24 08:41:21 +02:00
Joas Schilling
328b3c47d7
Move stuff from outside lib/ to PSR-4 2016-05-24 08:41:20 +02:00
Vincent Petry
adcf942901 Merge pull request #24750 from owncloud/lenz1111-share_download_range_requests_support 
Http Range requests support in downloads
 2016-05-23 21:01:26 +02:00
Vincent Petry
5a8af2f0be Merge pull request #24729 from owncloud/try-token-login-first 
try token login first
 2016-05-23 20:50:57 +02:00
Vincent Petry
4f6670d759 Merge pull request #24658 from owncloud/invalidate-disabled-user-session 
invalidate user session if the user was disabled
 2016-05-23 20:50:25 +02:00
Vincent Petry
87fa86a69a Merge pull request #24559 from owncloud/2fa 
two factor auth
 2016-05-23 20:50:03 +02:00
Victor Dubiniuk
01aedbe506 Speedup schema cloning for MySQL 2016-05-23 20:52:40 +03:00
Vincent Petry
aa56d42fa8 Merge pull request #24777 from owncloud/scanner-dont-propagate 
dont needlessly triger the propgator in the scanner
 2016-05-23 19:05:20 +02:00
Carla Schroder
1f12551329 clarify filesystem_check_changes in config.sample.php 2016-05-23 09:25:51 -07:00
Joas Schilling
78da57466f
Add the background jobs after the table was updated 2016-05-23 17:58:46 +02:00
Vincent Petry
524479fa09 Merge pull request #24699 from owncloud/background-scan-recursion 
Only recurse into incomplete folders during background scans
 2016-05-23 17:44:02 +02:00
Piotr Filiciak
6577bbe887 Code style and doc fix 2016-05-23 15:17:00 +02:00
Vincent Petry
c10d8a37f7 Merge pull request #22690 from owncloud/fix-comments-href-remote.php-files 
ensure comments-href returns a value also when propfind is done again…
 2016-05-23 14:47:03 +02:00
Robin Appelman
eca57be336 Only recurse into incomplete folders during background scans 2016-05-23 14:40:35 +02:00
Vincent Petry
21df2eb5a1 Merge pull request #24695 from owncloud/background-scan-propagate 
Trigger propagation from the background scanner
 2016-05-23 14:32:28 +02:00
Vincent Petry
68c5df798c Merge pull request #24765 from owncloud/boolean-installed-config 
Make sure we evaluate installed everywhere as a boolean
 2016-05-23 14:32:10 +02:00
Vincent Petry
4ba3668834 Merge pull request #24613 from owncloud/chunked-convert-database-queries 
Chunk the "db:convert-type" select queries, to not run out of memory …
 2016-05-23 14:28:44 +02:00
Vincent Petry
57525a02f8 Merge pull request #24703 from owncloud/personal-settings-auth-tokens 
Personal settings auth tokens
 2016-05-23 14:17:01 +02:00
Robin Appelman
f3979e5459 dont needlessly triger the propgator in the scanner 2016-05-23 13:53:05 +02:00
Vincent Petry
bd87f67473 Merge pull request #24349 from owncloud/nfd-storagewrapper 
Add wrapper for NFD encoding workaround
 2016-05-23 13:45:33 +02:00
Vincent Petry
862d8f43e5 Merge pull request #24766 from owncloud/mmccarn-patch-2 
Update imagePath to prefer theme, then app, then core images
 2016-05-23 11:46:03 +02:00
Christoph Wurst
847bbc51b6
add OCC command to enable/disable 2FA for a user 2016-05-23 11:21:13 +02:00
Christoph Wurst
dfb4d426c2
Add two factor auth to core 2016-05-23 11:21:10 +02:00
Christoph Wurst
c20cdc2213
invalidate user session if the user is disabled 2016-05-23 10:32:16 +02:00
mmccarn
1bc5eb111b
Update imagePath to prefer theme, then app, then core images 
imagePath updated so that image searches follow this priority:

1) /themes/$theme/apps/$app/img
2) /themes/$theme/$app/img
3) /themes/$theme/core/img
4) $appPath/img
5) /$app/img
6) /core/img

For each folder:
- if the specified file exists, use it.
- otherwise, if $basename.svg does NOT exist, try $basename.png
(This might better be "if filename was an svg, try the png"...)
 2016-05-23 10:24:04 +02:00
Joas Schilling
828dec9edb
Make sure we evaluate installed like we do it everywhere 2016-05-23 10:09:36 +02:00
Joas Schilling
7f1b8f22d4
Make sure that installed is a boolean 2016-05-23 10:09:22 +02:00
Vincent Petry
dec3f9ebcb Merge pull request #24726 from owncloud/tests-psr-4 
Tests outside of tests/lib/ to PSR-4
 2016-05-23 09:54:29 +02:00
Vincent Petry
9264674b36 Merge pull request #24514 from owncloud/federation-psr4 
Move federation app to PSR-4
 2016-05-23 09:52:38 +02:00
Vincent Petry
5ba1add03c Merge pull request #24603 from owncloud/federated_reshare 
flat federated re-share
 2016-05-23 09:52:13 +02:00
Vincent Petry
c78bb2ab34 Merge pull request #24356 from owncloud/scanner-recursion-memory 
Free up folder content from memory before recursing in the file scanner
 2016-05-23 09:51:52 +02:00