Commit Graph

94 Commits

Author SHA1 Message Date
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
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
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 91bd4dd67b implement previews of single shared files 2013-08-07 11:48:08 +02:00
Björn Schießle 75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +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
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
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
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
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