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

21674 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
980dd4d22a replace double quotes with single quotes 2014-11-19 13:15:04 +01:00
Morris Jobke
fef9d4218c replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfig 2014-11-19 13:06:22 +01:00
Lukas Reschke
1c8f9564a4 Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword 
Warn for password reset when files_encryption is enabled
 2014-11-19 13:05:02 +01:00
Bernhard Posselt
4e90c44301 add postfix 
add postfix
 2014-11-19 12:01:42 +01:00
Morris Jobke
dc9eaf59dc Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-enabled 
Only show undelete capability if files_trashbin is enabled
 2014-11-19 11:42:19 +01:00
Vincent Petry
cd60a27ad6 Remove stray generateUrl 2014-11-19 10:59:38 +01:00
Jenkins for ownCloud
705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Lukas Reschke
61641293f4 Only show undelete capability if files_trashbin is enabled 
Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
 2014-11-18 23:06:39 +01:00
Thomas Müller
24d4d5e2a1 Merge pull request #12270 from owncloud/fix-search-label 
User management search just searches users - adjust label of input field...
 2014-11-18 22:50:05 +01:00
Thomas Müller
45e770733e Merge pull request #12272 from owncloud/drop-var_dump 
drop unneeded var_dump - fixes #9997
 2014-11-18 22:39:48 +01:00
Morris Jobke
d40bdfb35e drop unneeded var_dump - fixes #9997 2014-11-18 22:36:42 +01:00
Morris Jobke
256eff6eac User management search just searches users - adjust label of input field - fixes #10229 2014-11-18 22:12:14 +01:00
Morris Jobke
81d112fb42 Merge pull request #12261 from oparoz/patch-1 
Replace deprecated switches
 2014-11-18 18:59:34 +01:00
Lukas Reschke
a6ebb17610 Remove unused variable and make Scrutinizer happy. 2014-11-18 18:52:00 +01:00
Lukas Reschke
f3ab4f3faf Don't disclose relative directory path for single shared files of user 
The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.

However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)

This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.
 2014-11-18 18:51:57 +01:00
Lukas Reschke
5f07fb15dc Fix case-sensitivity 2014-11-18 18:50:47 +01:00
Lukas Reschke
3b0a7574d6 Merge pull request #12264 from owncloud/use-full-path-for-filesize-calculation 
Use full path instead of only the filename
 2014-11-18 18:11:31 +01:00
Björn Schießle
106d0f9c75 Merge pull request #12224 from owncloud/fix_12211 
make sure that we don't find the wrong shares if a user and a group have the same ID
 2014-11-18 17:26:02 +01:00
Lukas Reschke
1b85f40cbe $file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned. 
This feature only exists on master.
 2014-11-18 17:14:26 +01:00
Olivier Paroz
cb118ce371 Replace deprecated switches 
Warning: -convert-to is deprecated.  Use --convert-to instead.
Warning: -outdir is deprecated.  Use --outdir instead.
 2014-11-18 15:04:01 +01:00
Lukas Reschke
309788003d Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager 
Fix type hinting for app manager
 2014-11-18 13:56:40 +01:00
Lukas Reschke
8d4e63dd7c Merge pull request #12242 from owncloud/fix-undefined-size 
Check if the size field is available
 2014-11-18 12:37:16 +01:00
Lukas Reschke
260a084d27 Add repair steps for legacy config files 
Remove all ports from the trusted domains

Conflicts:
	lib/private/repair.php
	lib/repair/repairconfig.php
 2014-11-18 12:36:03 +01:00
Lukas Reschke
d0a30b0e55 Ignore port for trusted domains 
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)

Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.

Conflicts:
	lib/private/request.php
 2014-11-18 12:36:03 +01:00
Robin Appelman
0b630a37ab Fix type hinting for app manager 2014-11-18 12:22:13 +01:00
Vincent Petry
152da9796b Added function to load translations from JS 
For apps that support async translation loading, a new function
OC.L10N.load() can be used to asynchronously load the translations
for a given app.
 2014-11-18 12:20:01 +01:00
Bjoern Schiessle
ea4eedd35a only users can have a display name different from the id 2014-11-18 11:46:28 +01:00
Bjoern Schiessle
01c50d242b use the new base class for unit tests 2014-11-18 11:46:28 +01:00
Bjoern Schiessle
367468ff1f make sure that we only find the shares from the correct share type if users and groups with the same ID exists 2014-11-18 11:11:49 +01:00
Bjoern Schiessle
5192641447 make sure that we don't find the wrong shares if a user and a group have the same ID 2014-11-18 11:03:08 +01:00
Morris Jobke
230e517f35 Merge pull request #12220 from owncloud/remove-unused-code 
Remove unused code
 2014-11-18 10:36:32 +01:00
Morris Jobke
36ba935381 Merge pull request #12237 from owncloud/fix-12236 
Make declaration compatible
 2014-11-18 10:30:17 +01:00
Morris Jobke
345eb62ffa center spinner 2014-11-18 10:25:16 +01:00
Lukas Reschke
8071657cd5 Merge pull request #12234 from owncloud/normalizepath-absolute-tests 
Add tests for normalizePath() with absolute paths on windows
 2014-11-18 10:24:46 +01:00
Lukas Reschke
944cd327b1 Merge pull request #9962 from owncloud/app-group-enable-remote 
Fix remote.php routes for apps that are enabled for specific groups
 2014-11-18 10:08:20 +01:00
Jenkins for ownCloud
91f7c0af6e [tx-robot] updated from transifex 2014-11-18 01:54:31 -05:00
Lukas Reschke
6535540dcd Check if the size field is available 
In some cases the 'size' field is not available resulting in some PHP errors such as:

```json
{"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"}
```

This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.
 2014-11-17 22:39:40 +01:00
Lukas Reschke
e8f90133e0 Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse 
Move CSRF check
 2014-11-17 18:34:55 +01:00
Lukas Reschke
0b9dffa828 Make declaration compatible 
Fixes #12236
 2014-11-17 18:30:17 +01:00
Lukas Reschke
9eeea57e3a Show spinner 2014-11-17 17:50:25 +01:00
Morris Jobke
68e77f4659 fix unreadable label in warning box 2014-11-17 17:50:20 +01:00
Lukas Reschke
f530865b3d Hide submit button after password change 
Creating a new key pair can take 1-2 seconds. So it could happen that the user click the "Reset password" button again which can lead to many nasty things, e.g. we could create two new key pairs in parallel.
 2014-11-17 17:50:20 +01:00
Bjoern Schiessle
f6efbfcf0b listen to the post_passwordReset hook, backup the old keys and create a new key pair for the user 2014-11-17 17:50:20 +01:00
Bjoern Schiessle
11ab457b72 add password as parameter to the signal so that the encryption can create a new key-pair 2014-11-17 17:50:19 +01:00
Lukas Reschke
357465eac9 Add "postPasswordReset" hook 2014-11-17 17:50:19 +01:00
Lukas Reschke
767b08c669 Use correct route instead 
THX @schiesbn
(I should setup a mail server on my local system...)
 2014-11-17 17:50:19 +01:00
Lukas Reschke
57b5c82eb7 Remove uneeded import 2014-11-17 17:50:19 +01:00
Lukas Reschke
60ae2894aa Fix scrutinizer issues 2014-11-17 17:50:19 +01:00
Lukas Reschke
1b50d4f7ce Warn for password reset when files_encryption is enabled 
This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password.

Furthermore I updated the code to use our new classes and added some unit tests for it 👯

Fixes https://github.com/owncloud/core/issues/11438
 2014-11-17 17:50:19 +01:00
Joas Schilling
ccc1001138 Add tests for absolute paths on windows 2014-11-17 16:59:11 +01:00