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

399 commits

Author SHA1 Message Date
Morris Jobke
9a0b0ba488 Merge pull request #16893 from owncloud/fixSlideToggle 
Fix childs of slideToggle not sliding the target
 2015-06-17 16:06:47 +02:00
Jan-Christoph Borchardt
2abedd544b remove unneeded span around Settings text, fixes cursor 2015-06-17 14:37:58 +02:00
Thomas Müller
0fde0e6569 Search results have to explicitly be added to the content area of the app 2015-06-09 12:39:40 +02:00
Morris Jobke
62ae39208a Add owner to the storage stats to enable better notifications 
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
 2015-06-05 18:21:41 +02:00
Vincent Petry
53a23364ef Added empty content message for empty read-only folders 2015-04-21 14:31:13 +02:00
Morris Jobke
c53a53f705 Allow files app nav entries to have a different icon class 2015-04-14 16:17:24 +02:00
Morris Jobke
91a90e25ae fix for IE8 2015-04-08 21:05:31 +02:00
Jan-Christoph Borchardt
84c2fe85b7 add icons to files sidebar, fix shade, fix position of settings icon and text 2015-04-08 19:25:28 +02:00
James Anslow
d53aa4a816 Fixing issue #15322 - showing Settings button next to gear icon 2015-04-08 11:57:33 +02:00
Bjoern Schiessle
ee53ba5ed6 remove encryption specific code from files app 2015-04-07 13:30:30 +02:00
Thomas Müller
bf809ac85a Removing left overs from old encryption app 2015-04-07 13:30:29 +02:00
Roeland Jago Douma
2b81d0f237 Move core apps from private to public functions 
Apps still use OC_Helper and OC_Util functions even when public ones are
already available. Sometimes the public one is even used in the same
file.
 2015-04-01 12:06:04 +02:00
Jan-Christoph Borchardt
e09fd331eb adjust emptycontent messages for files and files_external 2015-03-26 23:22:26 +01:00
Joas Schilling
f2be172ae8 Do not duplicate the empty content css 2015-03-24 11:29:29 +01:00
Thomas Müller
1e0d8f1774 Merge pull request #14133 from rullzer/fix_10600 
Always display max upload size in admin panel
 2015-03-16 10:05:57 +01:00
Lukas Reschke
acabd81f42 Remove "Download from URL" feature 
Fixes https://github.com/owncloud/core/issues/13326
 2015-03-02 21:06:25 +01:00
Roeland Jago Douma
bdd785f5e6 Always display max upload size in admin panel 2015-02-13 11:39:30 +01:00
Jörn Friedrich Dreyer
357fbd88be use class for no results div instead of id. the elements are not unique. 2015-01-06 14:34:35 +01:00
Jörn Friedrich Dreyer
23900a5a39 filter trashbin and share views 2015-01-05 13:11:50 +01:00
Jörn Friedrich Dreyer
152c8b3969 text and icon fixes 2015-01-02 14:58:39 +01:00
Jörn Friedrich Dreyer
0cca9e26c4 show no files found message 2015-01-02 12:50:21 +01:00
Jan-Christoph Borchardt
96ae18db59 get rid of unnecessary alt and title attributes 2014-12-18 17:05:27 +01:00
Jan-Christoph Borchardt
7faf3d17e5 fix accessibility for deleted files 2014-12-18 16:54:39 +01:00
Jan-Christoph Borchardt
0e78415cb1 fix accessibility of file upload 2014-12-18 14:12:34 +01:00
Thomas Müller
82f8726903 Merge pull request #12900 from owncloud/more-accessibility 
More accessibility fixes for Files
 2014-12-18 01:21:01 +01:00
Jan-Christoph Borchardt
59dec3834f wording fix for Files app empty state 2014-12-17 21:45:51 +01:00
Jan-Christoph Borchardt
ab2ae91b11 improve empty state of 'All files' 2014-12-17 21:27:14 +01:00
Jan-Christoph Borchardt
2be66044cc even better empty state for Favorites, and general Empty State style 2014-12-17 20:59:26 +01:00
Jan-Christoph Borchardt
6f4ed59883 use method to only visually hide elements, show only for screen reader 2014-12-17 14:12:13 +01:00
Jan-Christoph Borchardt
1b5f43e7c3 add text to Settings button 2014-12-17 12:20:38 +01:00
Jan-Christoph Borchardt
9f9aa44b57 add alt text to 'Cancel upload' button 2014-12-17 12:05:45 +01:00
Jan-Christoph Borchardt
e5875fda38 properly name form labels for the file selection 2014-12-17 11:40:21 +01:00
Jan-Christoph Borchardt
433d1de923 fix empty state for Favorites 2014-12-17 11:04:22 +01:00
Vincent Petry
a5bb66f4a7 Added favorites feature to the files app 2014-12-15 12:10:54 +01:00
Morris Jobke
e969fe6b12 Merge pull request #12698 from owncloud/handle_readonly_shared_files 
Handle readonly shared files
 2014-12-12 08:34:28 +01:00
Jörn Friedrich Dreyer
c615b3527f show readonly message in file conflict dialog, make it always selected 2014-12-11 16:32:27 +01:00
Joas Schilling
539c0aeb04 Add an option to disallow sending sharing emails to non-owncloud users 
Fix #10836
 2014-12-09 11:32:39 +01:00
Volker E.
98d0d48b54 fix HTML structure by rmv. obsolete input end tag 2014-08-20 22:36:58 +02:00
luckydonald
159747117f Added remaining time displaying, moved Information to tooltip, removed now unneeded speed div 2014-08-12 00:32:46 +02:00
luckydonald
7fc574cc53 Updated and optimized Mobile Layout as well. 2014-08-11 02:37:01 +02:00
luckydonald
19efa259e9 Fixed translations, indentation and renamed the .percents class to .speed class. 2014-08-10 23:45:06 +02:00
luckydonald
03a34235e0 Upload progress bar now displays informations about uploades size (12kB of 3MB) and the current speed. 2014-08-10 22:26:03 +02:00
Jan-Christoph Borchardt
24277f0dd6 change 'Cancel upload' text to x icon for more space in breadcrumbs bar 2014-06-30 18:20:35 +02:00
Bernhard Posselt
844c6c3328 use slide toggle for files app 2014-06-05 11:26:24 +02:00
Morris Jobke
7ad7f59162 fix empty file handling option 2014-06-03 09:38:19 +02:00
Morris Jobke
57ef089aac drop allowZIPdownload and maxZIPSize as options 2014-06-02 16:29:03 +02:00
Lukas Reschke
756b158230 Merge pull request #8663 from owncloud/files-dndissue 
Fixed drag and drop from external files, added tests
 2014-05-30 16:28:20 +02:00
Volkan Gezer
426f492f57 fix typo 
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/) on transifex
 2014-05-24 14:36:10 +02:00
Vincent Petry
d6e1643a0e Fix dropping files below the table 2014-05-22 11:16:42 +02:00
Vincent Petry
6fd084243b Fixed many issues, clean up 
- fixed upload and storage statistics
- fixed infinite scroll to use the correct contain for scroll detection
- fixed unit test that sometimes fail for rename case
- controls are now sticky again
- fixed selection overlay to be aligned with the table
- fixed "select all" checkbox that had id conflicts
- fixed public page
- fixed global actions permissions detection
- fix when URL contains an invalid view id
- viewer mode now hides the sidebar (ex: text editor)
- added unit tests for trashbin
- clean up storage info in template (most is retrieved via ajax call now)
 2014-05-15 17:51:04 +02:00
Vincent Petry
9d38e3602b Namespacing for FileList, FileActions and trashbin app 
- FileList is now an instantiable class
- FileActions is now in namespace
- added App class for trashbin app
- moved trashbin overrides into classes extending FileList
- replaced many static calls with "this." or "self." to make the classes
  reusable/extendable
- new URL parameter "view" to specify which view is shown, for example
  "files" or "trashbin"
- added OC.Util.History utility class in core for handling history
- moved URL handling/routing to OCA.Files.App
- popstate will correctly update the current view and notify the view of
  the URL change so it can update the current dir
- added JS unitt tests for the trashbin app
- fixed public app to work with the new namespaces
 2014-05-15 17:51:04 +02:00
Vincent Petry
fb10bf4048 Files app navigation can now switch 
- added new OCA.Files namespace for files classes
- the sidebar can now switch between views/containers
- the trashbin renders in its own container but currently doesn't work
  due to overrides
- added app.js as entry point for JS code (ideally all other files should
  only contain classes and not trigger anything)
 2014-05-15 17:51:04 +02:00
Vincent Petry
88ebb15f1d Added navigation manager in files app for the sidebar 
Apps can now register navigation items into the sidebar of the files app.
For every sidebar item there is a container.
The container's content is rendered based on the script name given at
registration time.
 2014-05-15 17:51:04 +02:00
Vincent Petry
9ccb3279dd Added app navigation for files app 
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
 2014-05-15 17:51:04 +02:00
Thomas Müller
535302b25e typos, indentation and remove of unused code 2014-04-28 17:59:50 +02:00
Vincent Petry
688f6162da Add sorting to files list, trashbin and public files 2014-04-28 17:42:04 +02:00
Vincent Petry
9f62059efa Fix file summary to use the whole file list 
- moved the summary code into a new class FileSummary
- FileSummary is calculated only once, then updated with add/remove
- added new OC.Util namespace for JS utility functions
 2014-04-28 14:49:39 +02:00
Volkan Gezer
1aa7774178 make max. text translatable 2014-04-21 02:41:33 +02:00
Jörn Friedrich Dreyer
c90b0ac00b Fix copy conflict dialog translation 2014-04-07 11:46:47 +02:00
Vincent Petry
0be9de5df5 Files, trashbin, public apps use ajax/JSON for the file list 
Files app:

- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
  arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
  full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
  Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only

Breadcrumbs are now JS only:

- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class

Public page now uses ajax to load the file list:

- Added Helper class in sharing app to make it easier to authenticate
  and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list

Core:

- Fixed file picker dialog to use the same list format as files app
 2014-04-02 15:33:47 +02:00
Jan-Christoph Borchardt
2be2a5d2c5 external storage: fix merge conflict, indentation 2014-03-31 13:12:04 +02:00
Morris Jobke
6a8e93ffa6 fix breadcrumbs for IE8 2014-03-27 23:53:19 +01:00
Jan-Christoph Borchardt
6de572c6e6 replace personalblock fieldset with section class in files apps 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
832d3c954e enable SVG->PNG fallback for 'New' menu 2014-03-27 14:48:54 +01:00
Thomas Müller
6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Jan-Christoph Borchardt
55c630ea7d remove unneeded icon class 2014-03-14 14:47:40 +01:00
Francesco Piraneo G.
3f4a0778c8 Update index.php 
On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files;
 2014-03-11 14:29:26 +01:00
Thomas Müller
15d1df055b Merge branch 'master' into display-share-owner-master 
Conflicts:
	apps/files_sharing/lib/cache.php
 2014-02-28 14:54:10 +01:00
Jan-Christoph Borchardt
877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
Thomas Müller
d6e89a9a28 store the share owner in a data-attribute instead of a separate span 2014-02-20 18:24:42 +01:00
Thomas Müller
7c68025010 adding share owner information to the file list 2014-02-20 18:24:42 +01:00
Pellaeon Lin
099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg 
Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
 2014-01-30 22:50:20 +08: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
Vincent Petry
4734146580 Fixed max upload size input field style 
Added "type=text" makes it look like nice like all other fields
 2014-01-23 20:50:09 +01:00
Jan-Christoph Borchardt
809fb8482d remove %webroot% from files app 2014-01-23 13:11:08 +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
Morris Jobke
f0a5007e9a fix input element closing tag 2014-01-17 16:32:01 +01:00
Vincent Petry
f4c198b907 Fixed isPreviewAvailable warnings in log 
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.

Fixes #6423
 2014-01-17 14:22:05 +01:00
Thomas Müller
ce231c406d no new menu on public upload 2014-01-15 15:07:52 +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
Robin Appelman
d279ddd9a2 Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder 2014-01-15 13:36:14 +01:00
Bjoern Schiessle
3e17fbe30d always show home breadcrumb in files view 2013-12-16 17:40:35 +01:00
Pellaeon Lin
4b081be956 #max_upload is needed after all 2013-12-11 12:21:39 +08:00
Pellaeon Lin
64bf0fa47f Display different messages for uploadLimit and freeSpace 2013-12-08 23:17:35 +08:00
Bjoern Schiessle
e447d978d3 it is not possible to unshare files 2013-12-06 12:35:47 +01:00
Vincent Petry
69a3327f47 Moved new file extension out of the translated string 2013-11-28 10:52:59 +01:00
Vincent Petry
24a08c686d New file box now has default file name + extension 
Whenever a user creates a file or folder in the web UI, the input field
will contain a default file name, pre-selected up to the extension for
easier typing.

The purpose is mostly to prevent users creating text files without an
extension.

Fixes #6045
 2013-11-28 10:18:31 +01:00
Bjoern Schiessle
9d16353e09 disable trahs in files_sharing/public.php 2013-11-21 12:06:35 +01:00
Bjoern Schiessle
c9646ddc4c fix undefined index errors if public share view 2013-11-21 12:03:27 +01:00
Vincent Petry
e62ca4ea4f Append file etag to preview URLs 
Fixes #5534
 2013-10-28 14:14:55 +01:00
Thomas Müller
e95ad29d90 Merge pull request #5435 from owncloud/share-improvements 
Share improvements
 2013-10-23 09:56:24 -07:00
Christopher Schäpers
70c0d7d6bc Merge pull request #5310 from owncloud/hide_filestable-header_when_empty 
Hide files list header, when theres no files to see
 2013-10-22 14:39:14 -07:00
Vincent Petry
d1c27e08e5 Fixed empty content logic 
- Remove obsolete code that used another approach for hiding emptycontent
- Fixed logic for the showing of the empty content message
 2013-10-21 22:18:10 +02:00
kondou
732e7db319 Fix mind-boggling emptycontent logic 2013-10-21 19:49:27 +02:00
Vincent Petry
f8717bc260 Fixed share with link checkbox missing as regular user 
Instead of loading the app config setting "shareapi_allow_links" using a
synchronous ajax call that fails when the user is not an admin, this fix
puts the flag directly in the template so it doesn't need to be loaded
afterwards.

Fixes #5440
 2013-10-21 11:29:40 +02:00
Jan-Christoph Borchardt
cbb42aae11 improve wording of permission notice 2013-10-20 23:46:01 +03:00
Jan-Christoph Borchardt
dbcfb1b830 beautify 'you dont have write permissions' notice, fix #2770 2013-10-20 23:15:58 +03:00
kondou
f828b51ede Hide files list header, when theres no files to see 2013-10-12 17:28:20 +02:00
Vincent Petry
39b150921d Moved IE8 inline styles in files.css 2013-10-11 14:10:00 +02:00
Vincent Petry
75629a1f00 Fixed delete icon alignment in IE8 
Removed old inline CSS that forced every td to have position:static in
the files app. (#5056)
 2013-10-11 00:16:41 +02:00
Vincent Petry
bf00ccd1d6 Fixed files view regular file actions in IE8 
Fixes #5256

A missing closing span broken the container in IE8 which prevented the
file actions to be appended properly.
 2013-10-10 12:21:02 +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
Jörn Friedrich Dreyer
3be8e3f8d3 remove obsolete comment 2013-10-07 11:14:11 +02:00
Morris Jobke
e1e16ec3b0 Merge pull request #5088 from owncloud/fix_trashbin_button 
trash bin button needs to be an input field
 2013-10-06 14:51:08 -07:00
Jan-Christoph Borchardt
2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
Bjoern Schiessle
51295e9a6b Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
 2013-10-04 12:30:49 +02:00
Björn Schießle
5b7f76e702 Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617 
Encryption improved error messages
 2013-10-04 02:28:18 -07:00
Bjoern Schiessle
b7c3af11bf fix hidden fieled name 2013-10-04 10:46:55 +02:00
Thomas Müller
9c23c3449b Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	core/css/share.css
 2013-10-02 23:33:50 +02:00
Jan-Christoph Borchardt
f8093699f7 Merge pull request #5093 from owncloud/file-actions 
File Selected on Click instead of download.
 2013-10-02 09:56:08 -07:00
raghunayyar
0d5653c6b1 Takes nametext inside the anchor tag to fix the issue completely. 2013-10-02 22:11:03 +05:30
raghunayyar
4a5f3442b5 Closes Label inside the a tag for not hiding the fileactions. 2013-10-02 21:40:34 +05:30
raghunayyar
81b4904c78 File Selected on Click instead of download. 2013-10-02 21:13:07 +05:30
Jan-Christoph Borchardt
5feaa55779 simplify From Link icon in New menu 2013-10-02 18:27:39 +03:00
Bjoern Schiessle
9be6114a52 trash bin button needs to be an input field 2013-10-02 16:13:08 +02:00
Bjoern Schiessle
8b08b1b455 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/private/util.php
 2013-10-02 10:11:18 +02:00
Bjoern Schiessle
4d79e7e673 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-30 15:08:53 +02:00
kondou
d7409547aa Fix not displaying "Upload something!" message 
Fix #4940
 2013-09-23 16:39:42 +02:00
Bjoern Schiessle
fc76a13c52 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/public/share.php
 2013-09-23 11:18:00 +02:00
Bjoern Schiessle
f6e8a388a9 Merge branch 'master' into encryption_improved_error_messages_4617 
Conflicts:
	settings/ajax/changepassword.php
 2013-09-23 10:39:12 +02:00
Jörn Friedrich Dreyer
7bd5e89f8c simplify conflict template handling, fix reopen after ESC 2013-09-18 17:22:29 +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
82cbbb8ab8 Merge branch 'master' into encryption_improved_error_messages_4617 
Conflicts:
	apps/files/index.php
 2013-09-16 10:42:37 +02:00
Bjoern Schiessle
534d93d2d3 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
 2013-09-16 10:40:06 +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
Vincent Petry
30a2f2f352 Use hash part of URL for IE8 in files app 
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.

This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.

From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.

In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.

When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
 2013-09-13 20:48:35 +02:00
Vincent Petry
364e7991a4 Fixed ajax support to also update the current dir permissions 2013-09-13 19:59:15 +02:00
Thomas Müller
4e751cbb47 fixing breadcrumbs on ajax loading of files 2013-09-13 19:59:15 +02: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
3066b44928 remove unused $relativePath 2013-09-12 00:39:03 +02:00
Thomas Müller
b49f43c3ae move icon generation logic out of the template 2013-09-12 00:13:19 +02:00
Bjoern Schiessle
fb462e83cc no longer enforce log out, but provide useful errors/warnings instead 2013-09-06 12:27:40 +02:00
Bjoern Schiessle
f8563ec583 Merge branch 'master' into sharing_mail_notification_master 
increased version number to trigger db update

Conflicts:
	lib/util.php
 2013-09-05 13:39:45 +02:00
Jörn Friedrich Dreyer
49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
Jörn Friedrich Dreyer
85758f3d7d Merge pull request #4473 from owncloud/texteditor_polishing 
Texteditor polishing
 2013-09-03 05:38:59 -07:00
Jörn Friedrich Dreyer
449fe8c75e Revert "remove editor div in filelist", add "is deprecated" comment 
This reverts commit 64d09452f5.
 2013-09-03 13:20:20 +02:00
Bjoern Schiessle
b918c06be6 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/util.php
 2013-09-02 14:41:46 +02:00
Alessandro Cosentino
4b32d84314 text centered horizontally and vertically in emptycontent div 2013-08-31 11:12:07 -04:00
Bjoern Schiessle
77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
Georg Ehrke
b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
kondou
6bd0f3cba7 Reimplement filesummary in JS 
Fix #993
 2013-08-28 15:10:17 +02:00
Georg Ehrke
224b80f906 move isMimeSupported out of template files 2013-08-21 15:55:59 +02:00
Georg Ehrke
48f0c54261 style fixes for preview lib 2013-08-19 12:16:55 +02:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Jörn Friedrich Dreyer
64d09452f5 remove editor div in filelist 2013-08-16 17:19:48 +02:00
Jan-Christoph Borchardt
e7c0693570 checkstyle double quotes in HTML 2013-08-15 19:40:39 +02:00
Jan-Christoph Borchardt
137d644963 Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview 2013-08-14 20:41:49 +02:00