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

6217 commits

Author SHA1 Message Date
Vincent Petry
669b0bc2ae
Prevent error with orphaned shares when updating user mount cache 2016-08-30 19:49:23 +02:00
Lukas Reschke
57f9117843 Merge pull request #1087 from nextcloud/get-delay-twice 
dont get bruteforce delay twice
 2016-08-30 18:43:01 +02:00
Roeland Jago Douma
83490e90ef Merge pull request #1089 from nextcloud/allow-to-prevent-previews 
Check if the file isReadable() before sending a (cached) preview
 2016-08-30 11:33:48 +02:00
Roeland Jago Douma
14136295b7
Cache avatars properly 
* Set proper caching headers for avatars (15 minutes)
* For our own avatar use some extra logic to invalidate when we update
 2016-08-30 09:00:16 +02:00
Morris Jobke
4afe4bda26 Merge pull request #891 from nextcloud/us_25810 
[OC] Fix unmerged shares repair targetdecision
 2016-08-30 08:22:34 +02:00
Roeland Jago Douma
7c7f862712 Merge pull request #1142 from nextcloud/fix-case-sensitive-settings 
Fix issues where some user settings cannot be loaded when the user id…
 2016-08-29 19:56:35 +02:00
Roeland Jago Douma
39749c0cd4 Merge pull request #1139 from nextcloud/clean-code-image 
Some cleanup within OC_Image (#25875)
 2016-08-29 19:56:16 +02:00
Thomas Müller
82e8762c84
Fix issues where some user settings cannot be loaded when the user id differs in case sensitivity - fixes #25684 (#25686) 2016-08-29 14:33:16 +02:00
Thomas Müller
df1cc94c23
Some cleanup within OC_Image (#25875) 2016-08-29 14:31:59 +02:00
Jörn Friedrich Dreyer
d5518735c9
always return numeric storage id as int, also check type equality in test asserts 2016-08-29 14:20:51 +02:00
Robin Appelman
6c93fe08f5 dont get bruteforce delay twice 2016-08-29 13:36:49 +02:00
Joas Schilling
f41c8c0089
Check if the file isReadable() before sending a (cached) preview 2016-08-29 10:58:57 +02:00
Lukas Reschke
25f1fdb275 Merge pull request #847 from nextcloud/quota-mount-in-homefolder 
fix quota calculation when a filesystem is mounted in a user home
 2016-08-28 15:05:46 +02:00
Raghu Nayyar
9dc23592c3 Merge pull request #1105 from nextcloud/usermenu-ordering 
fix ordering of user menu entries
 2016-08-28 10:30:16 +02:00
Lukas Reschke
4d85ffc27c Merge pull request #1054 from nextcloud/less-cache-hits 
Reduce the number of cache operations for dav operations
 2016-08-27 22:44:29 +02:00
Jan-Christoph Borchardt
0517f41b3f fix ordering of user menu entries 2016-08-27 22:42:08 +02:00
Joas Schilling
89c78bbce4 Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop 
prevent infinite redirect loops if the there is no 2fa provider to pass
 2016-08-26 16:03:05 +02:00
Roeland Jago Douma
53725d4d15 Merge pull request #771 from nextcloud/theming-fixes 
Theming: Fix missing color usage
 2016-08-26 15:02:21 +02:00
Lukas Reschke
de6ab82766 Merge pull request #1080 from nextcloud/always_lazyroot 
Always use the LazyRoot
 2016-08-26 13:18:01 +02:00
Roeland Jago Douma
f805aff67c
Always use the LazyRoot 2016-08-26 12:13:34 +02:00
Julius Haertl
fdab008231
Remove internal from getThemingDefaults 2016-08-26 12:07:52 +02:00
Roeland Jago Douma
044d7c3bb7 Merge pull request #1026 from nextcloud/theming-extend-defaults 
Theming: Add logo and background to ThemingDefaults
 2016-08-26 11:53:24 +02:00
Robin Appelman
fb88d66857 optimize getUserFolder for the common case 2016-08-25 17:22:25 +02:00
Robin Appelman
2693ae870e cache user folders 2016-08-25 17:22:25 +02:00
Robin Appelman
b2d365734a cache root id in mountpoint 2016-08-25 17:22:25 +02:00
Joas Schilling
680d7f22bb Merge pull request #1036 from nextcloud/query-logger-stack 
add stacktrace to query logger
 2016-08-25 16:43:08 +02:00
Robin Appelman
1c3b1e5797 add stacktrace to query logger 2016-08-24 14:37:15 +02:00
Roeland Jago Douma
4e1d501696
Dark autoloader magic for ThemingDefaults 2016-08-24 13:22:21 +02:00
Christoph Wurst
6af2efb679
prevent infinite redirect loops if the there is no 2fa provider to pass 
This fixes infinite loops that are caused whenever a user is about to solve a 2FA
challenge, but the provider app is disabled at the same time. Since the session
value usually indicates that the challenge needs to be solved before we grant access
we have to remove that value instead in this special case.
 2016-08-24 10:49:23 +02:00
Joas Schilling
c7c53aefb2
Use the lazy root to make tests pass 🙈 2016-08-24 09:52:05 +02:00
Julius Haertl
80fe499707
Theming: Add logo and background to ThemingDefaults 2016-08-24 00:40:22 +02:00
Lukas Reschke
2f1b17d44a Merge pull request #1007 from nextcloud/shared-storage-non-recursive 
Fix shared storage recursive setup
 2016-08-23 22:15:38 +02:00
Robin Appelman
a0c2342c20 prevent infinite recursion while getting storage from mount 2016-08-23 14:52:18 +02:00
Lukas Reschke
3ed102497e Merge pull request #995 from nextcloud/workflow-section 
Workflow section + hidden empty sections
 2016-08-23 11:20:43 +02:00
Lukas Reschke
0747e96b9c
Cache registered autoloaders 
This saves more than 20ms (!) on every request, the previous problem was that `\OC_App::registerAutoloading` calls `\OC\AppFramework\App::buildAppNamespace` which parses the appinfo.xml. Since that was also called multiple times (e.g. on cloud.nextcloud.com over 200 times) that had a significant performance impact. Also on simple PROPFIND requests.

https://blackfire.io/profiles/compare/65a53e6e-7f35-4974-b559-4c81abd01c3b/graph shows the difference nicely.
 2016-08-22 23:49:46 +02:00
Arthur Schiwon
b13092065a
hide parameters of tryLogin when logging 2016-08-22 16:45:07 +02:00
Joas Schilling
94432c089f
Save the container with the app's namespace so we can resolve it 2016-08-22 14:25:43 +02:00
Robin Appelman
e316a7ade7 Allow jail wrappers to lazily initialize the source storage 2016-08-22 12:26:27 +02:00
Robin Appelman
5e44a2d868 Allow storage wrappers to lazily initialize the source storage 2016-08-22 12:23:55 +02:00
Arthur Schiwon
056c1ab035
fix wrong var name 2016-08-22 11:24:48 +02:00
Arthur Schiwon
7972fa5527
enlist only registered sections that also have settings registered to 2016-08-22 08:29:49 +02:00
Lukas Reschke
d50e7ee36c
Remove reading PATH_INFO from server variable 
Having two code paths for this is unreliable and can lead to bugs. Also, in some cases Apache isn't setting the PATH_INFO variable when mod_rewrite is used.

Fixes https://github.com/nextcloud/server/issues/983
 2016-08-19 14:48:13 +02:00
Julius Haertl
162b153f22
Fix loading of ThemingDefaults 2016-08-19 11:26:22 +02:00
Morris Jobke
3ccd69707e Merge pull request #865 from nextcloud/ocs_config 
Move OCS route /config to proper controller
 2016-08-19 09:39:05 +02:00
blizzz
3b6bbf8159 Merge pull request #934 from nextcloud/add-cachebusters 
Add cachebusters
 2016-08-18 15:45:22 +02:00
blizzz
53d3c8b635 Merge pull request #931 from nextcloud/replace-hardcoded-classname 
let the containers resolving capabilities find and instantiate the ri…
 2016-08-18 14:03:14 +02:00
Lukas Reschke
3c7d2544b9
Add cache buster to left menu bar 2016-08-18 12:34:55 +02:00
Arthur Schiwon
f86b20776a
let the containers resolving capabilities find and instantiate the right service 2016-08-18 11:56:19 +02:00
Joas Schilling
3dba40db7b
Fix "Undefined index" when the values do not exist 2016-08-18 11:53:26 +02:00
Roeland Jago Douma
3a17fabd04
Remove unused private classes 2016-08-18 09:37:11 +02:00
Lukas Reschke
5aaa065d6d Merge pull request #848 from nextcloud/public-link-quota 
fix getting quota for public links with quota_include_external_storage
 2016-08-17 20:13:56 +02:00
Roeland Jago Douma
fe80bb1aff Merge pull request #867 from nextcloud/notification-primary-action-always-first 
Make sure the primary action is always the first one
 2016-08-17 19:31:14 +02:00
Vincent Petry
df9b509ed3
Improve regexp to detect duplicate folders when repairing unmerged shares 2016-08-17 15:31:47 +02:00
Vincent Petry
7a2d25fab4
Fix unmerged shares repair with mixed group and direct shares 
Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
 2016-08-17 15:31:36 +02:00
Vincent Petry
56b94b220d
Improve file_target finding logic when repairing unmerged shares 
Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
 2016-08-17 15:31:35 +02:00
Robin Appelman
5a599d5c4e Merge pull request #899 from nextcloud/nfd-default 
[us] Disable NFD encoding wrapper by default
 2016-08-17 14:46:52 +02:00
Vincent Petry
9f523518f3 Disable NFD encoding wrapper by default 
Seems I forgot to set it back to false after testing.
Will give a performance boost for all storages.
 2016-08-17 11:54:33 +02:00
Roeland Jago Douma
ce0604bd06 Merge pull request #892 from nextcloud/fix_phpdoc 
Some scrutinizer phpdoc fixes
 2016-08-17 10:38:21 +02:00
Joas Schilling
027069cbae Merge pull request #846 from nextcloud/provisioning_api_ocs 
Move Provisioning API to the AppFramework
 2016-08-17 10:23:13 +02:00
Marius Blüm
c1632c3abd Merge pull request #893 from nextcloud/ie8_be_gone 
IE8 be gone!
 2016-08-17 09:02:58 +02:00
Roeland Jago Douma
8f3dc0ba43
Remove IE_8 user agent string 2016-08-16 21:01:32 +02:00
Roeland Jago Douma
64ff8ac6fa
Fix phpdoc in Comments 2016-08-16 20:33:09 +02:00
Roeland Jago Douma
035f55c913
Fix phpdoc 2016-08-16 20:26:28 +02:00
Arthur Schiwon
717e22267a
Merge branch 'master' into implement_712 2016-08-16 18:31:59 +02:00
Arthur Schiwon
f76b64d3d7
add missing encryption modules to settings 2016-08-16 18:11:59 +02:00
Arthur Schiwon
58530ab42f
fix missing parameters in sharing settings page 2016-08-16 17:59:21 +02:00
Joas Schilling
f7bc5ad43b Merge pull request #864 from nextcloud/us_25652 
[us] Ensure the user exists before calling a method on it
 2016-08-16 12:57:34 +02:00
Björn Schießle
6dc956b192 Merge pull request #886 from nextcloud/capabilities_error_proof 
Make the capabilities manager more error proof
 2016-08-16 11:40:42 +02:00
Arthur Schiwon
208e551216
check registered sections and settings after an app got updated to garbage collect orphaned classes 2016-08-16 00:56:17 +02:00
Arthur Schiwon
9edca39b49
attempt to remove section and settings entries when an app got disabled 2016-08-16 00:56:17 +02:00
Lukas Reschke
6c6338b810
Merge branch 'master' into implement_712 2016-08-15 21:55:09 +02:00
Roeland Jago Douma
c044aa34fa
Make the capabilities manager more error proof 
If an app registers an invalid capabilty we should not crash hard.
Instead we should catch the exception. Log it (error) and carry on.

* Added tests
 2016-08-15 20:37:19 +02:00
Lukas Reschke
8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Arthur Schiwon
75a73a5a73
satisfy dependencies for files_external 2016-08-15 13:38:02 +02:00
Roeland Jago Douma
6c360ad79f
Add PHPdoc 2016-08-15 11:14:28 +02:00
Joas Schilling
3ed05f8769
Make sure the primary action is always the first one 2016-08-15 11:13:54 +02:00
Jörn Friedrich Dreyer
264aaf9ffa
use $userId instead of $user 2016-08-14 19:50:19 +02:00
Thomas Müller
26342061b9
Ensure the user exists before calling a method on it - fixes #24751 2016-08-14 19:50:03 +02:00
Jörn Friedrich Dreyer
291b3fd8b4
missing PHPDoc 2016-08-14 19:37:52 +02:00
Jörn Friedrich Dreyer
da5633c31a
Type compatability 2016-08-14 19:37:37 +02:00
Jörn Friedrich Dreyer
3593668413
Method is deprecated 2016-08-14 19:37:11 +02:00
Jörn Friedrich Dreyer
5aef60d2ca
Unreachable statement 2016-08-14 19:36:42 +02:00
Jörn Friedrich Dreyer
d2a16c4dc8
Unnecessary fully qualified names 2016-08-14 19:36:06 +02:00
Roeland Jago Douma
e3b0e50dda
Extend OCSMiddleware 
* Always set 401 (v1.php and v2.php)
* Set proper error codes for v2.php
* Proper OCS output on unhandled exceptions
 2016-08-14 18:34:01 +02:00
Roeland Jago Douma
deba0f9922
Move OCS Middleware before security middleware 
This is required to be able to catch the NotLoggedIn exceptions etc in
the OCSMiddleware and convert them to proper OCS Responses.
 2016-08-14 18:34:01 +02:00
Arthur Schiwon
8188bb4509
simplify encryption manager fetching in DIContainer 2016-08-13 01:26:11 +02:00
Arthur Schiwon
158d78e1ab
move mail settings and file handling to additional ones, thus files_external gets its own section 2016-08-13 01:02:25 +02:00
Arthur Schiwon
b99ecb3c23
move systemstags to sharign section, drop collaboration section 2016-08-13 00:33:09 +02:00
Arthur Schiwon
7a2b96c7e6
change casing in section display names 2016-08-13 00:06:10 +02:00
Arthur Schiwon
9aa6b99a56
added some missed diagnosis output 2016-08-12 16:52:20 +02:00
Robin Appelman
85d3fb76d7 fix getting quota for public links with quota_include_external_storage 2016-08-12 15:59:19 +02:00
Robin Appelman
ef2116a17a fix quota calculation when a filesystem is mounted in a user home 2016-08-12 15:41:37 +02:00
Bjoern Schiessle
18fd8ff70c
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy" 2016-08-12 15:32:28 +02:00
Arthur Schiwon
ac04ba6784
register app autoload instead of loading apps 2016-08-12 13:23:14 +02:00
Lukas Reschke
8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Arthur Schiwon
3dfdc8e311
adjust systemtags app 2016-08-11 19:05:06 +02:00
Arthur Schiwon
36c1b7eb31
adjust Theming app 2016-08-11 17:29:58 +02:00
Arthur Schiwon
ce6ad5de25
make sure shipped apps also setup their admin settings on a fresh install 2016-08-11 16:37:11 +02:00
Arthur Schiwon
a2f752bcf3
adjust files_external 2016-08-11 15:50:31 +02:00
Arthur Schiwon
14ddf9d923
rename IAdmin to ISettings, the interface is not bound to a specific settings scope 2016-08-11 14:48:21 +02:00