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

154 commits

Author SHA1 Message Date
Morris Jobke
d9aa8c9f0e drop unneeded code 2014-06-27 00:30:14 +02:00
Vincent Petry
c6b89cc55a Fix wording for remote shares in settings page 2014-06-26 19:35:57 +02:00
icewind1991
8d1cf79152 Merge pull request #8399 from owncloud/server-server-sharing 
Add server<->server sharing
 2014-06-17 17:40:05 +02:00
Morris Jobke
06ec82fd68 Fix path 2014-06-14 15:26:27 +02:00
Bjoern Schiessle
84a651e46d add settings to disable server to server sharing 2014-06-14 10:22:38 +02:00
Robin Appelman
2005c162bd Fix prompting for password 2014-06-14 10:14:07 +02:00
Robin Appelman
e6f3850890 Update for changes in master 2014-06-14 10:14:07 +02:00
Robin Appelman
cf5a72c103 Add interface for adding a public share to a different ownCloud instance 2014-06-14 10:13:24 +02:00
Morris Jobke
fc9787ed64 fix layout of password protected shares 
* add password icon
* fix upshifted arrow button - fixes #9024
 2014-06-13 16:38:42 +02:00
Jörn Friedrich Dreyer
42bf466fa1 move mail template editor from core to standalone templateeditor repo 2014-06-13 12:00:23 +02:00
Morris Jobke
7a20d22daa Merge pull request #8824 from owncloud/mail_template_editing_in_webui 
minimal mail template editor for administrators
 2014-06-04 18:44:44 +02:00
Jörn Friedrich Dreyer
b5a145b297 convert mail template editor to app framework for a restful api 2014-06-03 16:53:03 +02:00
Jan-Christoph Borchardt
4ef94ddd2e infield label removal: remove last occurences of infield labels 2014-06-03 15:30:09 +02:00
Jörn Friedrich Dreyer
37afab87b5 minimal mail template editor for administrators, refs #7177 2014-06-02 19:22:58 +02:00
Morris Jobke
57ef089aac drop allowZIPdownload and maxZIPSize as options 2014-06-02 16:29:03 +02:00
Vincent Petry
5e4e773446 Removed "Share with" column 2014-05-30 10:06:30 +02:00
Vincent Petry
1d9129eac3 Sharing overview fixes and unit tests 
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
 2014-05-30 10:06:29 +02:00
Vincent Petry
fa32243d84 Small fixes to sharing overview 
- Removed file size from file summary in sharing overview
- Fixed document title
- Fixed empty content text for shared overview
 2014-05-30 10:06:29 +02:00
Vincent Petry
0f105ec747 Removed selection checkboxes 2014-05-30 10:06:29 +02:00
Vincent Petry
9baf47c2b4 Group shares by type 2014-05-30 10:06:29 +02:00
Vincent Petry
6ebc436505 Added sharing overview page (WIP) 
- added sharing overview entries in the sidebar
- use OCS Share API to get the list of files
 2014-05-30 10:06:29 +02:00
Jan-Christoph Borchardt
7be0ce6ada remove noise texture from interface (not necessary, and blurry on high-res) 2014-05-23 14:15:36 +02:00
Thomas Müller
d163441f3e load image via javascript and use $(document).width() to determine the proper side of the image to be returned 2014-05-02 18:36:58 +02:00
Thomas Müller
20893cc3b3 Images on public sharing get downscaled to increase use experience - this will speed up loading time 
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
 2014-05-02 17:02:57 +02:00
Thomas Müller
6e75b37d04 disable download button if zip download is disabled 2014-05-02 15:53:46 +02:00
Thomas Müller
003049e8a6 remove file name from upper right button 2014-04-29 17:16:14 +02:00
Thomas Müller
df32254133 reintroduce download button on public shares 2014-04-29 15:28:35 +02:00
Jan-Christoph Borchardt
55c630ea7d remove unneeded icon class 2014-03-14 14:47:40 +01:00
Jan-Christoph Borchardt
6c5cc46380 disable autocomplete for shared link password input, fix #7419 2014-02-26 14:48:15 +01:00
Vincent Petry
d49c7ad4fb Fixed double file encoding for previews 2014-01-30 16:34:37 +01:00
Thomas Müller
7655728ddf - adding class to header div: share-folder or share-file 
- for supported previews are shown with a size of 500px; icons with a size of 128px
 2014-01-29 16:52:30 +01:00
Jan-Christoph Borchardt
5a869732d1 adjust file type icon placement for when no preview can be generated 2014-01-29 15:28:57 +01:00
Jan-Christoph Borchardt
13ed59c1cf merge master into mobile-style 2014-01-29 10:55:44 +01:00
Morris Jobke
0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css 
Remove %webroot% from CSS
 2014-01-27 04:11:15 -08:00
Thomas Müller
617aa3cf29 Instead of 'No preview available for ...' we simple display the mieme-type icon 2014-01-23 20:15:10 +01:00
Jan-Christoph Borchardt
f0c9e8205f remove %webroot from files_sharing app 2014-01-23 14:04:13 +01:00
Morris Jobke
4b7dfd34f8 fix conflicts and add missing closing tag 2014-01-23 13:51:51 +01:00
Thomas Müller
f950ce82ae Merge branch 'master' into mobile-style 
Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php
 2014-01-23 00:39:11 +01:00
Jan-Christoph Borchardt
c0590676a0 fix public share download button width 2014-01-16 15:28:39 +01:00
Thomas Müller
50ae2ab14c add download button on single file share page 2014-01-15 15:31:27 +01:00
Thomas Müller
807b885a0e reuse file upload as used within files app - remove public upload button 2014-01-15 14:36:18 +01:00
Myles McNamara
9ebffd6635 remove extra upload controls 2014-01-10 14:03:55 -05:00
Myles McNamara
0802b662be fix upload button layout 2014-01-10 12:20:31 -05:00
Jörn Friedrich Dreyer
11425d142d readd sharing token to public template 
necessary for https://github.com/owncloud/apps/pull/1476
 2013-11-15 16:27:41 +01:00
Thomas Müller
e23433f771 display the original file name - this will change in case of renames 2013-10-22 14:02:44 +02:00
Vincent Petry
7abfe2bd4f Added direct link in public share page 
Fixes #1167
 2013-10-18 17:40:41 +02:00
Morris Jobke
cf554fd804 Merge pull request #5182 from owncloud/fix-sharring-with-password-screen 
Fix password screen for public shares
 2013-10-10 04:49:47 -07: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
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
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Georg Ehrke
91bd4dd67b implement previews of single shared files 2013-08-07 11:48:08 +02:00
Victor Dubiniuk
a10a17f818 Rewording 2013-07-29 18:25:17 +03:00
Victor Dubiniuk
97f2c393c1 Allow apps to have own 404 content, closes #3225 2013-07-29 16:54:19 +03: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
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
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
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
runky
6c868a9b5c Update authenticate.php 
Fix 'Undefined index: wrongpw' error
 2013-07-05 10:37:24 +02: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
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
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
Roman Geber
ddb0ff346d Public upload feature 2013-06-25 12:24:14 +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
Björn Schießle
285d328ef1 use html video tag to preview videos for public shares 2013-03-14 20:10:21 +01: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
Lukas Reschke
221ecf63ab [files_sharing] From echo to p 2013-02-27 21:37:14 +01:00
Bart Visscher
59a3238d1a Style cleanup files_sharing 2013-02-21 23:46:50 +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
0d3c58d6b6 Replace filename key with fileTarget in template 2013-02-10 19:13:13 -05:00
Lukas Reschke
250c565d2b Merge pull request #1360 from owncloud/display_name 
introduction of display names
 2013-01-29 14:05:54 -08:00
Lukas Reschke
2e42c6f54f Use HTML5 data attribute + fix undefined variable 2013-01-26 14:07:35 +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
Lukas Reschke
9bc8df3649 Move publicListView to external JS 2013-01-21 20:36:19 +01:00
Thomas Mueller
2af7ac78d2 refs #505 - defining publicListView based on template parameter 2012-11-18 12:28:04 +01:00
Felix Moeller
36d0d75901 Codestyle: FunctionCallArgumentSpacing 2012-10-23 08:35:54 +02:00
Björn Schießle
b88a61c633 no content area, it overlaps the file list 2012-10-05 10:32:38 +02:00
scambra
22c6b48d2f translate files_sharing app 2012-09-21 11:48:20 +02:00
Tom Needham
f9127192da Fix styling of public shared files download button 2012-09-19 19:51:52 +00:00
Tom Needham
d7b878b303 Dynamicly resize public shared images 2012-09-19 19:46:49 +00:00
Michael Gapczynski
749b5b52ca Show preview for public folder links 2012-09-18 23:56:14 -04:00
Michael Gapczynski
c6858fb5ca Add additional html tags to public links template for previewers 2012-09-03 13:14:23 -04:00
Michael Gapczynski
f2534e7428 Show notification that no preview is available if no previewer is found for a public link to a file 2012-08-29 21:12:23 -04:00
Michael Gapczynski
e5cbc532c3 Fix password authentication for links and fix template problems for links by creating a new base layout 2012-08-29 11:54:49 -04:00
Michael Gapczynski
0a9d1ed3a6 Initial previewer for public links 2012-08-27 20:37:38 -04:00
Michael Gapczynski
25d474579a Removing most of files_sharing, the Share API implemented the majority of it 2012-08-22 11:57:58 -04:00
Michael Gapczynski
30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 2012-07-25 17:08:18 -04:00
Michael Gapczynski
b369adbd94 Allow admin to disable resharing of files 2012-04-25 11:51:30 -04:00
Marvin Thomas Rabe
bdcf31cc73 Added translatable text. 2011-10-02 16:06:30 +02:00
Jan-Christoph Borchardt
568fd0df83 changed quotes 2011-08-11 13:53:25 +02:00
Michael Gapczynski
f88c4b1f48 Human readable permissions in shared files list 2011-07-31 13:15:07 -04:00