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

17134 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
26a89e369e Merge pull request #8137 from owncloud/routeing-requirements 
add requirements to routing
 2014-04-10 16:23:01 +02:00
Thomas Müller
ecd74d3630 Merge pull request #8138 from owncloud/allow-app-in-routes.php 
To isolate the variable scope used inside the $file it is required in it...
 2014-04-10 16:09:23 +02:00
Tom Needham
654d5af394 Merge pull request #8027 from owncloud/routes-ocs 
Load all routes when matching an ocs route
 2014-04-10 12:22:34 +01:00
Vincent Petry
6cc578d1a7 Merge pull request #8018 from owncloud/ocs_result_success_is_100 
OC_OCS_Result Class, Only accept 100 code as success
 2014-04-10 13:03:10 +02:00
Vincent Petry
8d05848391 Merge pull request #7825 from owncloud/hash-stream 
Use streams when generating hashes of remote files
 2014-04-10 10:42:04 +02:00
Vincent Petry
9a8457aca0 Merge pull request #8053 from owncloud/preview-hook-root 
Pass the correct root to the preview on post_write
 2014-04-10 10:31:40 +02:00
Jenkins for ownCloud
7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
Thomas Müller
98a5f121fd To isolate the variable scope used inside the $file it is required in it's own method 2014-04-09 22:45:34 +02:00
Bernhard Posselt
70c88027db add requirements to routing 2014-04-09 21:57:32 +02:00
Thomas Tanghus
5b8c7a01e9 Merge pull request #8129 from owncloud/core-svgsupport 
Moved SVGSupport call to use OC.Util.SVGSupport()
 2014-04-09 19:15:37 +02:00
Joas Schilling
4c309b05ba Merge pull request #8128 from owncloud/fix/undefined-index-storage 
Fix Undefined index: storage in share.php
 2014-04-09 18:26:17 +02:00
Vincent Petry
f84d66a24f Moved SVGSupport call to use OC.Util.SVGSupport() 2014-04-09 15:23:09 +02:00
Joas Schilling
352063cf0a Fix Undefined index: storage in share.php 
There parameter was removed when the code was cleaned up:
{"app":"PHP","message":"Undefined index: storage at
E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160",
"level":0,"time":"2014-04-09T12:56:23+00:00"}
 2014-04-09 15:14:44 +02:00
Morris Jobke
d8f56e3c00 Merge pull request #8049 from owncloud/filepickersvg 
Fix file picker SVG issues
 2014-04-09 15:05:40 +02:00
Vincent Petry
b19671d204 Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js 
remove obsolete code
 2014-04-09 14:50:15 +02:00
blizzz
9feebeaf40 Merge pull request #7837 from owncloud/fix_7530 
LDAP: fix determining objectclasses takes long
 2014-04-09 12:27:17 +02:00
Arthur Schiwon
dbebf6bb5e add comment to clearify when a skip in the foreach happens 2014-04-09 12:25:48 +02:00
Jörn Friedrich Dreyer
9b0f289143 remove obsolete code 2014-04-09 12:09:28 +02:00
Joas Schilling
fbb9e11a7e Merge pull request #8122 from owncloud/issue/8048 
Always define sendmail_is_available in settings/admin.php
 2014-04-09 11:14:24 +02:00
Joas Schilling
e79a027e77 Always define sendmail_is_available 
Fix #8048
 2014-04-09 10:18:46 +02:00
Jenkins for ownCloud
796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Thomas Müller
1a09d64a77 Merge pull request #8117 from owncloud/fix-hard-coded-uman-str 
Make hardcoded exception messages translatable
 2014-04-08 22:45:19 +02:00
Thomas Müller
73ac3d0fcd Merge pull request #7643 from owncloud/chainable_response 
Chainable Response in AppFramework
 2014-04-08 22:42:43 +02:00
Vincent Petry
c1345d3a2d Merge pull request #8111 from owncloud/trash-disablesharing 
Disable sharing in trashbin app
 2014-04-08 21:00:44 +02:00
Volkan Gezer
a4f42676ea Make hardcoded exception messages translatable 2014-04-08 20:07:25 +02:00
Vincent Petry
35ab6fe5a9 Disable sharing in trashbin app 2014-04-08 17:13:59 +02:00
Thomas Müller
618914282a Merge pull request #8110 from owncloud/fix-failing-config-unit-test 
class Test_Config is already declared
 2014-04-08 16:26:35 +02:00
Thomas Müller
a4fc92b05b class Test_Config is already declared 2014-04-08 14:15:33 +02:00
Thomas Müller
411a810ebe Merge pull request #8032 from owncloud/fs-backend-registration 
Files External: allow dynamic backend registration
 2014-04-08 11:27:02 +02:00
Jenkins for ownCloud
4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04:00
Thomas Müller
9360dbf8a4 Merge pull request #8102 from owncloud/fix-appconfig-master 
Fix appconfig master
 2014-04-08 07:20:37 +02:00
Jörn Friedrich Dreyer
be9bc2c727 Merge pull request #8089 from bantu/autotest-checkout-pathspec 
Use git checkout on directory as some files may not be in git resulting ...
 2014-04-07 21:10:11 +02:00
Thomas Müller
c1fd300048 using array_key_exists() instead of isset() - required because in case the value is null isset is returning false 2014-04-07 21:05:48 +02:00
Thomas Müller
85e7921b14 fixing undefined exception classes 2014-04-07 20:57:08 +02:00
Thomas Müller
240d1ae6b9 unit test testSetAppValueIfSetToNull() added 2014-04-07 20:56:43 +02:00
Thomas Müller
c86bda0325 Merge pull request #8065 from owncloud/avatar-highdpi 
use high resolution avatars on highdpi screens
 2014-04-07 20:36:15 +02:00
Thomas Müller
3ac009c2b4 unit tests for dynamic backend registration 2014-04-07 20:18:57 +02:00
Jörn Friedrich Dreyer
3fde1b4342 Merge pull request #8091 from owncloud/jshint-globals-oc-t-n 
adding ownCloud globals to jshintrc: OC, t, n
 2014-04-07 20:06:28 +02:00
Thomas Müller
4253d63f9f ignore underscore.js in scrutinizer.yml 2014-04-07 17:11:30 +02:00
Thomas Müller
78e5410199 Merge branch 'master' into jshint-globals-oc-t-n 
Conflicts:
	.jshintrc
 2014-04-07 17:10:45 +02:00
Thomas Müller
1e559f7239 Merge pull request #8088 from owncloud/fix-personal.js 
reduce code duplication, fix parse error, prevent page reload on hitting...
 2014-04-07 16:59:32 +02:00
icewind1991
d3eee01190 Merge pull request #7599 from owncloud/public-pathinfo 
Allow using pathinfo based public.php paths
 2014-04-07 14:53:44 +02:00
Thomas Müller
d7bc23e16d adding ownCloud globals to jshintrc: OC, t, n 2014-04-07 14:50:32 +02:00
Thomas Müller
0fe32eee13 Merge pull request #8083 from owncloud/fix-link-to-sync 
Remove wrong whitespace from URL and use HTTPS
 2014-04-07 14:38:47 +02:00
Thomas Müller
21a54ba50f Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js 
Fix copy conflict dialog translation
 2014-04-07 14:38:00 +02:00
Andreas Fischer
de07f25bc2 Use git checkout on directory as some files may not be in git resulting in, e.g.: 
error: pathspec 'tests/data/lorem-copy.txt' did not match any file(s) known to git.
error: pathspec 'tests/data/testimage-copy.png' did not match any file(s) known to git.
 2014-04-07 14:06:20 +02:00
Thomas Müller
b2f8490be2 adding underscore.js 2014-04-07 14:05:58 +02:00
Thomas Müller
647abe512b reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085 2014-04-07 14:04:16 +02:00
blizzz
3c9f588449 Merge pull request #6221 from leo-b/ldap_get_all_groups 
fix updateGroups background job for ldap servers with > 1000 groups
 2014-04-07 13:00:32 +02:00
Jörn Friedrich Dreyer
779dff31c4 translations for oc-dialogs reside in code 2014-04-07 11:58:32 +02:00