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 |
Jenkins for ownCloud
|
fe0b8ac2c0
|
[tx-robot] updated from transifex
|
2013-09-03 07:46:55 -04:00 |
|
Jenkins for ownCloud
|
e68b5f8b0d
|
[tx-robot] updated from transifex
|
2013-09-01 13:30:40 -04:00 |
Georg Ehrke
|
b7758d0f8d
|
Merge master into oc_preview
|
2013-08-29 10:50:55 +02:00 |
|
Thomas Müller
|
3eed060ec9
|
backport of #4357 to master
|
2013-08-27 23:53:04 +02:00 |
|
Jenkins for ownCloud
|
d5062b9e0e
|
[tx-robot] updated from transifex
|
2013-08-27 11:23:18 -04:00 |
|
Thomas Müller
|
c9123263ab
|
kill zh_CN.GB2312
|
2013-08-27 01:27:05 +02:00 |
|
Georg Ehrke
|
6f0c1e8d45
|
Merge master into oc_preview
|
2013-08-26 12:24:33 +02:00 |
|
Jenkins for ownCloud
|
d587146a5a
|
[tx-robot] updated from transifex
|
2013-08-25 19:21:52 -04:00 |
|
Georg Ehrke
|
6ffa2a28d0
|
Merge branch 'master' into oc_preview
|
2013-08-23 23:10:37 +02:00 |
|
Georg Ehrke
|
224b80f906
|
move isMimeSupported out of template files
|
2013-08-21 15:55:59 +02:00 |
Christopher
|
90da518e3e
|
Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
|
2013-08-20 12:45:10 -07:00 |
|
Jenkins for ownCloud
|
e9644c2f52
|
[tx-robot] updated from transifex
|
2013-08-19 15:14:38 -04:00 |
|
Georg Ehrke
|
d9e8ebabdc
|
outsource sharing and deleted files previews to apps
|
2013-08-19 13:24:07 +02:00 |
icewind1991
|
d7dde3cfbc
|
Merge pull request #4467 from owncloud/storage-wrapper-quota
Move quota logic from filesystem proxy to storage wrapper
|
2013-08-19 03:38:55 -07:00 |
|
Georg Ehrke
|
f2702ff1ca
|
Merge master into oc_preview
|
2013-08-19 11:24:17 +02:00 |
|
Kondou
|
c7af26ec84
|
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
|
2013-08-18 07:16:15 -07:00 |
Robin Appelman
|
d8c71ba734
|
merge master in storage-wrapper-quota
|
2013-08-18 11:34:56 +02:00 |
|
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
|
kondou
|
edd92e4c09
|
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
|
2013-08-18 00:38:52 +02:00 |
Andreas Fischer
|
4bb0e1567b
|
Use boolean casting for bitwise and result.
|
2013-08-17 23:41:37 +02:00 |
Bart Visscher
|
29b6dd53a0
|
Compare result are already true/false
|
2013-08-17 12:58:10 +02:00 |
|
Thomas Müller
|
de52157e76
|
remove ru_RU - fixes #3135
|
2013-08-17 11:43:37 +02:00 |
|
Jenkins for ownCloud
|
6bd0ba79df
|
[tx-robot] updated from transifex
|
2013-08-16 01:32:30 -04:00 |
|
Thomas Müller
|
bd1895bdf8
|
Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-15 14:08:01 -07:00 |
|
Georg Ehrke
|
4b5fb08c2c
|
Merge master into oc_preview
|
2013-08-14 20:56:44 +02:00 |
|
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 -04:00 |
|
Jenkins for ownCloud
|
98f836363a
|
[tx-robot] updated from transifex
|
2013-08-09 08:06:31 -04:00 |
Jörn Friedrich Dreyer
|
ff67f115d4
|
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-08 13:50:04 +02:00 |
|
Jenkins for ownCloud
|
0deae7b86f
|
[tx-robot] updated from transifex
|
2013-08-07 09:04:32 -04:00 |
|
Georg Ehrke
|
41ba155a14
|
fix js error
|
2013-08-07 11:58:49 +02:00 |
|
Georg Ehrke
|
91bd4dd67b
|
implement previews of single shared files
|
2013-08-07 11:48:08 +02:00 |
|
Georg Ehrke
|
af983b843d
|
fix merge conflicts
|
2013-08-05 14:27:38 +02:00 |
|
Jenkins for ownCloud
|
17fe748abc
|
[tx-robot] updated from transifex
|
2013-08-03 01:56:46 -04:00 |
|
Jenkins for ownCloud
|
16726ab793
|
[tx-robot] updated from transifex
|
2013-08-02 02:00:45 -04:00 |
|
kondou
|
1348330c7d
|
Fix a syntax error & have if-conds in an own line
|
2013-08-01 18:44:01 +02:00 |