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

30513 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
6c0e9211e9 Merge pull request #22429 from owncloud/fix-coverage-reporting 
Fix coverage reporting
 2016-02-16 15:35:55 +01:00
Thomas Müller
6aa1965db7 Merge pull request #22430 from owncloud/add-new-apps-to-transifex 
Adding transifex to new core apps
 2016-02-16 15:10:34 +01:00
Jenkins for ownCloud
7942f3d7ec [tx-robot] updated from transifex 2016-02-16 08:49:12 -05:00
Thomas Müller
3503eb69f2 Adding transifex to new core apps 2016-02-16 14:40:10 +01:00
Thomas Müller
4b376305e9 Fix coverage reporting 2016-02-16 14:21:28 +01:00
Thomas Müller
6edd6e640b Merge pull request #22413 from owncloud/kill-coverage-on-scrutinizer 
No more code coverage on scrutinizer
 2016-02-16 14:05:32 +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
Morris Jobke
3e8b025f2f Merge pull request #22417 from owncloud/issue-22389-duplicate-output-message 
Remove inaccurate "is already enabled" message
 2016-02-16 13:21:38 +01:00
Joas Schilling
4eef8afe9b Remove inaccurate "is already enabled" message 2016-02-16 10:59:06 +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
1cb3583a9a Merge pull request #22398 from owncloud/fix-card-properties 
Queries on the cards table by uri require the addressbook as well
 2016-02-16 10:19:51 +01:00
Thomas Müller
8c90fea7ba Add script to generate coverage badges 2016-02-16 10:07:00 +01:00
Thomas Müller
18b64e0074 Merge pull request #22390 from owncloud/update-tarstreamer 
Update TarStreamer to v0.1.0
 2016-02-16 09:20:23 +01:00
Thomas Müller
3a55229915 Merge pull request #22400 from owncloud/files-select-closesidebar 
Close file detail sidebar when selecting/unselecting files
 2016-02-16 09:15:14 +01:00
Thomas Müller
3837cb95fd Merge pull request #22377 from owncloud/remove-unneeded-code 
Remove unneeded parameter from OC_App::getEnabledApps
 2016-02-16 08:30:20 +01:00
Thomas Müller
f850871415 Merge pull request #22385 from owncloud/issue-22384-invalid-content-location-on-commenting 
Posting a comment replies with invalid location URL
 2016-02-16 08:30:11 +01:00
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
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
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
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
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