mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,410 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

533 Commits

Author SHA1 Message Date
Thomas Müller 60489764f3 Merge pull request #1133 from owncloud/add_linebreaks_in_sharing 
add more linebreaks, replace SQL LIMIT with param
 2013-01-10 15:14:14 -08:00
Jenkins for ownCloud d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Jenkins for ownCloud 912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Jörn Friedrich Dreyer 42e3eaf45a add more linebreaks, replace SQL LIMIT with param 2013-01-09 13:57:51 +01:00
Michael Gapczynski 0b13b41189 Merge pull request #1053 from owncloud/ocs_api 
External API for ownCloud based on OCS
 2013-01-04 17:18:58 -08:00
Jenkins for ownCloud 3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Tom Needham 3d23e98390 Remove the WIP external sharing api 2012-12-31 16:31:22 +00:00
Tom Needham 6eb194b702 Merge branch 'master' into ocs_api 
Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
 2012-12-31 15:47:15 +00:00
Jenkins for ownCloud 329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Jenkins for ownCloud 66e57f5fb1 [tx-robot] updated from transifex 2012-12-30 00:05:52 +01:00
Jenkins for ownCloud 0656b41747 [tx-robot] updated from transifex 2012-12-23 00:10:23 +01:00
Jenkins for ownCloud a4b0df419e [tx-robot] updated from transifex 2012-12-18 00:14:58 +01:00
Tom Needham 3c98f36121 Merge branch 'master' into ocs_api 2012-12-16 22:29:00 +00:00
Bart Visscher 2ef2dc4dda Fix "There must be a single space between the closing parenthesis and the opening brace" 2012-12-15 00:43:46 +01:00
Tom Needham 5fe6129698 Merge master into ocs_api, fix conflicts. 2012-12-14 15:15:05 +00:00
Thomas Müller 8b4aad73c7 Merge pull request #810 from owncloud/send-share-link-by-email 
restoring feature to send sharing link via email
 2012-12-12 04:54:51 -08:00
Thomas Mueller 162a2c0fba moving sharing email code to core 2012-12-10 23:22:42 +01:00
Thomas Mueller 45074d5023 restoring feature to send sharing link via email 2012-12-10 18:41:08 +01:00
Jenkins for ownCloud a444999a8c [tx-robot] updated from transifex 2012-12-10 00:12:32 +01:00
Björn Schießle bf0f39f5b4 make sure that all expected array keys are available 2012-12-06 15:57:53 +01:00
Jenkins for ownCloud 524f3c3c0b [tx-robot] updated from transifex 2012-12-05 00:04:55 +01:00
Jenkins for ownCloud 16a630024c [tx-robot] updated from transifex 2012-11-30 00:05:16 +01:00
Jenkins for ownCloud 1d4d4fd678 [tx-robot] updated from transifex 2012-11-28 00:11:21 +01:00
Jörn Friedrich Dreyer 71e8755d31 Merge pull request #380 from butonic/feature_share_link_with_token 
Feature share link with token
 2012-11-26 07:42:53 -08:00
Jörn Friedrich Dreyer 995b5c0739 readd fallback code for pre token links 2012-11-23 15:51:57 +01:00
Thomas Müller c773d071ee Merge pull request #506 from owncloud/fix_505 
refs #505 - defining publicListView based on template parameter
 2012-11-22 02:53:10 -08:00
Jenkins for ownCloud 3a5f5e127c [tx-robot] updated from transifex 2012-11-22 00:02:16 +01:00
Jenkins for ownCloud 9204be827b [tx-robot] updated from transifex 2012-11-21 00:02:33 +01:00
Jörn Friedrich Dreyer d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Jenkins for ownCloud 568def2b61 [tx-robot] updated from transifex 2012-11-20 00:02:08 +01:00
Thomas Mueller 2af7ac78d2 refs #505 - defining publicListView based on template parameter 2012-11-18 12:28:04 +01:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Björn Schießle 12983cf0b0 urlencode file/dir to allow special characters in filename/path (issue #95) 2012-11-07 10:47:19 +01:00
Felix Moeller a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Felix Moeller 9795bc19bf Checkstyle: Fix the last two InvalidEOLChar 2012-11-04 18:42:18 +01:00
Felix Moeller afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Tom Needham 43917e187b External Share API: Move url down one level in response 2012-10-31 11:31:19 +00:00
Jenkins for ownCloud aca6d3252f [tx-robot] updated from transifex 2012-10-31 00:02:32 +01:00
Jenkins for ownCloud 56cf7660bd [tx-robot] updated from transifex 2012-10-30 00:01:50 +01:00
Michael Gapczynski 60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Tom Needham 6675a46679 Fix url generated for public shared files 2012-10-28 15:03:21 +00:00
Tom Needham bcdf3a23db Merge master into ocs_api 2012-10-28 11:16:04 +00:00
Tom Needham b079447988 Add API method for sharing a file, currently only via a link. 2012-10-28 11:06:47 +00:00
Jenkins for ownCloud 3bef19c623 [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
Lukas Reschke 7454186806 Forget to urlencode the path 2012-10-24 18:00:19 +02:00
Lukas Reschke ff6d2f16c4 urlencode 2012-10-24 17:58:52 +02:00
Thomas Müller 41898a473e Apply coding style guide 2012-10-24 14:43:34 +03:00
Björn Schießle a9a27306de fix copy&paste bug from previous commit 2012-10-24 13:11:29 +02:00
Björn Schießle 1d200c554f Shared files are not stored in the file cache. Therefore we need to 
use the share table from the db to find the item source if the public
link re-shares a already shared file.
 2012-10-24 13:11:29 +02:00
Lukas Reschke 916e0fc343 Place the brackets in the first line 2012-10-24 13:09:09 +02:00