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

6216 commits

Author SHA1 Message Date
Bjoern Schiessle
4d2dfa98c0 check if key exists before reading it 2013-09-26 11:06:58 +02:00
Bjoern Schiessle
4077ed6ddb add some additional assertions to the tests 2013-09-25 15:05:23 +02:00
Thomas Müller
333d3eda99 add error message to the assert 2013-09-25 09:43:16 +02:00
Bjoern Schiessle
259f03bee2 remove debug output 2013-09-23 14:10:09 +02:00
Bjoern Schiessle
7626540679 make sure that files are shared correctly before each test and unshared again after the test 2013-09-20 12:38:23 +02:00
Bjoern Schiessle
bd09910f67 disable encrpytion app before performing tests 2013-09-20 11:24:18 +02:00
Bjoern Schiessle
96c27ead92 check if encryption app is enabled 2013-09-20 11:21:34 +02:00
Bjoern Schiessle
57092e817f disable encryption app for share API tests 2013-09-19 20:14:34 +02:00
Bjoern Schiessle
39920955f2 set share id to 'unknown' if we can't retrive one 2013-09-19 16:52:44 +02:00
Bjoern Schiessle
c9f1538c1f extend API to get the shares from all files in a given folder 2013-09-19 16:41:29 +02:00
Bjoern Schiessle
8cf8c0b161 remove some unused variables 2013-09-19 14:42:34 +02:00
Bjoern Schiessle
b947aab802 some unit test for the new ocs share api 2013-09-19 14:39:51 +02:00
Bjoern Schiessle
199121134f return error if wrong shareType is given 2013-09-19 10:33:04 +02:00
Bjoern Schiessle
171b7ebffe remove debug output 2013-09-18 10:11:20 +02:00
Bjoern Schiessle
e52639e4e6 use share ID as REST resource 2013-09-17 15:27:46 +02:00
Bjoern Schiessle
86dbb13823 more rest-style API 2013-09-17 11:53:38 +02:00
Bjoern Schiessle
ef3307f099 return error if public upload is disabled 2013-09-16 17:42:56 +02:00
Bjoern Schiessle
7aed24fa6c allow to set a different permission during initial share operation 2013-09-16 17:28:17 +02:00
Bjoern Schiessle
14437ffd15 ocs api for file sharing 2013-09-16 17:04:49 +02:00
Bjoern Schiessle
3861c9bce1 some more OCS calls for sharing 2013-09-06 16:00:01 +02:00
Bjoern Schiessle
b6ee727399 intermediate result ocs api 2013-09-06 10:49:21 +02:00
Bjoern Schiessle
21a0a96e43 intermediate results, share api 2013-09-04 17:25:15 +02:00
Bjoern Schiessle
985758305f initial commit, start implementing the ocs share api 2013-09-04 14:32:05 +02:00
Jörn Friedrich Dreyer
85758f3d7d Merge pull request #4473 from owncloud/texteditor_polishing 
Texteditor polishing
 2013-09-03 05:38:59 -07:00
Jenkins for ownCloud
fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Jörn Friedrich Dreyer
449fe8c75e Revert "remove editor div in filelist", add "is deprecated" comment 
This reverts commit 64d09452f5.
 2013-09-03 13:20:20 +02:00
ringmaster
39f4538e0f This function doesn't cache anymore. Adjusted PHPDoc to suit. 2013-09-02 09:59:01 -04:00
ringmaster
df7bfa4bf0 Don't cache the pkey, skip generation if the keyfile exists 2013-09-02 09:59:00 -04:00
Owen Winkler
9a263a500a Employ config option for OpenSSL config file, if provided. 
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
 2013-09-02 09:59:00 -04:00
Owen Winkler
fb34f49913 Start a branch for easier OpenSSL configuration. 2013-09-02 09:58:19 -04:00
Bernhard Posselt
f038cb9aea Merge pull request #4671 from owncloud/emptycontent 
centers text message in empty-content page (files and files_trashbin apps)
 2013-09-01 17:47:55 -07:00
Jenkins for ownCloud
e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
Alessandro Cosentino
b10a646bc8 rename emptyfolder to emptycontent 2013-08-31 11:25:11 -04:00
Alessandro Cosentino
4b32d84314 text centered horizontally and vertically in emptycontent div 2013-08-31 11:12:07 -04:00
Georg Ehrke
668c4c2652 fix issue with filetable background 2013-08-30 22:05:44 +02:00
Georg Ehrke
8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
Georg Ehrke
40cee5639e use gerMimeTypeDetector detectPath instead of getMimeType 2013-08-30 18:07:49 +02:00
Jenkins for ownCloud
dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
petemcfarlane
ab1f78eac3 prefix 'tbody tr' to separate app/core css errors 
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
 2013-08-30 10:48:04 +01:00
Georg Ehrke
b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
Thomas Müller
81cab5ada8 Merge pull request #3926 from owncloud/improve_filesummary 
Improve filelist summary
 2013-08-28 15:11:09 -07:00
Bjoern Schiessle
aed71bb420 also move empty folders to the trash bin as discussed here #4590 2013-08-28 15:46:44 +02:00
Bart Visscher
ada15a2b8e Merge pull request #4489 from owncloud/clean-3rdparty-mess-master 
Clean 3rdparty mess master
 2013-08-28 06:12:58 -07:00
kondou
6bd0f3cba7 Reimplement filesummary in JS 
Fix #993
 2013-08-28 15:10:17 +02:00
Morris Jobke
5a03707184 Merge pull request #4601 from owncloud/fixing-4341-master 
backport of #4357 to master
 2013-08-28 04:42:50 -07:00
Jenkins for ownCloud
3e7ddbc9d9 [tx-robot] updated from transifex 2013-08-28 06:24:14 -04:00
Thomas Müller
3eed060ec9 backport of #4357 to master 2013-08-27 23:53:04 +02:00
Morris Jobke
34a32d862c Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement 
Fix "select all" checkbox displacement when checked, fix #4571
 2013-08-27 14:21:34 -07:00
Arthur Schiwon
321c514782 LDAP: case insensitive replace for more robustness 2013-08-27 22:23:48 +02:00
Jenkins for ownCloud
d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00