Commit Graph

555 Commits

Author SHA1 Message Date
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01: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
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
Robin Appelman 7969d6e646 Merge branch 'master' into filesystem 2012-12-11 23:57:59 +01: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
Robin Appelman 98f42d314c merge master into filesystem 2012-12-06 17:47:28 +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
Thomas Mueller 18663100d9 fixing syntax error + reformat the code 2012-12-02 12:12:20 +01:00
Robin Appelman 72b6faa69d merge master into filesystem 2012-12-02 03:03:48 +01:00
Robin Appelman d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +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
Robin Appelman 95057e727d merge master into filesystem 2012-11-23 00:40:58 +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
Robin Appelman 97380f3485 merge master into filesystem 2012-11-21 22:37:14 +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
Robin Appelman bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Robin Appelman 961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +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
Robin Appelman 4b940955dd merge master into filesystem 2012-11-04 21:12:18 +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
Robin Appelman 51ba12890d Merge branch 'master' into filesystem 2012-11-01 16:16:02 +01:00
Jenkins for ownCloud aca6d3252f [tx-robot] updated from transifex 2012-10-31 00:02:32 +01:00
Robin Appelman 6e9e263497 merge master into filesystem 2012-10-30 22:59:55 +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
Robin Appelman 0fb707d2c9 some more porting of the sharing 2012-10-27 14:25:15 +02:00
Robin Appelman 86be7e8872 remove last uses of depricated OC_Filesystem 2012-10-27 12:23:13 +02:00
Robin Appelman dea0d20a9a fix delete and sort files 2012-10-27 12:18:01 +02:00
Robin Appelman cbc71784c0 Merge branch 'master' into filesystem 2012-10-27 10:02:26 +02:00
Jenkins for ownCloud 3bef19c623 [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
Robin Appelman 6db81afab9 move some stuff to the new api 2012-10-26 23:05:02 +02:00
Robin Appelman 7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +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
Robin Appelman 7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +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