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

6152 commits

Author SHA1 Message Date
Lukas Reschke
e910e63140 Merge pull request #8372 from owncloud/give-admins-a-hint 
Clarify the trusted_domain error page
 2014-04-27 18:28:18 +02:00
Lukas Reschke
1d9ac38da6 Remove an added t by the github webeditor 
Notice to myself: Stick to my IDE.
 2014-04-27 16:41:09 +02:00
Lukas Reschke
7a8bfeae6e Grammatical fixes 2014-04-27 16:31:04 +02:00
Jenkins for ownCloud
8e5c9eea3a [tx-robot] updated from transifex 2014-04-27 01:54:54 -04:00
Lukas Reschke
b6612ef04a Clarify the trusted_domain error page 2014-04-26 23:11:29 +02:00
Jenkins for ownCloud
c591cf0836 [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
icewind1991
7599fa94ce Merge pull request #8350 from owncloud/share-search-mime 
fix search by mime for shared single files
 2014-04-25 15:54:36 +02:00
icewind1991
5194f014c9 Merge pull request #7504 from owncloud/webdav-injection 
Proper injection of filesystem view into the webdav connector
 2014-04-25 14:42:43 +02:00
Robin Appelman
194ea66cb5 Merge branch 'master' into share-search-mime 2014-04-25 14:04:41 +02:00
Robin Appelman
672a8248ce Correct the path returned by getFolderContent for substorages 2014-04-25 13:56:45 +02:00
Robin Appelman
456ca0cf7d fix paths of searchByMime results on substorages 2014-04-25 12:31:44 +02:00
Robin Appelman
6c20a014ea merge master into webdav-injection 2014-04-25 11:47:06 +02:00
Jenkins for ownCloud
3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Lukas Reschke
1cafd1e3b9 Merge pull request #8337 from owncloud/flv-to-mimes 
Add flv to known mimetypes
 2014-04-24 19:09:01 +02:00
Björn Schießle
f520305848 Merge pull request #8026 from owncloud/remove_shared_folder 
remove the "Shared" folder
 2014-04-24 18:45:45 +02:00
Victor Dubiniuk
fc4be3d0ad Add flv to known mimetypes 2014-04-24 19:09:31 +03:00
Bjoern Schiessle
35321c7d41 add additional rows to the select statement, 'stime' is needed for the expire check 2014-04-24 15:18:25 +02:00
Bjoern Schiessle
6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Robin Appelman
cd0c5990f8 properly quote etags 2014-04-24 11:12:39 +02:00
Robin Appelman
49b44e7e22 Normalize paths when moving properties 2014-04-24 11:12:39 +02:00
Thomas Müller
8127e984bd Merge pull request #8332 from owncloud/l10n-access-untrusted 
This adds one more missing untranslated text from lib/share
 2014-04-24 10:06:37 +02:00
Jenkins for ownCloud
435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
Volkan Gezer
ff0dab6e92 This adds one more missing untranslated text from lib/share 
Also displays the untrusted domain warning in English
 2014-04-24 01:42:18 +02:00
Thomas Müller
4ba6f4839d fixing typos and PHPDoc 2014-04-23 15:36:01 +02:00
Robin Appelman
e77d89fc4b Revert changes to OC_Connector_Sabre_Server 2014-04-23 14:21:09 +02:00
icewind1991
c8801a41d8 Merge pull request #8324 from owncloud/expired-link-error 
Fix error when viewing expired link
 2014-04-23 14:13:44 +02:00
Bjoern Schiessle
b312d38d38 remove hard-coded shared folder 2014-04-23 12:59:22 +02:00
Bjoern Schiessle
7ef8f6d352 always allow to rename the share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
93469ca468 make it possible to move files out of a shared mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
fb88aba8f4 some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
652d417a58 we don't allow to share a folder if it contains a share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
bffcbac7a7 allow to rename group share mount points 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
dfb69e9418 allow user to delete shared files/folders 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
4c840cb61d fix target generation for group shares 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
ed981294f1 fix share api tests 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
27c5a978f9 we no longer need to handle the Shared folder different from any other folder 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
c4e0fb75a4 add api to get shares from a specific user 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
a02fb3722b user should be able to rename/delete shared files if the owner allowed it 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
72bbb9ca20 allow to remove and change mount points 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
cfc52ccc3d add some action items 2014-04-23 12:54:24 +02:00
Robin Appelman
3d0661a1e7 Fix error when viewing expired link 2014-04-23 12:54:18 +02:00
Joas Schilling
704b9e6a0d Merge pull request #8009 from owncloud/feature/add-sharing-target 
Add option to getUsersSharingFile() to get the paths for the shared users
 2014-04-23 12:49:06 +02:00
Thomas Müller
535e6ff71f Merge pull request #7617 from nishiki/cache_user 
Cache user
 2014-04-23 12:32:30 +02:00
Thomas Müller
dcc48f9b46 Merge pull request #8068 from wakeup/fix-share.php-string-extraction 
Make lib/** share.php strings extractable for translation
 2014-04-23 09:58:10 +02:00
Jenkins for ownCloud
3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00
Robin Appelman
b42ce6c30a Prevent error if previously cached data doesn't have an etag 2014-04-22 15:24:38 +02:00
Volkan Gezer
6e857de6b7 Make lib/** share.php strings extractable for translation 
They were not ready for translation as they had no placeholders
and/nor wrapper function to be translated

This should fix: #8011
 2014-04-22 14:56:44 +02:00
Thomas Müller
0330481c5e Merge pull request #8263 from LEDfan/add-key-to-contacts 
Add key to every contact
 2014-04-22 14:20:53 +02:00
Tobia De Koninck
efff7dd2a4 Change key to addressbook-key 2014-04-22 12:46:09 +02:00
Robin Appelman
3821a09689 merge master into webdav-injection 2014-04-22 12:25:49 +02:00