Commit Graph

13316 Commits

Author SHA1 Message Date
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
Morris Jobke 84aba4542d Merge pull request #4702 from owncloud/center-utils
center utils
2013-09-03 02:27:52 -07:00
Morris Jobke 2da6f6b4ce Merge pull request #4695 from owncloud/placeholder-hsl
RGB -> HSL
2013-09-03 02:18:39 -07:00
Christopher a7de0e9652 Merge pull request #4706 from owncloud/fix_filepicker_mimetype
Use provided mimetype on open. Fix #4696
2013-09-02 19:36:03 -07:00
Thomas Tanghus 53a7f80ac3 Use provided mimetype on open. Fix #4696 2013-09-02 23:53:45 +02:00
blizzz 431cf06e99 Merge pull request #4672 from owncloud/ocs_cleanup
Ocs cleanup
2013-09-02 14:24:46 -07:00
Bernhard Posselt 87035fc478 center utils 2013-09-02 19:38:47 +02:00
Jan-Christoph Borchardt 9eeb27c91a placeholder.js: fix typo 2013-09-02 18:29:16 +02:00
Jan-Christoph Borchardt 57a1219ca0 placeholder.js: adjust saturation and lightness values 2013-09-02 18:20:18 +02:00
Owen Winkler f81a205f12 Merge pull request #4514 from owncloud/windows_ssl
Allow Windows (or Linux) users to specify OpenSSL options in the ownCloud config
2013-09-02 08:20:56 -07:00
Morris Jobke e7a14ea32d RGB -> HSL 2013-09-02 16:41:18 +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
Jörn Friedrich Dreyer 06870a6e39 Merge pull request #4673 from owncloud/ocsapi_cleanup
remove the activity call here. it is not implemented anyways.
2013-09-02 01:46:29 -07:00
Morris Jobke 91c0923cce Merge pull request #4663 from owncloud/fix-sticky-apps
fix issues caused by introduction of sticky Apps management footer
2013-09-02 01:11:09 -07:00
Morris Jobke a2f18eabb1 Merge pull request #4657 from owncloud/files-controls-fixes
Files controls fixes
2013-09-01 23:08:23 -07:00
Morris Jobke 8a4acf263e Merge pull request #4674 from owncloud/fit-filepicker-new-icons
Fit filesummary for \OC\Preview's new mimetype-icons
2013-09-01 23:06:59 -07:00
Morris Jobke 1e501a8521 IE8 fixes 2013-09-02 08:05:47 +02: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
Christopher 36424580b0 Merge pull request #4329 from owncloud/fix_4258
Fix #4258 and improve unittest
2013-09-01 08:46:27 -07:00
kondou 2d6a400381 Check for $this->fileInfo and @depend on testData() 2013-09-01 15:50:58 +02:00
Frank Karlitschek c54994d2e9 fixing this obvious typo directly 2013-09-01 08:23:11 +02:00
kondou 235638e5ab Merge branch 'master' into fix_4258
Conflicts:
	lib/image.php
2013-08-31 23:48:23 +02:00
kondou ebcd2a6b4d Fit filesummary for \OC\Preview's ne mimetype-icons 2013-08-31 19:21:51 +02:00
Frank Karlitschek f1836a997f remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future. 2013-08-31 18:14:46 +02:00
Frank Karlitschek a5633bb155 remove the config option that is no longer needed 2013-08-31 18:03:10 +02:00
Frank Karlitschek 58e036e304 remove knowledgebase calls that are no longer used in ownCloud 5/6 2013-08-31 18:00:53 +02: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
Thomas Müller 92e90c8eb9 Merge pull request #4022 from owncloud/oc_preview
\OC\Preview
2013-08-31 03:41:29 -07:00