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

11178 commits

Author SHA1 Message Date
Morris Jobke
de58364eb8 Handles null as return code and uses proper UserFolder in trashbin 2016-02-16 18:45:25 +01:00
Thomas Müller
c6fef52939 Merge pull request #22416 from owncloud/fix_22402 
Return proper error string if sharing for this user is disabled
 2016-02-16 13:37:22 +01:00
Thomas Müller
d5226c88ac Merge pull request #22338 from owncloud/fix_22247 
Allow more characters in filenames
 2016-02-16 13:37:07 +01:00
Roeland Jago Douma
ed6843e87b Return proper error string if sharing for this user is disabled 
Fixes #22402
 2016-02-16 10:22:49 +01:00
Thomas Müller
60d22f834f Merge pull request #22407 from fancycode/untrusted_domain 
Pass checked host as "domain" variable to "untrustedDomain" template.
 2016-02-16 08:29:02 +01:00
Jenkins for ownCloud
3dd1961f92 [tx-robot] updated from transifex 2016-02-16 01:55:39 -05:00
Joachim Bauch
0173063923 Pass checked host as "domain" variable to "untrustedDomain" template. 
Currently the "SERVER_NAME" is passed to the template, which in some cases doesn't match the host returned by "getInsecureServerHost" (or is empty).
 2016-02-15 17:02:14 +01:00
Thomas Müller
3ab328350a Merge pull request #22376 from owncloud/fix-return-code-getAppPath 
Properly handle return code of OC_App::getAppPath
 2016-02-15 16:58:37 +01:00
Thomas Müller
7b858d7c4a Merge pull request #22381 from owncloud/remove-not-needed-variable 
Remove not needed variable
 2016-02-15 12:02:03 +01:00
Jenkins for ownCloud
be34cea970 [tx-robot] updated from transifex 2016-02-15 01:55:28 -05:00
Thomas Müller
db79799eb8 Merge pull request #22380 from owncloud/make-scrutinizer-happy 
Fix typo in PHPDoc
 2016-02-15 07:01:41 +01:00
Morris Jobke
6cd3fa2ed7 Remove not needed variable 2016-02-14 21:44:53 +01:00
Morris Jobke
da06447c3b Fix typo in PHPDoc 2016-02-14 21:34:40 +01:00
Morris Jobke
083240482a Remove unreachable code in priavte/api.php 2016-02-14 21:12:29 +01:00
Morris Jobke
ef49f6ef5d Properly handle return code of OC_App::getAppPath 
* fixes #20128
* getAppPath could return false, but it was not handled everywhere
 2016-02-14 20:57:09 +01:00
Morris Jobke
e60e0fe22c Fix BMP support 
* fixes #16461
 2016-02-14 09:30:27 +01:00
Jenkins for ownCloud
7061416016 [tx-robot] updated from transifex 2016-02-14 01:55:37 -05:00
Thomas Müller
198d234068 Merge pull request #22345 from owncloud/make-note-if-appcodechecker-is-not-enabled 
Add note if integrity check is disabled
 2016-02-13 18:24:26 +01:00
Thomas Müller
0b4895bc7c Merge pull request #22343 from owncloud/check-if-admin-user 
Check if admin user
 2016-02-13 18:24:17 +01:00
Jenkins for ownCloud
2344c8e07d [tx-robot] updated from transifex 2016-02-13 01:55:39 -05:00
Morris Jobke
5fe55de6d8 Always set up a config object within the user object 
* the new getEmailAddress and setEmailAddress relies on this anyway
 2016-02-12 16:33:37 +01:00
Lukas Reschke
29ce56ed07 Check if admin user 
We should not add the JS for not admin users.
 2016-02-12 14:37:50 +01:00
Lukas Reschke
4b90429178 Add note if integrity check is disabled 
Our issue template states that users should post the output of `/index.php/settings/integrity/failed`, at the moment it displays that all passes have been passed if the integrity checker has been disabled.

This is however a wrong approach considering that some distributions are gonna package Frankenstein releases and makes it harder for us to detect such issues. Thus if the integrity code checker is disabled (using the config switch)  it displays now: `Appcode checker has been disabled. Integrity cannot be verified.`

This is not displayed anywhere else in the UI except these URL used for us for debugging purposes.
 2016-02-12 11:11:39 +01:00
Thomas Müller
207c09c511 Merge pull request #22309 from owncloud/infinite-recursion-on-expired-link 
Do not getShare in deleteShare, it's already there when deleting
 2016-02-12 11:11:26 +01:00
Thomas Müller
e99c4d83dc Merge pull request #22317 from owncloud/fix_invisible_linkshares 
Do not allow invisible link shares
 2016-02-12 11:10:58 +01:00
Jenkins for ownCloud
f8607ac132 [tx-robot] updated from transifex 2016-02-12 01:56:04 -05:00
Roeland Jago Douma
6bd0d51b2a More characters are allowed on POSIX systems 2016-02-12 07:49:31 +01:00
Thomas Müller
dfe267424f Merge pull request #22315 from owncloud/update-info-checker-requirements 
Update info checker requirements
 2016-02-11 14:31:47 +01:00
Thomas Müller
207c1a661b Merge pull request #22264 from owncloud/read-version-from-info.xml-only 
No longer evaluate appinfo/version
 2016-02-11 14:28:51 +01:00
Thomas Müller
27a4c9f625 Merge pull request #22308 from owncloud/shorter-ttl-find-path 
Shorter TTL on  findBinaryPath caching
 2016-02-11 14:02:24 +01:00
Roeland Jago Douma
4533cb9c59 Add parent for invisible link shares 2016-02-11 13:29:23 +01:00
Joas Schilling
8cfdc62eae Update info checker requirements 2016-02-11 11:54:13 +01:00
Roeland Jago Douma
dd630e33ea Properly check for legacy methods 
The new shares are completely without parents eventually. But for some
current legacy reasons the methods are still around. But we should
properly check for them.

Fixes #22309
 2016-02-11 11:30:52 +01:00
Joas Schilling
ee080a9bc3 Do not getShare in deleteShare, it's already there when deleting 2016-02-11 11:21:06 +01:00
Thomas Müller
2efb97ba09 Fixes #13658 2016-02-11 10:53:18 +01:00
Jenkins for ownCloud
5165998723 [tx-robot] updated from transifex 2016-02-11 01:55:35 -05:00
Thomas Müller
3184115c3c Merge pull request #22285 from owncloud/fix_22275 
Only show link shares for the current user
 2016-02-10 20:01:41 +01:00
Thomas Müller
6ffb83ae19 Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-of-entries-to-cleanup 
Chunk the cleanup queries to make sure they don't time out
 2016-02-10 17:26:11 +01:00
Thomas Müller
39e6a1897b Merge pull request #22271 from owncloud/remember-login-state 
Remember previous state of remember login checkbox
 2016-02-10 17:25:34 +01:00
Thomas Müller
8b165c5ed5 No longer evaluate appinfo/version 2016-02-10 17:24:14 +01:00
Roeland Jago Douma
9651defe3f Also filter the old share info endpoint 
Make sure we do not show an icon if we can't display a share
 2016-02-10 17:05:57 +01:00
Vincent Chan
06b2f11e57 refactoring code 2016-02-10 15:28:14 +01:00
Thomas Müller
5c89cf9565 Merge pull request #22267 from owncloud/fix_encryption2 
calculate and update the version of the encryption signature correctly
 2016-02-10 15:14:52 +01:00
Bjoern Schiessle
9dc759b4dc remember signature version and only set it on update to make sure that other 
apps like files_versions still get the old signature version
 2016-02-10 13:27:32 +01:00
Joas Schilling
0ebb205010 Chunk the queries to make sure they don't time out 2016-02-10 13:04:37 +01:00
Thomas Müller
a8d9eb5320 Merge pull request #22256 from owncloud/hide-updater-secret 
Hide updater.secret from occ output by default
 2016-02-10 08:58:46 +01:00
Jenkins for ownCloud
9ebcc4ce31 [tx-robot] updated from transifex 2016-02-10 01:56:05 -05:00
Vincent Petry
3736f13826 Check if partial cache entry or not in encryption wrapper 2016-02-09 23:43:27 +01:00
Lukas Reschke
5ccb9dfa7e Use database for keeping track of the version 2016-02-09 23:43:27 +01:00
Lukas Reschke
3badf5caf5 Use number of chunk for HMAC as well 
Prevents switching single blocks within the encrypted file.
 2016-02-09 23:43:26 +01:00