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

32461 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Roeland Jago Douma
e03e4921a0
Fix Name 2016-05-23 20:42:08 +02:00
Roeland Jago Douma
7ef21b0b27
Add unit tests for ObjectHomeMountProvider 2016-05-23 20:42:08 +02:00
Roeland Jago Douma
12b63258d5
Add mapper unit tests 2016-05-23 20:42:08 +02:00
Roeland Jago Douma
5e2316d05d
Allow multibucket in objectstore 2016-05-23 20:42:08 +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
Julius Haertl
d065980814 Add more tests for OC\Core\Controller\LostController 
- remove testResetFormUnsuccessful as it is now splitted up in different test cases
- add testResetFormInvalidToken to check if timestamp and token are present
- add testResetFormInvalidTokenMatch to check if the saved token matches the provided
- add testResetFormExpiredToken to check if expiration detection works
- add testResetFormValidToken to check if detection of valid tokens works
 2016-05-23 16:48:10 +02:00
Julius Haertl
8ee2cb47d0 Show error messages if a password reset link is invalid or expired 
- Moved token validation to method checkPasswordResetToken
- Render error with message from exceptions
 2016-05-23 16:48:10 +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
Joas Schilling
c2cac0940d
Only show message in the UI when the checker is enabled 2016-05-23 11:29:40 +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
Vincent Petry
410d18f00d Merge pull request #22620 from owncloud/comments-api 
Comments API is missing hook/event to allow other apps to register valid entities
 2016-05-23 09:51:05 +02:00
Christoph Wurst
74277c25be
add button to invalidate browser sessions/device tokens 2016-05-23 09:11:12 +02:00
Christoph Wurst
6495534bcd
add button to add new device tokens 2016-05-23 09:11:12 +02:00
Christoph Wurst
12431aa399
list user's auth tokens on the personal settings page 2016-05-23 09:11:12 +02:00
Joas Schilling
0b831a2bed
Move EntityEvent to PSR-4 2016-05-23 09:06:02 +02:00
Joas Schilling
54f8822670
Fix unit tests 2016-05-23 09:03:48 +02:00
Joas Schilling
c9fda84841
Make the root collection neutral so it does not only work for files 2016-05-23 09:03:48 +02:00
Joas Schilling
3a8e537946
Remove unused UserFolder 2016-05-23 09:03:47 +02:00
Jenkins for ownCloud
357d342467 [tx-robot] updated from transifex 2016-05-23 01:55:10 -04:00
Jenkins for ownCloud
88328000b1 [tx-robot] updated from transifex 2016-05-22 01:56:56 -04:00
Vincent Petry
7a6966cdfe Merge pull request #24732 from owncloud/autoloader_fix 
Autoloader fix
 2016-05-21 19:09:22 +02:00
Vincent Petry
8646802850 Merge pull request #24696 from owncloud/lock-jobs-while-executing 
Lock jobs while executing them, to allow multiple executors to run in…
 2016-05-21 19:08:15 +02:00
Vincent Petry
6934840083 Merge pull request #24307 from owncloud/systemtags-perminterface 
Add interface methods for permission check for system tags
 2016-05-21 19:06:54 +02:00
Jenkins for ownCloud
bca7586574 [tx-robot] updated from transifex 2016-05-21 01:55:53 -04:00
Pellaeon Lin
56241afad7 Fix breadcrumb background right arrow due to incorrect background-image syntax 2016-05-21 12:54:29 +08:00
Pellaeon Lin
72ac5dd8a1 Make entire file tr droppable, 
so that .canDrop will highlight the entire row when drag hover
 2016-05-21 12:54:29 +08:00