Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-08 14:12:40 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity
17,693 Commits 393 Branches 1,016 Tags 5.4 GiB
e0dd69e4e6
Commit Graph

1186 Commits

Author SHA1 Message Date
Thomas Müller
8a06f2e128 php 5.3 compatibility for Test_Files_Sharing_Api 2013-10-08 23:05:19 +02:00
Vincent Petry
cddb85c588 Added filesApp flag as input field for files app detection 
Since the files app can be reached under multiple URLs, either root,
files.php or public.php, a flag has been added to the DOM to help apps
(like file viewers) to detect whether they are currently in the files
app.
 2013-10-08 17:19:58 +02:00
Morris Jobke
6284ab31de fix escaping 2013-10-08 16:00:26 +02:00
Bjoern Schiessle
68e1dd1f23 make sure that we only remove file/folder shares 2013-10-08 16:00:18 +02:00
Morris Jobke
4af220d09e Fix password screen for public shares 
* Works in IE8, 9, 10, Firefox 24 and Chromium 30
 * Credits to Julian Müller @Julian1998
 2013-10-07 17:38:27 +02:00
Vincent Petry
6a36d7fa86 Added isPublic flag in files_sharing template 
To make it possible for apps to find out whether they are running in
public mode, the flag "isPublic" will now be present in the DOM.

This is required to disable the editor app in public mode to fix #5059
 2013-10-07 16:59:57 +02:00
Björn Schießle
981608cf6b Merge pull request #5129 from owncloud/remove_deleted_shares_from_db 
remove deleted files from oc_share
 2013-10-07 02:07:11 -07:00
Bjoern Schiessle
288f01bf62 catch exception if db query execution fails 2013-10-07 11:06:24 +02:00
Bjoern Schiessle
4f67b7a6c3 Merge branch 'master' into remove_deleted_shares_from_db 2013-10-07 11:00:56 +02:00
Bjoern Schiessle
0346167bb2 clean up oc_share table from files which are no longer exists 2013-10-07 10:59:09 +02:00
raghunayyar
cf84154ee0 Cleans up Core apps for relative(em) to absolute(px) styles. 2013-10-06 23:38:24 +05:30
Morris Jobke
a927c145be Merge pull request #5102 from owncloud/input-simplify 
Input simplify
 2013-10-04 10:40:32 -07:00
Bjoern Schiessle
401740166b add comments 2013-10-04 16:50:53 +02:00
Jan-Christoph Borchardt
da0db7bcb2 fix multiselect bar opacity, webroot 2013-10-04 17:32:06 +03:00
Björn Schießle
2cdf54b77d Merge pull request #4877 from owncloud/ocs_share_api 
OCS Share API
 2013-10-04 07:10:21 -07:00
Bjoern Schiessle
2e7f481e6b update tests 2013-10-04 14:32:15 +02:00
Bjoern Schiessle
dd2bf69152 use true/false instead of yes/no for publicUpload and subfiles parameter 2013-10-04 12:16:47 +02:00
Bjoern Schiessle
a1fe5148b5 use always path as parameter to specify a file/folder 2013-10-04 12:10:11 +02:00
Jan-Christoph Borchardt
308d4383a3 simplify input elements for less cognitive load. No box-shadow, no text-shadow, smaller border-radius 2013-10-03 16:35:42 +03:00
Bjoern Schiessle
aa660a3475 remove deleted shares from the database table oc_share 2013-10-02 13:26:38 +02:00
Jenkins for ownCloud
a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
Bjoern Schiessle
513dc20d4b also return success if no shares are found. 2013-09-30 13:05:34 +02:00
Bjoern Schiessle
6d830087db add testUpdateShareUpload() 2013-09-30 12:57:55 +02:00
Bjoern Schiessle
03db954e1a add getShareFromFolder() test 2013-09-30 12:38:36 +02:00
Bjoern Schiessle
9a2e82c3c5 Make sure that testDeleteShare() has some shares to delete 2013-09-30 12:23:44 +02:00
Thomas Müller
258e8d58da flipping arguments on assertEquals() - first argument contains the expected value and second argument contains the value to be asserted 2013-09-29 22:20:42 +02:00
Thomas Müller
63ea6844e8 - adding unit test testGetShareFromUnknownId() 
- fixing getShareFromId() for Oracle
- fixing error message
 2013-09-29 22:16:48 +02:00
Thomas Müller
687ba053b7 Merge branch 'master' into appframework-master 2013-09-27 14:25:47 +02:00
Thomas Müller
735608f513 Merge pull request #4207 from owncloud/search_shared_files 
add initial search in shared files
 2013-09-27 05:18:12 -07:00
Bjoern Schiessle
f935a38559 add some comments 2013-09-27 14:04:28 +02:00
Bjoern Schiessle
5b4f515e7b add test getShareFromId 2013-09-27 14:01:04 +02:00
Bjoern Schiessle
b9d6539d76 Merge branch 'master' into ocs_share_api 2013-09-26 13:02:39 +02:00
Bjoern Schiessle
4077ed6ddb add some additional assertions to the tests 2013-09-25 15:05:23 +02:00
Thomas Müller
db39fede97 Merge branch 'master' into appframework-master 
Conflicts:
	apps/files/lib/helper.php
	apps/files_trashbin/lib/helper.php
 2013-09-25 09:52:12 +02:00
Thomas Müller
333d3eda99 add error message to the assert 2013-09-25 09:43:16 +02:00
Thomas Müller
cd2421c7ee adding PHPDoc comments to getBackend 
ensure getChildren() is called on an instance of Share_Backend_Collection
 2013-09-24 10:37:58 +02:00
Bjoern Schiessle
259f03bee2 remove debug output 2013-09-23 14:10:09 +02:00
Jörn Friedrich Dreyer
4b3e56bcf9 remove unneccessary lib in namespace 2013-09-20 16:46:33 +02:00
Jörn Friedrich Dreyer
9e39118b52 namespaces use upcasefirst parts 
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
 2013-09-20 16:37:07 +02:00
Bjoern Schiessle
7626540679 make sure that files are shared correctly before each test and unshared again after the test 2013-09-20 12:38:23 +02:00
Bjoern Schiessle
bd09910f67 disable encrpytion app before performing tests 2013-09-20 11:24:18 +02:00
Bjoern Schiessle
57092e817f disable encryption app for share API tests 2013-09-19 20:14:34 +02:00
Jörn Friedrich Dreyer
6aeb0a99da same for search by mime 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
3b4020e811 add all results, sharing cache also returns entries for shared files in external storages 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
466fd8acda fix getAll(), refactor search by mime & search 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
392c6b6832 return fixed path, skip shared files outside of 'files' 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
27511d9187 divide ids into chunks of 1k 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
e8bf576184 add initial search in shared files 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/filelist.js
 2013-09-19 17:00:54 +02:00
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
Jenkins for ownCloud
6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Jörn Friedrich Dreyer
12ff268e60 move upload dialog css to separate file 2013-09-18 17:20:14 +02:00
Bjoern Schiessle
171b7ebffe remove debug output 2013-09-18 10:11:20 +02:00
Jörn Friedrich Dreyer
b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/css/files.css
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files_sharing/js/public.js
	core/js/jquery.ocdialog.js
	core/js/oc-dialogs.js
 2013-09-17 19:10:46 +02:00
Bjoern Schiessle
e52639e4e6 use share ID as REST resource 2013-09-17 15:27:46 +02:00
Thomas Müller
9b420e8660 use \OC::$server->getPreviewManager() instead of \OCP\Preview 2013-09-17 13:33:47 +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
Thomas Müller
46f59b165e Merge pull request #4838 from owncloud/refactor_upload_js 
refactor upload js & html to always use only js to fill form data
 2013-09-16 01:06:24 -07:00
Thomas Müller
a0c2c2473a Merge pull request #4501 from owncloud/ajaxfilelist 
Ajax calls for "files" and "files_trashbin" apps
 2013-09-14 12:51:16 -07:00
Jenkins for ownCloud
556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
Vincent Petry
1304b511e9 Ajax calls for "files" and "files_trashbin" apps 
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list

Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
  functions
- Fixed some file paths in trashbin app to be similar to the files app
 2013-09-13 19:59:14 +02:00
Jörn Friedrich Dreyer
7854cf04ee refactor upload js & html to always use only js to fill form data 2013-09-13 17:07:52 +02:00
Thomas Müller
d5ddbfb045 Merge pull request #4719 from owncloud/port_4701_master 
Always check variable type before using readdir to avoid surprises
 2013-09-12 15:44:20 -07:00
Thomas Müller
9d661eab23 adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing 2013-09-12 00:40:35 +02:00
Jenkins for ownCloud
68015b2761 [tx-robot] updated from transifex 2013-09-11 06:50:06 -04:00
Jörn Friedrich Dreyer
cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-10 16:54:48 +02:00
Jenkins for ownCloud
72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Bjoern Schiessle
3861c9bce1 some more OCS calls for sharing 2013-09-06 16:00:01 +02:00
Jörn Friedrich Dreyer
4d04dd9c4c Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-06 13:42:05 +02:00
Bjoern Schiessle
b6ee727399 intermediate result ocs api 2013-09-06 10:49:21 +02:00
Jenkins for ownCloud
0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Arthur Schiwon
c01675de5d more is_resource checks before readdir 2013-09-05 11:58:57 +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
4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
 2013-09-04 14:11:40 +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
Jörn Friedrich Dreyer
f94e603698 progress fixes 2013-08-16 11:40:55 +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
Jenkins for ownCloud
b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
kondou
aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Thomas Müller
d3e610f589 Merge pull request #4225 from owncloud/better-404 
More verbose 404, closes #3225
 2013-07-30 13:20:28 -07:00
Victor Dubiniuk
15e9e95817 Use default cursor for list items 2013-07-30 20:58:21 +03:00
Georg Ehrke
93cdfc3e8a Merge branch 'master' into oc_preview 2013-07-30 13:52:53 +02:00
Georg Ehrke
ac6a3133ec style fixes 2013-07-30 12:33:54 +02:00
Jenkins for ownCloud
88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Thomas Müller
7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Victor Dubiniuk
a10a17f818 Rewording 2013-07-29 18:25:17 +03:00
Victor Dubiniuk
dec7b2fa40 Move styles from core to app 2013-07-29 17:36:59 +03:00
Victor Dubiniuk
97f2c393c1 Allow apps to have own 404 content, closes #3225 2013-07-29 16:54:19 +03:00
Jenkins for ownCloud
48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Jenkins for ownCloud
fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Robin Appelman
88cc2ccb3b use renamed constants 2013-07-25 16:14:46 +02:00
Björn Schießle
75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +02:00
Thomas Müller
1a73e607bd Merge branch 'master' into more-themable-strings 
Conflicts:
	lib/template.php
 2013-07-24 09:35:33 +02:00
Thomas Müller
934f2e94a3 Merge branch 'master' into disable-anon-upload-master 2013-07-22 11:36:52 +02:00
Jenkins for ownCloud
01f3f8e0cc [tx-robot] updated from transifex 2013-07-22 02:03:23 -04:00
Jenkins for ownCloud
ae82f7fd17 [tx-robot] updated from transifex 2013-07-19 02:03:14 -04:00
Andreas Fischer
2c38c2a70e Merge pull request #3947 from runky/patch-1 
* runky/patch-1:
  Update authenticate.php
 2013-07-19 02:19:14 +02:00
Jenkins for ownCloud
279a71acb3 [tx-robot] updated from transifex 2013-07-18 02:02:51 -04:00
Jenkins for ownCloud
a8acbfdf7b [tx-robot] updated from transifex 2013-07-16 02:06:21 -04:00
Thomas Müller
79d23463f8 No admin option to enable public upload in case encryption is enabled 
No upload on pubic page if public upload is disabled
 2013-07-14 21:58:08 +02:00
Thomas Müller
c3e16a7388 fixing Undefined index: publicUploadEnabled 2013-07-12 17:51:01 +02:00
Jenkins for ownCloud
3fbf7ab189 [tx-robot] updated from transifex 2013-07-12 02:12:25 +02:00
Jan-Christoph Borchardt
aacca494c5 introduce shortname themable string and split from title, use for image alt text 2013-07-11 16:38:07 +02:00
Georg Ehrke
53830f2f75 implement use of previews in sharing app 2013-07-11 11:58:52 +02:00
Jenkins for ownCloud
f74659f3f6 [tx-robot] updated from transifex 2013-07-11 02:26:22 +02:00
Jenkins for ownCloud
439cad07b5 [tx-robot] updated from transifex 2013-07-09 02:12:22 +02:00
Thomas Müller
0365d244e0 Merge pull request #3946 from owncloud/fixing-3942-master 
handle anonymous upload to reshared folder
 2013-07-08 02:27:21 -07:00
Jenkins for ownCloud
3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +02:00
Jenkins for ownCloud
096d7674fc [tx-robot] updated from transifex 2013-07-07 02:06:06 +02:00
Jenkins for ownCloud
c8ad3df1fa [tx-robot] updated from transifex 2013-07-06 02:08:38 +02:00
Thomas Müller
c956a08d22 fixing check if public share is a folder or not 2013-07-06 00:12:29 +02:00
Thomas Müller
dad91c156f Merge branch 'master' into fixing-3942-master 
Conflicts:
	apps/files/ajax/upload.php
 2013-07-06 00:02:11 +02:00
Thomas Müller
d14c5a3fa7 Merge pull request #3958 from owncloud/fixing-3933-master 
adding tipsy to the upload button showing the max upload and restoring c...
 2013-07-05 08:45:12 -07:00
Thomas Müller
e159cbf527 on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function 2013-07-05 17:39:41 +02:00
Thomas Müller
0c2ebb984e adding tipsy to the upload button showing the max upload and restoring client side upload size validation 2013-07-05 15:07:05 +02:00
Thomas Müller
13991be5ce no anonymous upload on files only folders 2013-07-05 10:53:59 +02:00
runky
6c868a9b5c Update authenticate.php 
Fix 'Undefined index: wrongpw' error
 2013-07-05 10:37:24 +02:00
Morris Jobke
47058b1904 Merge pull request #3932 from owncloud/fix_label_position 
fix position of 'user shared the folder foldername with you' label
 2013-07-04 11:03:42 -07:00
Kondou
63c83ff50b Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pw 
Add a "Wrong password." message, if the password for the public share was wrong.
 2013-07-04 03:12:51 -07:00
Georg Ehrke
8d59893e90 fix position of 'user shared the folder foldername with you' label 2013-07-04 10:32:26 +02:00
Björn Schießle
6cfa016c39 add public api 2013-07-04 10:11:55 +02:00
Björn Schießle
3c691c9ec9 move to non-static OC_Defaults 
Conflicts:

	lib/mail.php
 2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a Add init funtion to OC_Defaults to be able to wrap translatable strings 2013-07-04 10:09:28 +02:00
Jenkins for ownCloud
51cfacd789 [tx-robot] updated from transifex 2013-07-04 09:33:58 +02:00
kondou
65bcedfbbe Use better wording. 2013-07-03 20:13:10 +02:00
kondou
2c4a9e0776 Add a "Wrong password." message, if the password 
for the public share was wrong.

Fix #2725
 2013-07-02 03:16:42 +02:00
Björn Schießle
d97d00fe0f add logo claim to defaults.php 2013-07-01 10:48:13 +02:00
Björn Schießle
aead759f47 logo claim added 2013-07-01 10:48:02 +02:00
Björn Schießle
23cc69b816 construct the foother in defaults.php so that we use always the same footer 
Conflicts:

	settings/templates/admin.php
 2013-07-01 10:46:00 +02:00
Jenkins for ownCloud
4d74e8955f [tx-robot] updated from transifex 2013-06-30 02:13:07 +02:00
Thomas Mueller
f726de3cab for now we disable public upload in case encryption is enabled 2013-06-28 16:49:25 +02:00
Roman Geber
da0caadf4e Added file-upload to GIT repo 
Optimized CSS identifiers
 2013-06-26 22:51:38 +02:00
Roman Geber
ddb0ff346d Public upload feature 2013-06-25 12:24:14 +02:00
Jenkins for ownCloud
6c534c8165 [tx-robot] updated from transifex 2013-06-14 02:52:34 +02:00
Björn Schießle
15eda53215 improved footer 2013-06-13 16:10:33 +02:00
Björn Schießle
7273f38af6 make pub link share footer aware of different owncloud editions 2013-06-12 16:28:47 +02:00
Jenkins for ownCloud
666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
Michael Gapczynski
5a47054505 Implement getDirectoryPermissions() in Shared Permissions, fixes #2846 2013-05-29 18:22:54 -04:00
Robin Appelman
44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Jenkins for ownCloud
b47729c5fc [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
Michael Gapczynski
9b622bdeed RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead 2013-05-22 15:02:11 -04:00
Jenkins for ownCloud
afdad5c74d [tx-robot] updated from transifex 2013-05-21 02:04:52 +02:00
Jenkins for ownCloud
74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
Bart Visscher
a541b80592 Merge pull request #3222 from owncloud/fix-3218 
Fix retrieving of mount points for shared storage, fix #3218
 2013-05-03 06:02:33 -07:00
Morris Jobke
a204a46d50 Merge pull request #3212 from owncloud/stop-links 
Don't display shared links if disabled
 2013-05-02 15:29:00 -07:00
Michael Gapczynski
7039421efc Fix retrieving of mount points for shared storage, fix #3218 2013-05-02 17:47:11 -04:00
Frank Karlitschek
8a5e88b21c Merge pull request #3211 from owncloud/fix-2816 
Fix #2816 renaming shared files
 2013-05-02 00:54:09 -07:00
Michael Gapczynski
274bf3c6bd Don't display shared links if disabled 2013-05-01 20:39:02 -04:00
Michael Gapczynski
04b7a9902d Fix #2816 renaming shared files 2013-05-01 20:29:07 -04:00
Jenkins for ownCloud
ee53e7b3d2 [tx-robot] updated from transifex 2013-05-02 02:19:04 +02:00
Jenkins for ownCloud
7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +02:00
Robin Appelman
809b5f81f6 Further seperation of mount management logic 2013-04-26 00:01:36 +02:00
Jenkins for ownCloud
f6808617b3 [tx-robot] updated from transifex 2013-04-22 02:00:20 +02:00
Jenkins for ownCloud
cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +02:00
Jenkins for ownCloud
37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00
Jenkins for ownCloud
d0b3e8aceb [tx-robot] updated from transifex 2013-04-16 02:17:30 +02:00
Jenkins for ownCloud
19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Jenkins for ownCloud
c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
Jenkins for ownCloud
cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +02:00
Jenkins for ownCloud
10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Jenkins for ownCloud
0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Björn Schießle
d121180d46 Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download 
let public link download handle json encoded file lists [master]
 2013-03-26 01:56:47 -07:00
Björn Schießle
c2a49b5c1f the old path no longer exists after rename, update the parent folder instead 2013-03-25 14:21:06 +01:00
Björn Schießle
abd48496d2 fix indention 2013-03-25 12:33:03 +01:00
Björn Schießle
102120f105 skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares 2013-03-25 12:32:56 +01:00
Björn Schießle
285d328ef1 use html video tag to preview videos for public shares 2013-03-14 20:10:21 +01:00
Jenkins for ownCloud
9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Björn Schießle
30831b6b55 we need to listen to the pre delete hook, otherwise the file is already gone 2013-03-13 15:39:39 +01:00
Björn Schießle
f971ce0b66 let public link download handle json encoded file lists 2013-03-13 11:15:17 +01:00
Bernhard Posselt
049a4df259 Merge pull request #1786 from owncloud/shared-folder-etags 
Include etags for the root of the shared folder
 2013-03-11 02:38:50 -07:00
Michael Gapczynski
e743386acf Fix correctFolders and retrieve the correct storage cache 2013-03-08 14:27:30 -05:00
Lukas Reschke
546fb72b25 Merge pull request #2165 from owncloud/fix_2155 
Offer download of whole shared dir only if it does not exceed zip input ...
 2013-03-08 10:31:48 -08:00
Björn Schießle
02e2f7384e not only files can be reshared but also folders 2013-03-08 17:32:04 +01:00
Michael Gapczynski
20828488bc Fix share hook for updater 2013-03-08 10:59:22 -05:00
Björn Schießle
2d00d13a5d use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated 2013-03-08 15:13:00 +01:00
Michael Gapczynski
4826564344 Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
 2013-03-07 17:14:34 -05:00
Michael Gapczynski
a5cab28bea Fix fetching source path of shared files 2013-03-07 11:12:59 -05:00
Michael Gapczynski
4cb5cb9693 itemSource parameter should be fileSource 2013-03-07 10:00:03 -05:00
Arthur Schiwon
2ae1ad23b0 Offer download of whole shared dir only if it does not exceed zip input limit 2013-03-07 15:48:10 +01:00
Michael Gapczynski
812e306e6e Update Shared folders ETags of users with reshares 2013-03-06 17:33:27 -05:00
Michael Gapczynski
771e01af35 Move hook connectors from shared storage to app.php, add post_unshare hook 2013-03-05 21:57:32 -05:00
Michael Gapczynski
4dcbaa1d7b Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/appinfo/app.php
 2013-03-05 21:54:32 -05:00
Michael Gapczynski
e466d680fe Fix variable name in Shared_Updater 2013-03-02 13:11:57 -05:00
Michael Gapczynski
9b4d7d9925 Update ETag when file is shared 2013-03-02 12:57:29 -05:00
Lukas Reschke
fdb37d191b Merge pull request #2092 from owncloud/infieldlabels-placeholder 
explicitly add empty placeholder to inputs which use infield labels
 2013-03-04 13:31:21 -08:00
Jan-Christoph Borchardt
07dee24cb2 explicitly add empty placeholder to inputs which use infield labels, fix #2049 2013-03-04 22:11:57 +01:00
Bernhard Posselt
10b108ed8a Merge pull request #2030 from j-ed/master 
suppress log messages like `include path for class ... starts with "apps/"`
 2013-03-04 12:59:39 -08:00
Michael Gapczynski
ec2a9169b9 Change remove() $user parameter to optional 2013-03-04 11:44:09 -05:00
j-ed
d3e0a41dad Update app.php 
suppress log messages like `include path for class \"OC\\Files\\Storage\\Shared\" starts with \"apps\/\"`
 2013-03-02 12:14:52 +01:00
Michael Gapczynski
b5989c933f Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
 2013-02-28 10:39:23 -05:00
Lukas Reschke
221ecf63ab [files_sharing] From echo to p 2013-02-27 21:37:14 +01:00
Jenkins for ownCloud
fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Jenkins for ownCloud
348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Michael Gapczynski
ea83acedeb Fix target path and reuse mtime 2013-02-26 01:43:04 -05:00
Michael Gapczynski
8983465210 Correct parent folders' ETags for all users with access to a shared file 2013-02-26 01:21:48 -05:00
Frank Karlitschek
9ee5069f2a Merge pull request #1856 from owncloud/fix_error_handling_stream_copy 
don't use the number of written bytes as indicator if streamCopy() was successful
 2013-02-25 02:04:12 -08:00
Frank Karlitschek
8f65916904 Merge pull request #1882 from owncloud/required_version 
Set required owncloud version to 4.93
 2013-02-25 00:37:22 -08:00
Jenkins for ownCloud
21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Robin Appelman
4e826b1673 Set required owncloud version to 4.93 2013-02-24 17:38:36 +01:00
Michael Gapczynski
36827d1549 Fix variable 2013-02-23 16:09:56 -05:00
Michael Gapczynski
00e28cf156 Return unknown free space for shared root folder so we can still upload partial files 2013-02-23 15:42:01 -05:00
Michael Gapczynski
b6a21cc4b5 Fix WebDAV uploading of partial shared files 2013-02-23 15:32:59 -05:00
Michael Gapczynski
09a2730f57 Include etag field for folder contents 2013-02-23 15:22:34 -05:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Björn Schießle
d8137fdf66 return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied 2013-02-22 16:43:11 +01:00
Bart Visscher
59a3238d1a Style cleanup files_sharing 2013-02-21 23:46:50 +01:00
Michael Gapczynski
3dfb1628ce Include etags for the root of the shared folder 2013-02-19 20:42:48 -05:00
Jan-Christoph Borchardt
d1dcb282cb fix multiselect bar offset on shared page, close #1339 finally 2013-02-14 17:40:08 +01:00
Robin Appelman
d0d6d973a9 Share: fix table head color for public shared folders 2013-02-11 12:35:39 +01:00
Robin Appelman
a1db280a46 Share: fix downloading selected files from public shared folder 2013-02-11 11:54:44 +01:00
Robin Appelman
7fa9181a26 Share: fix sorting of files in public shared folder 2013-02-11 11:50:41 +01:00
Robin Appelman
bbf672f453 Share: fix nested subfolders in public shared folders 2013-02-11 11:48:49 +01:00
Robin Appelman
7842b416d1 Share: fix breadcrumbs for public shared folder 2013-02-11 11:44:18 +01:00
Robin Appelman
762688762f Share: fix downloading files from a public shared folder 2013-02-11 11:38:52 +01:00
Robin Appelman
d0a005ea97 Sharing: fix position of file list in public link view of folder 2013-02-11 11:20:51 +01:00
Björn Schießle
d7d9e2a15a fix positioning of password label, add autofocus to password field 2013-02-11 10:20:31 +01:00
Michael Gapczynski
a6bd086867 Set permissions to read only 2013-02-10 20:01:25 -05:00
Michael Gapczynski
56df48b40f Remove additional old compatibility code 2013-02-10 19:14:20 -05:00
Michael Gapczynski
0d3c58d6b6 Replace filename key with fileTarget in template 2013-02-10 19:13:13 -05:00
Michael Gapczynski
8e3b8c7f47 Proper fix for shared links 2013-02-10 19:09:58 -05:00
Michael Gapczynski
c6985d6cd4 Merge branch 'master' into fix-shared-links 2013-02-10 00:54:20 -05:00
Michael Gapczynski
71affd528c Fix public links 2013-02-10 00:53:58 -05:00
Jenkins for ownCloud
35bd7a400d [tx-robot] updated from transifex 2013-02-07 00:11:04 +01:00
Michael Gapczynski
cc19df22a1 Remove old OC4 link compatibility 2013-02-06 13:09:04 -05:00
Jenkins for ownCloud
335b6cd060 [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
Jenkins for ownCloud
98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Thomas Müller
5ceddabaa6 Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master 
Fixing js errors public link master
 2013-02-03 21:53:02 -08:00
Jenkins for ownCloud
da6e79a381 [tx-robot] updated from transifex 2013-02-04 00:05:52 +01:00
Jenkins for ownCloud
2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
Thomas Mueller
2af6d74bc1 Merge branch 'master' into fixing-js-errors-public-link-master 
Conflicts:
	apps/files/js/files.js
	apps/files/templates/part.list.php
 2013-01-31 23:23:10 +01:00
Robin Appelman
207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Lukas Reschke
250c565d2b Merge pull request #1360 from owncloud/display_name 
introduction of display names
 2013-01-29 14:05:54 -08:00
Robin Appelman
a67f11c8af Sharing: partailly fix searchByMime 2013-01-28 21:25:19 +01:00
Robin Appelman
7207211f3a change required ownCloud version to 4.91 2013-01-28 19:58:24 +01:00
Robin Appelman
74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Robin Appelman
c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Thomas Mueller
47ce3c2160 include keyboardshortcuts.js 2013-01-28 09:47:21 +01:00
Thomas Müller
31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes 
Files: CSP fixes
 2013-01-28 00:29:46 -08:00
Robin Appelman
bca5ce724e Merge branch 'master' into filesystem 2013-01-28 02:35:51 +01:00
Jenkins for ownCloud
00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Robin Appelman
930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Lukas Reschke
2e42c6f54f Use HTML5 data attribute + fix undefined variable 2013-01-26 14:07:35 +01:00
Lukas Reschke
047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
Björn Schießle
839f4bd949 show display name instead of uid in the public shared files view 2013-01-25 13:01:53 +01:00
Jenkins for ownCloud
6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Jenkins for ownCloud
3ff32eba25 [tx-robot] updated from transifex 2013-01-24 00:07:38 +01:00
Thomas Mueller
5fadd53088 missing renames of publicListView to disableSharing 2013-01-23 09:18:26 +01:00
Lukas Reschke
9bc8df3649 Move publicListView to external JS 2013-01-21 20:36:19 +01:00
Michael Gapczynski
8ca30d244c Implement getETag() in shared storage 2013-01-19 00:02:40 -05:00
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Robin Appelman
9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Michael Gapczynski
36cac7f924 Return NOT_FOUND in shared cache 2013-01-10 22:29:47 -05:00
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
e8b195bf10 Almost fix Shared scanner... 2013-01-07 20:52:51 -05:00
Michael Gapczynski
8f8a5bbfb7 Maked Shared_Permissions extend Permissions class 2013-01-07 18:17:14 -05:00
Michael Gapczynski
a7d4d04223 Fix mimetypes in shared cache 2013-01-07 15:27:22 -05:00
Robin Appelman
e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +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
Michael Gapczynski
f144be8857 Don't mount shared storage unless there are shared files 2013-01-03 11:37:19 -05:00
Robin Appelman
e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Jenkins for ownCloud
3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Michael Gapczynski
a1f7c28e28 Use the source Scanner for shared storage when the path is specified 2013-01-01 14:47:25 -05:00
Michael Gapczynski
fe90130618 Initialize storageId variable in shared cache 2013-01-01 14:24:18 -05:00
Michael Gapczynski
268c7acfc4 Actually add Shared_Watcher 2013-01-01 13:16:42 -05:00
Michael Gapczynski
3b67613afc Remove Shared_Scanner and add Shared_Watcher instead 2013-01-01 12:43:38 -05:00
Robin Appelman
0ac78a6411 Share: fix cache put function 2013-01-01 18:10:38 +01:00
Robin Appelman
4b65dd608a Share: small phpdoc fixes 2013-01-01 18:07:10 +01:00
Michael Gapczynski
f2ca7023e1 Fix Shared root problems with Watcher and Quota proxy 2013-01-01 11:19:33 -05: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
Michael Gapczynski
cfc3526b25 Fix data for shared root folder 2012-12-29 11:45:13 -05:00
Michael Gapczynski
fb053f8e73 Fix retrieving of shared source paths 2012-12-29 11:09:57 -05:00
Michael Gapczynski
8bdfb04056 Fix shared folders 2012-12-28 15:06:12 -05:00
Michael Gapczynski
1910057900 Fix shared statuses inside folders 2012-12-26 16:20:10 -05:00
Robin Appelman
7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +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
Michael Gapczynski
bf05ff351f Initial support for file sharing with filesystem branch 2012-12-15 19:44:59 -05:00
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
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
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