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

30853 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
9942263409 Merge pull request #22392 from owncloud/create-default-calendar-and-addressbook 
On login we create a default calendar and a default addressbook for t…
 2016-02-16 08:29:54 +01:00
Thomas Müller
e5641247a3 Merge pull request #22403 from owncloud/improved-error-handling 
Remove background job if the server accepted to ask for the shared secret
 2016-02-16 08:29:38 +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
Thomas Müller
1e287f2c38 No more code coverage on scrutinizer 2016-02-16 08:22:57 +01:00
Jenkins for ownCloud
3dd1961f92 [tx-robot] updated from transifex 2016-02-16 01:55:39 -05:00
Bjoern Schiessle
9d1d08bf9b forbidden (403) is a valid return status, don't log the whole exception in this case 2016-02-15 18:03:10 +01:00
Bjoern Schiessle
835e70dbe2 throw exception if we don't find a token for a given server 2016-02-15 18:03:10 +01:00
Bjoern Schiessle
cc397da1be Remove background job if the server accepted to ask for the shared secret 
If we don't remove it the server will later ask the remote server to ask for
the shared secret which will result in a error log message on the remote server
and in some circumstances maybe even to a failure
 2016-02-15 18:03:10 +01:00
Thomas Müller
907430a808 Merge pull request #22406 from pierreozoux/patch-1 
typo
 2016-02-15 18:02:55 +01:00
Vincent Petry
d38b71f206 Fix GDrive mime type detection with encryption 
When encryption is enabled, GDrive would think that all files are text
files. This fix falls back to the extension based detection when a
non-special mime type is returned
 2016-02-15 17:09:08 +01:00
Pierre Ozoux
e611b85f51 typo 2016-02-15 16:03:16 +00: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
Vincent Petry
075dd54f6c Fix GDrive handling of office files 
1) Properly detect empty file extension, can be null.

2) When renaming part file to final file, use the correct file name
without extension, if it exists

3) When renaming a file, do not delete the original file if it had the
same id, which can happen with part files
 2016-02-15 16:49:12 +01:00
Lukas Reschke
dfc3536d2b Catch auth coming from JS in OCS 2016-02-15 15:38:37 +01:00
Vincent Petry
d565290d16 Close file detail sidebar when selecting/unselecting files 
Interacting with the checkboxes, also "Select all" will automatically
close the sidebar now.
 2016-02-15 14:58:44 +01:00
Joas Schilling
7e4c3b577c Add index names so Doctrine does not use a too long random string 2016-02-15 14:52:41 +01:00
Thomas Müller
722809c2bd On login we create a default calendar and a default addressbook for the user - fixes #22360 2016-02-15 14:41:54 +01:00
Thomas Müller
df7280a3c7 Queries on the cards table by uri require the addressbook as well - fixes #22284 2016-02-15 14:29:24 +01:00
Morris Jobke
7048d428b1 Remove unneeded parameter from OC_App::getEnabledApps 2016-02-15 13:33:07 +01:00
Thomas Müller
7313cfb882 Update TarStreamer to v0.1.0 2016-02-15 13:10:43 +01:00
Vincent Petry
b8b77709c0 Add handler for global ajax errors 2016-02-15 12:48:47 +01:00
Thomas Müller
294dcb4eff Adding global error handler for ajax calls which run into redirections or unauthorized responses 2016-02-15 12:47:18 +01:00
Thomas Müller
46b39c3465 Merge pull request #22337 from owncloud/new_reshare_no_initiator 
On backend hickups don't crash OCS output
 2016-02-15 12:02:52 +01:00
Thomas Müller
fd21bfd9e8 Merge pull request #22358 from owncloud/fix-22278 
Fix race condition when switching filter mode. Fixes #22278
 2016-02-15 12:02:35 +01:00
Thomas Müller
40188c87a1 Merge pull request #22379 from owncloud/limit-scrutinizer-scope 
Limit scope of scrutinizer to actual application code
 2016-02-15 12:02:21 +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
Thomas Müller
be65ba4089 Merge pull request #22383 from owncloud/better-sharee-translations 
Do not use string concatination for translations
 2016-02-15 11:16:16 +01:00
Joas Schilling
cb836158f0 Deduplicate slashes 2016-02-15 10:54:56 +01:00
Thomas Müller
2054dbd4c8 Merge pull request #22350 from owncloud/fix_22304 
WebUI feedback when sharing
 2016-02-15 10:45:42 +01:00
Joas Schilling
c8ddbc385c Do not use string concatination for translations 2016-02-15 09:20:15 +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
Thomas Müller
6cfe8caadb Merge pull request #22375 from owncloud/fix_22352 
Search tags in UI case insensitive
 2016-02-15 06:59:15 +01:00
Thomas Müller
e5681bf9a1 Merge pull request #22378 from owncloud/drop-unreachable-code 
Remove unreachable code in priavte/api.php
 2016-02-15 06:55:16 +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
25655edfa6 Limit scope of scrutinizer to actual application code 2016-02-14 21:18:56 +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
Roeland Jago Douma
33ef240b39 Search tags case insensitive 
fixes: #22352

* Added unit tests
 2016-02-14 20:41:39 +01:00
Thomas Müller
ac367b97f0 Merge pull request #22369 from owncloud/fix-bmp-support 
Fix BMP support
 2016-02-14 11:38:40 +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
296519f44a Merge pull request #22357 from owncloud/tags-hideonrename 
Properly hide tag name on rename
 2016-02-13 18:25:13 +01:00
Thomas Müller
11707dffce Merge pull request #22351 from owncloud/fix_22277 
show remote server on federated share auto-complete
 2016-02-13 18:25:04 +01: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
Thomas Müller
248c571c56 Merge pull request #22331 from owncloud/dav-nonexisting-part 
fix getNodeForPath for non existing part files
 2016-02-13 18:24:00 +01:00
Jenkins for ownCloud
2344c8e07d [tx-robot] updated from transifex 2016-02-13 01:55:39 -05:00