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

79 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer 078bf0df25 use {count} instead of 'One' for more versatile translation 2013-09-19 12:05:30 +02:00
Jörn Friedrich Dreyer a6933efce3 use n to translate title 2013-09-19 11:25:41 +02:00
Jörn Friedrich Dreyer 0d81a53e12 use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there 2013-09-19 10:00:42 +02:00
Jörn Friedrich Dreyer f7800cd63e fix 'event is not defined' error 2013-09-19 09:47:51 +02:00
Jörn Friedrich Dreyer 72d53008cc indentation 2013-09-18 17:58:15 +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
Thomas Müller db7e1dd877 Merge pull request #4853 from owncloud/external-shared_mimetype-icons 
Use external and shared icons in OC.Dialogs.filepicker()
 2013-09-15 02:42:14 -07:00
Thomas Tanghus dcc899d0a0 Merge pull request #4806 from owncloud/oc-dialogs-pageleave 
Don't popup meaningless alerts when dialog called on page leave
 2013-09-14 10:35:39 -07:00
kondou c117e719da Use external and shared icons in OC.Dialogs.filepicker() 2013-09-14 14:35:23 +02:00
Thomas Tanghus 08225a60c8 Save two lines 2013-09-11 21:15:32 +02:00
Thomas Tanghus 1f8f0e61d8 Remove test error :P 2013-09-11 21:11:35 +02:00
Thomas Tanghus 799c5c2c9b Don't popup meaningless alerts when dialog called on page leave 2013-09-11 16:02:12 +02:00
Jörn Friedrich Dreyer bd1d5b69fb fix ESC for conflicts dialog 2013-09-08 17:31:12 +02:00
Jörn Friedrich Dreyer 0a0410815e close and destroy dialog on ESC 2013-09-08 10:11:35 +02:00
Robin Appelman 00cc83e3f7 show preview for uploading image files on conflict 2013-09-07 14:58:51 +02:00
Jörn Friedrich Dreyer ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer 673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer 02d14aee17 completely remove dialog on cancel/continue 2013-09-06 16:50:45 +02:00
kondou c6ca9c1e9d Use shorter array-conversion 2013-09-06 13:33:17 +02:00
kondou f84fe479a5 Only use mimetype_list and clean up a bit 2013-09-05 18:40:55 +02:00
Jörn Friedrich Dreyer 8a7e26b268 cleanup dead code 2013-09-05 17:46:19 +02:00
kondou 992b59f70b Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype 2013-09-05 16:54:12 +02:00
Jörn Friedrich Dreyer bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +02:00
Jörn Friedrich Dreyer 49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
Jörn Friedrich Dreyer 4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
 2013-09-04 14:11:40 +02:00
kondou d62c5063f4 Add previews to OC.dialogs.filepicker(); Fix #4697 2013-09-03 15:15:20 +02:00
Thomas Tanghus 53a7f80ac3 Use provided mimetype on open. Fix #4696 2013-09-02 23:53:45 +02:00
Jörn Friedrich Dreyer 7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +02:00
kondou edd92e4c09 Merge branch 'master' into fix_jslint_kondou 
Conflicts:
	apps/files/js/file-upload.js
 2013-08-18 00:38:52 +02:00
kondou 2ee8425295 Remove cancel button from filepicker 
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
 2013-08-17 12:07:58 +02:00
Jörn Friedrich Dreyer f94e603698 progress fixes 2013-08-16 11:40:55 +02:00
Jörn Friedrich Dreyer 9da49264ea change filelist ui updates 2013-08-14 17:49:45 +02:00
Jörn Friedrich Dreyer e1927d5bee fix whitespace, check selected files before starting upload 2013-08-14 10:55:12 +02:00
kondou 1348330c7d Fix a syntax error & have if-conds in an own line 2013-08-01 18:44:01 +02:00
kondou aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Thomas Tanghus 46d4886709 Set default button in oc-dialogs 2013-06-03 03:31:33 +02:00
Thomas Tanghus 5f1cbc6a1a Catch double destroy on escape. 2013-06-03 03:19:35 +02:00
Thomas Tanghus 901b1150ff Replacement for jquery.dialog to fit better with ownCloud design. 2013-06-02 21:52:59 +02:00
Thomas Tanghus 38b2d0a822 Remove more obsolete code. 2013-05-20 09:54:43 +02:00
Thomas Tanghus 27a5132b46 Don't set image path in template. 2013-05-20 09:44:31 +02:00
Thomas Tanghus c3779555aa Dialogs: Home folder icon instead of '/'. 2013-05-17 16:18:40 +02:00
Thomas Tanghus ba9849a1aa Dialogs: Fix method names. 2013-05-17 08:42:15 +02:00
Thomas Tanghus 2f91606e35 Dialogs: Cleanup. 2013-05-17 07:14:43 +02:00
Thomas Tanghus a0b79f5649 Dialogs: Loose up-button. 2013-05-17 06:48:24 +02:00
Thomas Tanghus e60d86bdd1 Dialogs: Make slug show last dir emphasized. 2013-05-17 06:16:51 +02:00
Thomas Tanghus 152e275c8a Various cleanups in OC.dialogs 2013-05-17 04:54:08 +02:00
Thomas Tanghus 913941d894 Line length etc. 2013-05-16 18:19:28 +02:00
Thomas Tanghus c8bbf90feb Port OC.dialogs to use octemplate except for prompt() and form(). 
Also load octemplate per default.
 2013-05-16 13:41:04 +02:00
kondou e44cc8ea57 Fix OC.dialogs.form() 
Don't do _too_ much escapeHTML()
 2013-04-09 13:07:28 +02:00