mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
32,468 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

319 Commits

Author SHA1 Message Date
Thomas Mueller 9671ace32e Merge branch 'master' into fix_minor_files_annoyances 
Conflicts:
	apps/files/js/files.js
 2013-01-06 22:46:40 +01:00
Thomas Mueller 6806484c16 Merge branch 'master' into fixing-998-master 2013-01-06 10:36:14 +01:00
Jörn Friedrich Dreyer de496ed16d remove initial iframe, is added automatically by jquery upload mechanism 2013-01-04 13:47:47 +01:00
Robin Appelman e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Thomas Müller e0e7c98100 Merge pull request #1041 from owncloud/fixing-856-master 
Fixing #856 master
 2013-01-02 14:58:54 -08:00
Thomas Mueller 48c7bed59b make usedSpacePercent available in the files app 2013-01-02 15:06:49 +01:00
Michael Gapczynski b5b48428ab Replace %2F with / in breadcrumbs 2012-12-28 19:41:37 -05:00
Thomas Mueller a3206b4e97 only show the max possible upload of 2GB on a 32 bit system. 
for a 64 bit system we have no such limitation
refs #856

Conflicts:
	apps/files/templates/admin.php
 2012-12-28 22:17:38 +01:00
Robin Appelman 7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Jan-Christoph Borchardt bdc8d0098a Merge pull request #869 from owncloud/files-styles 
Files styles
 2012-12-20 05:39:09 -08:00
Jan-Christoph Borchardt 586cc9a83b merge master into navigation 2012-12-18 15:41:58 +01:00
Frank Karlitschek 30b0e8b70c cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-) 2012-12-15 20:02:16 +01:00
Jan-Christoph Borchardt 316a29f7ac fix new button popup looking blurry 2012-12-13 19:04:27 +01:00
Robin Appelman 7969d6e646 Merge branch 'master' into filesystem 2012-12-11 23:57:59 +01:00
Jörn Friedrich Dreyer 80d8ca24ec fix svg -> png replacement for android, cleanup and remove obsolete css 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer 8cf1e560bb add IE9 CSS checkbox fixes 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer 810e02099e upload button HTML, CSS & JS cleanup 2012-12-07 15:32:24 +01:00
Jörn Friedrich Dreyer 76395057d4 fix_new_and_upload_button_html_css 2012-12-07 15:32:24 +01:00
Robin Appelman 72b6faa69d merge master into filesystem 2012-12-02 03:03:48 +01:00
Jörn Friedrich Dreyer 3b83fe1530 fix checkstyle for files app 2012-11-29 18:33:15 +01:00
Robin Appelman 555dec2d92 merge master into filesystem 2012-11-23 16:20:56 +01:00
Bart Visscher 20c24f234f Do the url encoding once, only in breadcrumbs template 
fixes issue #438
 2012-11-16 16:12:28 +01:00
Robin Appelman bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Robin Appelman 41a61bc637 fix undefined index when loading files app 2012-11-08 21:36:13 +01:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Jan-Christoph Borchardt b05666219e Merge branch 'master' into navigation 2012-11-02 13:36:01 +01:00
Lukas Reschke 0f02b7dea6 Add CSRF token 2012-11-02 00:09:28 +01:00
Jan-Christoph Borchardt e66482430e Files: change wording 'From url' to 'From link' 2012-11-01 18:09:16 +01:00
Jan-Christoph Borchardt 01bd0efc36 Merge branch 'master' into navigation 2012-11-01 16:58:06 +01:00
Lukas Reschke 116fa64294 Change IE8 to "older IE versions" 
I'm not sure if IE9 is also affected, so I changed it to "older IE versions" - IE 10 should work fine.
 2012-10-30 17:29:26 +01:00
Lukas Reschke ee1e4a7602 Send the requesttoken as form value 
This is needed for IE < 8 because it doesn't send the CSRF token here.
So that it is impossible to upload files.

Fixes #110 and related to #122
 2012-10-30 17:19:49 +01:00
Jan-Christoph Borchardt 7af8c6c3cb first version of breadcrumb 'root', still have a weird feeling about this 2012-10-28 16:05:31 +01:00
Bart Visscher d6953fa5ed Remove wrongly committed files 2012-10-27 17:45:15 +02:00
Bart Visscher 894d44e796 Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git' 
Conflicts:
	lib/base.php
 2012-10-27 16:33:10 +02:00
Felix Moeller e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Susinthiran Sithamparanathan b2b84f3a6f Update Sabre to version 1.7.1 2012-10-17 16:17:36 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Björn Schießle 41640b4b91 don't show the share action in the file view for publically shared files. 2012-10-10 17:44:21 +02:00
Björn Schießle 4dba91838f add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views. 2012-10-08 10:28:29 +02:00
Björn Schießle 4f7c7c615e prevent xss attacks 2012-10-05 17:05:23 +02:00
Tom Needham bcd3d1116c Change background colour of upload button to be consistant with new button 2012-09-21 12:45:11 +00:00
Bernhard Posselt 1c643ce4bc made upload button the same height in chrome and firefox 
Signed-off-by: Tom Needham <needham.thomas@gmail.com>
 2012-09-19 22:10:13 +00:00
Michael Gapczynski 73d726d1b2 Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions 2012-09-07 00:02:22 -04:00
Michael Gapczynski 17dadd5c8a Don't show the delete all action if delete permission is not granted 2012-09-07 00:02:22 -04:00
Michael Gapczynski a5211e31bc Add permissions to new files/folders, bug fix for oc-1649 2012-09-05 21:47:09 -04:00
Thomas Mueller 02f9de55a3 add translation string 2012-09-04 23:42:49 +02:00
Bart Visscher db18218a1b Space before tab fixes 2012-08-29 20:34:44 +02:00
Bart Visscher 0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Michael Gapczynski 36487246ed Switch to using file cache ids instead of paths for file sharing 2012-08-24 10:05:37 -04:00
Michael Gapczynski 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Michael Gapczynski 6f58eca534 Change read only check to isCreatable 2012-07-24 21:35:03 -04:00
Bjoern Schiessle cd005e6c62 use new sanitizeHTML() function 2012-06-21 10:28:43 +02:00
Lukas Reschke 6defbc7f4d Removed some unessecary sanitizations 2012-06-11 19:20:48 +02:00
Robin Appelman a3c1f70be4 dont show config option for file upload size if we cant write the new value 2012-06-06 00:24:15 +02:00
Bart Visscher 4a5973662c Merge branch 'unstable' 
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
 2012-06-04 23:02:05 +02:00
Michael Gapczynski cbfbbe672c Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115 
Conflicts:
	apps/files/templates/index.php
 2012-05-17 15:38:28 -04:00
Michael Gapczynski 6673375eeb No multiple file sharing in this next release, sharing UI isn't ready for it :( 2012-05-15 11:45:59 -04:00
Sam Tuke 2ad6b5048e fixed 'delete' label so it doesn't break translations 2012-05-15 16:24:06 +01:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Jan-Christoph Borchardt d1e5a56bc6 fixing upload icon color 2012-05-10 21:40:22 +02:00
Vitaly Kuznetsov 6f981738bb Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example) 2012-05-10 09:10:53 +00:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Frank Karlitschek e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek 1a2bbd2ee4 ported addSyript and other small stuff 2012-05-01 20:03:41 +02:00
Georg Ehrke 2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke 3b9d283245 fix path in apps/files/templats/index.php 2012-04-23 16:25:07 +02:00
Georg Ehrke 4c2cf35050 fix merge conflicts 2012-04-22 13:19:12 +02:00
Georg Ehrke 45de7ad221 move files to app folder 2012-04-18 17:27:34 +02:00