Commit Graph

490 Commits

Author SHA1 Message Date
Sam Tuke 8b01286a5d Merged branch 'master' 2012-10-16 16:57:07 +01:00
Frank Karlitschek a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Bart Visscher f991948a71 Fix loading by apptype in webdav 2012-05-05 21:58:10 +02:00
Georg Ehrke 1b935a22ce add old webdav file 2012-04-27 10:23:29 +02:00
Georg Ehrke 6039dd0fe8 remove merge conflicts fail 2012-04-26 21:23:38 +02:00
Georg Ehrke 2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Arthur Schiwon 249e0c1ee2 bring fileactions to the right position again 2012-04-26 01:03:01 +02:00
Arthur Schiwon de135e3b9b resolve merge conflicts 2012-04-26 00:14:21 +02:00
Robin Appelman 9d91e53027 fix problem with filescanning 2012-04-25 22:42:00 +02:00
Robin Appelman fa502e160d allow manually scanning of specific directories 2012-04-25 00:12:12 +02:00
Jan-Christoph Borchardt 3ba9a9e6a8 adding proper copyright and license notice to the style files 2012-04-23 14:19:03 +02:00
Frank Karlitschek 260c48c29a cleanup the admin page layout mess a bit. Still a lot to improve in the future :-) 2012-04-21 23:23:02 +02:00
Jan-Christoph Borchardt 9abb70245a showing the file extensions more visible by default. I still think it's shitty design, but I get worse nightmares over thinking that showing file extensions would become a configuration option. 2012-04-19 16:41:37 +02:00
Georg Ehrke 45de7ad221 move files to app folder 2012-04-18 17:27:34 +02:00
Georg Ehrke eb29c577c2 Merge branch 'master' into movable_apps 2012-04-18 12:20:09 +02:00
Georg Ehrke 69ee0efc0b remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Jan-Christoph Borchardt d8761d7edd upload arrow has full opacity, button is highlighted for new users and empty folders 2012-04-17 14:29:02 +02:00
Robin Appelman c3187e9388 dont show action text for folders bold 2012-04-16 13:14:41 +02:00
Robin Appelman 6af808edc9 fix delete button not always disapearing 2012-04-16 13:11:41 +02:00
Robin Appelman cfd0140e2f fix 2 potential xss problems 2012-04-16 12:59:38 +02:00
Simon Birnbach 965a8ba2c6 Fixed cancelling of uploads and wrong merge conflict resolution 2012-04-15 23:52:36 +02:00
Jan-Christoph Borchardt 1281809300 improving file actions also for multiselect 2012-04-15 17:49:54 +02:00
Jan-Christoph Borchardt 2dfab65a33 fixing file action positioning 2012-04-15 17:49:54 +02:00
Robin Appelman 8ecddb5bc3 create a new filename when the uploaded file already exist 2012-04-15 17:34:53 +02:00
Thomas Müller a0d917fe98 fixing oc-375 - a number is appended tp the filename 2012-04-15 17:00:49 +02:00
Simon Birnbach 8e27b725ba Fixed cancelling upload of same file to folder and subfolder 2012-04-15 16:47:53 +02:00
Robin Appelman c0bdad5893 dont allow draging files to the current directory 2012-04-15 16:06:55 +02:00
Simon Birnbach a384fcb99f Merge git://gitorious.org/owncloud/owncloud
Conflicts:
	files/css/files.css
	files/js/files.js
2012-04-15 15:59:57 +02:00
Robin Appelman 75a4e46872 do no offer 'undo delete' on opera
opera lacks the onunload to make it work
2012-04-15 15:48:19 +02:00
Tom Needham cdf9f8c42a Force Files app to top of app menu 2012-04-15 13:41:22 +00:00
Jan-Christoph Borchardt 1f91224f9e fixing opacity and fading, also for IE 2012-04-15 14:37:42 +02:00
Jan-Christoph Borchardt 897261daf4 display file actions perfectly 2012-04-15 14:15:11 +02:00
Jan-Christoph Borchardt 38cb716a57 increasing the file row height a bit 2012-04-15 13:34:31 +02:00
Jan-Christoph Borchardt 7ddd043427 renamed extention to extension, also now only showing lowercase 2012-04-15 13:34:30 +02:00
Jan-Christoph Borchardt d32799e4bf show text for file actions 2012-04-15 13:34:30 +02:00
Robin Appelman b669c846b0 add span around fileactions 2012-04-15 13:25:31 +02:00
Robin Appelman b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Jan-Christoph Borchardt 31df4c00ec adding tipsy tooltips for file actions 2012-04-13 17:22:23 +02:00
Arthur Schiwon b95f561bf2 file settings: let people set no more than upper boundary for file uploads, but they should can really go up to the limit 2012-04-13 11:25:38 +02:00
Arthur Schiwon 1bd27891e2 make upload size settings work probably. do not replace whole .htaccess, only replace what is needed. Consistent, human readable input on admin settings page. 2012-04-13 10:43:44 +02:00
Arthur Schiwon 1ade37305f always display config values
don't change values unintentionally
2012-04-12 20:17:52 +02:00
Arthur Schiwon 0c56f82db5 fix: drag'n'drop actions with files containing special chars, fixes oc-420 2012-04-10 13:53:27 +02:00
Bartek Przybylski 96c99125da mimetype filter for filepicker 2012-04-05 23:18:44 +02:00
Arthur Schiwon 60e3b563e2 webdav needs to load authentication apps 2012-04-04 12:41:32 +02:00
Bartek Przybylski cd05dfb943 adding icons to filepicker 2012-04-03 22:18:03 +02:00
Bartek Przybylski f21d6d4f9f dialogs filepicker first draft 2012-04-02 19:39:24 +02:00
Bart Visscher 71b70bb05f Fix HTML, misspelled span close tag 2012-03-30 23:41:54 +02:00
Robin Appelman 65eee1f69d clean pre-path_hash fscache entries 2012-03-30 19:44:49 +02:00
Robin Appelman 523fdda399 add the option to only load apps of a specific type 2012-03-30 14:39:07 +02:00
Arthur Schiwon 45a3d84748 checkobx opacity on files page for IE8 2012-03-29 18:32:25 +02:00