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

29851 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
38f4407761 Merge pull request #21201 from mmattel/scanFiles_stat_output_II 
Statistics output for ./occ files:scan (rework)
 2015-12-17 14:43:55 +01:00
Thomas Müller
e3ed42135d Merge pull request #21240 from owncloud/avatar_speedup 
Avatar speedup
 2015-12-17 14:43:21 +01:00
Thomas Müller
358b84c21d Merge pull request #21253 from owncloud/deprecated_oc_helper_linkTo 
Remove deprecated OC_Helper::linkTo
 2015-12-17 14:43:02 +01:00
Roeland Jago Douma
a81836a42f Only load the big (128x128) avatar on the perosnal page 
Before the code was executed on every page if a user was logged in. Now
only on the personal page. Thus saving a request on all other pages.
 2015-12-17 13:55:22 +01:00
Thomas Müller
311a565f7f Merge pull request #21244 from owncloud/remove-unavailable-setting-from-sample-config 
enforce_home_folder_naming_rule cannot be configured in config.php
 2015-12-17 13:43:28 +01:00
michag86
7a86f10ebc Update users.js 2015-12-17 12:43:44 +01:00
Thomas Müller
21bd19b6ae Merge pull request #21241 from owncloud/fix_21226 
Do not try to get the avatar if there is no user
 2015-12-17 12:14:25 +01:00
Roeland Jago Douma
205c239eab Remove deprecated OC_Helper::linkTo function 2015-12-17 11:51:40 +01:00
Morris Jobke
b8ceae68d5 occ command can only be called from ownCloud root directory 
* this changes into the ownCloud root directory and then should run just fine
* avoids weird error messages that are caused by this
 2015-12-17 10:56:26 +01:00
Roeland Jago Douma
19eeb23b91 OC_Helper::linkTo is deprecated 
Replaced with suggested (and calling body of)
 2015-12-17 10:53:21 +01:00
Thomas Müller
fa983caeaa Merge pull request #21238 from owncloud/files-fixparsewebdavmtime 
Fix files UI mtime parsing from webdav
 2015-12-17 10:24:36 +01:00
Roeland Jago Douma
db95c8d512 Do not try to get the avatar if there is no user 2015-12-17 09:14:04 +01:00
Jenkins for ownCloud
a7cd8103b5 [tx-robot] updated from transifex 2015-12-17 01:55:09 -05:00
blizzz
99e25cded9 enforce_home_folder_naming_rule cannot be configured in config.php 2015-12-16 21:50:47 +01:00
Roeland Jago Douma
3e80f14269 [Avatar] Make the avatar controller use the avatar node 2015-12-16 21:41:58 +01:00
Roeland Jago Douma
d796c43841 [Avatars] Add function to get the Node of the avatar 
Since we usually just get the avatar and stream the content to the users
there is no need to first create an image in memory.
 2015-12-16 20:29:02 +01:00
Thomas Müller
c92b49c82a Merge pull request #21184 from owncloud/cli-logger-embedded-webserver 
Let's print error messages to the builtin webserver console ... makes…
 2015-12-16 20:26:29 +01:00
Vincent Petry
181ba7b4e1 Fix files UI mtime parsing from webdav 2015-12-16 17:44:16 +01:00
Thomas Müller
9a4ab698b7 Merge pull request #21232 from owncloud/fix-21230 
Use name of ICollection for exception message
 2015-12-16 16:04:04 +01:00
Morris Jobke
89233cab83 add unit test for #21230 2015-12-16 15:03:50 +01:00
Morris Jobke
66c0f4eb59 Use name of ICollection for exception message 
* fixes #21230
 2015-12-16 14:44:28 +01:00
Thomas Müller
aa6230e389 Merge pull request #21229 from owncloud/contrib-linktomaintainerspageforapps 
Replace list of apps with a link
 2015-12-16 14:19:23 +01:00
Vincent Petry
2daf9fcbcb Replace list of apps with a link 
The link points to the maintainers page that already contains a more up to date list of apps and repo links.
No need to have this information in two places.
 2015-12-16 13:58:18 +01:00
Jenkins for ownCloud
1d932e4c98 [tx-robot] updated from transifex 2015-12-16 01:55:55 -05:00
martin.mattel@diemattels.at
b7e8258d99 Statistics output for ./occ files:scan 2015-12-15 19:05:05 +01:00
C. Montero Luque
a376fec984 Merge pull request #21133 from owncloud/fix-shared-files-of-deleted-users 
Fix shared files of deleted users, detect DN change when checking for existence on LDAP
 2015-12-15 12:14:58 -05:00
Björn Schießle
3ce845e2b1 avoid duplicates on search 2015-12-15 15:40:47 +01:00
Thomas Müller
70e9e31497 Fix last Oracle issue 2015-12-15 14:52:27 +01:00
Thomas Müller
e5469a1121 Fix Oracle insert error 2015-12-15 14:52:27 +01:00
Björn Schießle
cd55a19034 implement delete, create, update, search, get permissions 2015-12-15 14:52:27 +01:00
Robin Appelman
667d7383e1 clear statcache after fopen for smb 2015-12-15 14:24:02 +01:00
Robin Appelman
38a2467a4f test for statcache after fopen 2015-12-15 13:48:17 +01:00
Thomas Müller
1ecda59c24 Merge pull request #21189 from owncloud/fix_21187 
File shares can't have create permissions
 2015-12-15 13:18:22 +01:00
Thomas Müller
67263ef8b4 Merge pull request #21067 from owncloud/fix_20296 
don't allow to create a federated share if source and target are the same
 2015-12-15 13:18:04 +01:00
Thomas Müller
de813c1025 Merge pull request #21209 from owncloud/remove-unneeded-ldap-code 
Remove unneeded upgrade code
 2015-12-15 13:17:22 +01:00
Morris Jobke
7608af6f7d Remove unneeded upgrade code 
stable8.2 has version 0.7.0 of the user_ldap app
 2015-12-15 09:38:29 +01:00
Arthur Schiwon
e39415c946 fix find DN by UUID for AD 2015-12-14 22:42:27 +01:00
Vincent Petry
1d37e7abfc Fixed JS unit tests for fed owner display name 2015-12-14 18:00:35 +01:00
Vincent Petry
064dcc079d Load base64 polyfill in IE and friends 2015-12-14 17:50:33 +01:00
Vincent Petry
595fd9de6e Add davidchambers/base64 JS library 2015-12-14 17:48:30 +01:00
Vincent Petry
ab9849e72f Use Authorization headers for public webdav instead of URL 
Instead of prepending the token as username in the URL, use the
Authorization header instead. This is because IE9 considers this a
cross-domain call and refuses to do it in the first place.
 2015-12-14 17:42:13 +01:00
Björn Schießle
c4b65170f2 show display name but internally use the user name 2015-12-14 17:25:10 +01:00
Björn Schießle
efc030aa25 don't allow to create a federated share if source and target server are the same 2015-12-14 17:16:14 +01:00
Roeland Jago Douma
843cf906b1 File shares can't have create permissions 
fixes #21187
 2015-12-14 14:03:14 +01:00
Thomas Müller
db41c4f4b5 Merge pull request #21181 from owncloud/files-fixsharedrootdetection 
Fix mount type root detection in web UI
 2015-12-14 13:50:35 +01:00
Robin Appelman
f27e98a3e2 Migrate files external for the user that the filesystem is being setup for 2015-12-14 13:38:54 +01:00
Thomas Müller
a7ecb6e984 Let's print error messages to the builtin webserver console ... makes development a bit easier 2015-12-14 12:16:41 +01:00
Thomas Müller
96b28382d9 Merge pull request #21148 from owncloud/resetpassword-user-issert 
Check if user isset in $_REQUEST first
 2015-12-14 11:27:46 +01:00
Vincent Petry
4d9e12b8bc Fix mount type root detection 
Since Webdav doesn't contain that information, we need to rely on the
parent folder's mount type to find out whether a child item is a
shared/external root or not.

Fixed the mount type detection logic and added unit test.

Also added a fix that ignores detection if no parent folder exists (ex:
shared file list, favorites, etc)
 2015-12-14 10:44:47 +01:00
Thomas Müller
583e696c9e Merge pull request #21163 from owncloud/fix_20839 
Files can't have create permissions
 2015-12-14 10:25:27 +01:00