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

171 commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-10 16:54:48 +02:00
Thomas Tanghus
2cdde7a56a Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes 
Fixed missing checkboxes in IE8
 2013-09-09 18:25:37 -07:00
Vincent Petry
5f67ccba00 Fixed missing checkboxes in IE8 
IE8 is not happy with the :checked CSS3 selector which causes it to
ignore the whole rule.

Replace it with a more compatible selector.
 2013-09-08 22:21:07 +02:00
Jörn Friedrich Dreyer
ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer
4d04dd9c4c Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-06 13:42:05 +02:00
Pete McFarlane
83afba5070 prefix #filestable to tbody tr 2013-09-06 10:01:11 +01: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
Alessandro Cosentino
4b32d84314 text centered horizontally and vertically in emptycontent div 2013-08-31 11:12:07 -04:00
Georg Ehrke
668c4c2652 fix issue with filetable background 2013-08-30 22:05:44 +02:00
Georg Ehrke
8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
petemcfarlane
ab1f78eac3 prefix 'tbody tr' to separate app/core css errors 
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
 2013-08-30 10:48:04 +01: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
Pellaeon Lin
cd41de839f Fix "select all" checkbox displacement when checked 2013-08-26 10:57:14 +08:00
Jörn Friedrich Dreyer
7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +02:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Jan-Christoph Borchardt
dce7cdaaec remove unneeded extra ID selectors 2013-08-18 11:27:51 +02:00
Jan-Christoph Borchardt
bf4efd5290 move upload progress bar near upload button, more contextual 2013-08-18 11:18:16 +02:00
Jan-Christoph Borchardt
7e4dcd268f vertically center rename input box 2013-08-17 10:46:03 +02:00
Jörn Friedrich Dreyer
f94e603698 progress fixes 2013-08-16 11:40:55 +02:00
Jan-Christoph Borchardt
d2767faf61 Merge pull request #4113 from owncloud/delete-fix 
Delete icon fix
 2013-08-15 15:31:42 -07:00
Jan-Christoph Borchardt
2fd5178a00 adjust New file dialog for new styles 2013-08-15 12:50:26 +02:00
Jan-Christoph Borchardt
b2f666c98f fix file summary position 2013-08-14 21:26:06 +02:00
Jan-Christoph Borchardt
cba0f69622 increase row height to 50px, properly position everything, checkboxes, actions etc 2013-08-14 20:41:20 +02:00
Jörn Friedrich Dreyer
e1927d5bee fix whitespace, check selected files before starting upload 2013-08-14 10:55:12 +02:00
Jan-Christoph Borchardt
8652137ad6 Merge pull request #3912 from owncloud/css_cleanup_kondou 
General CSS cleanup
 2013-08-08 07:31:01 -07:00
Thomas Müller
7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Björn Schießle
a00cff7c05 disable "deleted files" button if trash bin is empty 2013-07-26 11:14:29 +02:00
Jan-Christoph Borchardt
dba4111aa0 fix delete button not showing in IE8 2013-07-22 11:18:51 +02:00
Georg Ehrke
a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Georg Ehrke
8eefaba719 some style adjustments 2013-07-10 12:30:11 +02:00
kondou
4818e0062e General CSS cleanup 2013-07-09 16:08:32 +02:00
kondou
b1d0de95a9 Show a summary as the last filelist entry 
Fix #993
 2013-07-02 04:28:52 +02:00
Georg Ehrke
806f3bddec increase size of preview to size of row 2013-06-26 18:19:13 +02:00
Jan-Christoph Borchardt
1a8e4399b0 increase Files row height to tappable 44px, more breathing space 2013-06-25 15:09:48 +02:00
Jan-Christoph Borchardt
5d4ff0e537 better contrast for files list, darker greys for selection and hover 2013-06-11 14:49:34 +02:00
raghunayyar
18618c75aa color change to crumb elements as well. 2013-05-14 11:07:12 +05:30
raghunayyar
6d95d130e4 Keeping Font Colors Consistant on the headers. 2013-05-13 23:12:05 +05:30
Bart Visscher
6d6dfffea7 Merge pull request #2279 from owncloud/refactor_upload_js 
Refactor upload js
 2013-04-06 15:44:08 -07:00
raghunayyar
5dd1f7d764 Using max-width instead of width for filename. 2013-03-30 00:13:47 +05:30
raghunayyar
024b60decc Adds a fixed width to the filename to prevent horizontal scroll. 2013-03-29 16:26:03 +05:30
Jörn Friedrich Dreyer
dac875eb9c '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly 2013-03-28 18:50:49 +01:00
Jan-Christoph Borchardt
afe7ea8ca2 fix files table CSS specificity issue causing multiselect bar overlap, fix #2075 2013-03-04 16:10:11 +01:00
Bart Visscher
de066beaaf Merge pull request #2044 from owncloud/fix_1779_including_permanent_shares 
Fix file actions including permanent shares
 2013-03-04 01:56:23 -08:00
raghunayyar
d3ddf03687 Datepicker height fixed. 
New id defined for files table for positioning.
 2013-03-04 09:21:38 +05:30
Jörn Friedrich Dreyer
f4411b0243 durhurrrhurrr 2013-03-03 13:01:25 +01:00
Jan-Christoph Borchardt
07e9f8d0d3 remove general CSS from IE specific rules, displays Shared state permanently again 2013-02-26 18:49:20 +01:00
Jörn Friedrich Dreyer
859caee66a use :hover pseudo class to set opacity 2013-02-21 16:52:18 +01:00
Jan-Christoph Borchardt
b8a6bca2d3 always show checkbox when selected, also in IE8, fix #1621 2013-02-14 10:40:23 +01:00
Robin Appelman
25b5b39e7a Files: fix width of table header when files are selected 2013-02-11 12:23:53 +01:00
Thomas Tanghus
419eced65c Remove hascontrols - use original positioning. 
I couldn't get Chromium and FF to agree, so a working hack
is better than a non-working one ;)
 2013-02-09 17:54:56 +01:00
Thomas Tanghus
60344bf1dd Another attempt on the filelist heading. 2013-02-09 14:00:26 +01:00
Thomas Tanghus
680af2e6ca Fix filelist shifting up one row on (multi)select 2013-02-08 22:30:27 +01:00
Myles McNamara
ddd47978e1 Remove left float from actions div class 2013-02-06 13:44:41 -05:00
Thomas Tanghus
b06ac67e07 Add 'hascontrols' class for content with fixed topbar. 2013-02-04 18:30:49 +01:00
Robin Appelman
9060c3bd83 Files: fix positioning of Trash button and upload progress bar 2013-02-04 01:05:59 +01:00
Thomas Tanghus
1557b6d99d Fix leftcontent positioning. Ref #1255 2013-02-03 14:44:33 +01:00
Jan-Christoph Borchardt
ad044eb888 Merge branch 'master' into navigation 2013-01-31 15:35:20 +01:00
Björn Schießle
54eeb8b8fc fix merge conflict 2013-01-31 10:55:59 +01:00
Robin Appelman
207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Björn Schießle
1592764a60 show a spinner instead of the delete button while moving files to the trash bin 2013-01-30 14:32:20 +01:00
Jan-Christoph Borchardt
284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +01:00
Jörn Friedrich Dreyer
0089b17749 add multselect dnd 2013-01-30 12:59:34 +01:00
Jan-Christoph Borchardt
01b3c088a9 fix color change on click 2013-01-28 19:47:51 +01:00
Björn Schießle
9d77317de8 add trash button to web interface 2013-01-22 15:32:57 +01:00
Jan-Christoph Borchardt
b81a7aa078 fix up content and content-wrapper merge ... 2013-01-18 19:58:50 +07:00
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Robin Appelman
94068e5d08 Cache: show upgrade progress 2013-01-15 18:13:50 +01:00
Jan-Christoph Borchardt
6182b1353b merge master into navigation 2013-01-15 20:40:38 +07:00
Jörn Friedrich Dreyer
9cd7bb2c8d reverse z-index of a and input to make upload work again in ie8/9 2013-01-04 13:48:29 +01:00
Jörn Friedrich Dreyer
03b8a065cf input/form switching cleanup 2013-01-02 17:03:16 +01:00
Jan-Christoph Borchardt
86d510ba28 fix switched values from previous commit 2012-12-20 13:30:57 +01:00
Jan-Christoph Borchardt
babc0e4ac6 fix Firefox issues with file actions position and multiselect bar width 2012-12-20 12:02:19 +01:00
Jan-Christoph Borchardt
aa5f726f14 use slightly darker color for file actions background, fix fugly look for selected rows 2012-12-20 11:24:25 +01:00
Jan-Christoph Borchardt
c05ea8cfc3 fix file actions messing with file row height on narrower screens 2012-12-20 11:14:27 +01:00
Jan-Christoph Borchardt
5107ccbeda move CSS from JS to CSS 2012-12-20 10:53:50 +01:00
Jan-Christoph Borchardt
586cc9a83b merge master into navigation 2012-12-18 15:41:58 +01:00
Jan-Christoph Borchardt
e0ada2c24f bring back fixed multiselect bar so it’s visible when scrolled down, fix #746 2012-12-13 19:44:55 +01:00
Jan-Christoph Borchardt
316a29f7ac fix new button popup looking blurry 2012-12-13 19:04:27 +01:00
Jan-Christoph Borchardt
e7c4a2c8e1 ungreenify new & upload buttons 2012-12-13 00:12:21 +01:00
Jörn Friedrich Dreyer
787e8b86d9 cleanup CSS whitespace and remove extra input[type='checkbok'] 2012-12-07 17:41:52 +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
2ec96c7a63 fix new li icons jumping when replacing p with input 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
6864b28e47 rmeove vendor prefix for box-shadow 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
Jan-Christoph Borchardt
d7abd44dea merge breadcrumb root into navigation 2012-10-28 17:10:31 +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
Jan-Christoph Borchardt
b595ea6efc first icon update. Next step: make sprited hover state (like for home already) 2012-10-27 17:44:24 +02:00
Jan-Christoph Borchardt
3eea7aac13 first base on navigation rework, less obtrusive, icons need to be updated, settings moved 2012-10-26 23:38:36 +02:00
Jan-Christoph Borchardt
f477fda785 separate buttons for new file and upload 2012-10-26 18:16:42 +02:00
Jörn Friedrich Dreyer
e307bf31c8 fix oc-605 2012-10-18 14:19:34 +02:00
Bart Visscher
4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Mat Lipe
d1010e58d8 Update apps/files/css/files.css 
Fixed a strange comment issue
 2012-10-01 06:43:31 -05:00
Mat Lipe
2330dd5f21 Update apps/files/css/files.css 
Fix the File Upload Button in Chrome. Tested in IE9-8-7, Firefox, Chrome
 2012-09-30 20:02:52 -05:00
Brice Maron
7aca730f71 Small css fix for button new in files. fix oc-1638 2012-09-24 18:40:59 +00:00
Tom Needham
bcd3d1116c Change background colour of upload button to be consistant with new button 2012-09-21 12:45:11 +00:00