Commit Graph

259 Commits

Author SHA1 Message Date
Michael Gapczynski d78b75a0d1 Merge branch 'master' into sharing 2011-08-11 17:43:43 -04:00
Michael Gapczynski 4830555cce Merge branch 'master' into sharing
Conflicts:
	.gitignore
2011-08-11 17:42:37 -04:00
Jan-Christoph Borchardt 577f2952bd action icons are now ACTION ICONS 2011-08-11 23:38:50 +02:00
Robin Appelman 972f7d7e60 forgot something 2011-08-11 23:23:59 +02:00
Robin Appelman ae7d9143f4 allow dynamicly determaning icons for fileactions 2011-08-11 23:21:30 +02:00
Dawid Opis 11b3c10cc6 resolved merge conflicts 2011-08-11 22:29:48 +02:00
Dawid Opis 9683d44633 fixed upload button 2011-08-11 22:22:32 +02:00
Jan-Christoph Borchardt ce9b36fd3e some interaction design for user management 2011-08-11 21:00:48 +02:00
Robin Appelman 0bcb4a6a8f set default max upload size in the .htaccess file to something rediculous
and don't show the max filesize message when the limit is over 10GB
2011-08-11 21:00:18 +02:00
Robin Appelman dfb923f34e automatically set background images to png when needed 2011-08-11 20:36:31 +02:00
Michael Gapczynski c65046773d Make unshare work from dropdown 2011-08-11 14:20:50 -04:00
Jan-Christoph Borchardt 99790d6805 lots of image changes, use svg EVERYWHERE POSSIBLE 2011-08-11 19:00:32 +02:00
Frank Karlitschek c824572b91 fix the getlink calls 2011-08-11 16:15:55 +02:00
Jan-Christoph Borchardt b4e89871dd merged master into sharing 2011-08-11 13:29:22 +02:00
Dawid Opis fa61279e45 fixed upload button overlapping new folder input 2011-08-11 00:03:26 +02:00
Jan-Christoph Borchardt 1128b15833 fixed navigation and breadcrumb graphics 2011-08-10 23:44:18 +02:00
Jan-Christoph Borchardt 225d000491 I don't always test my code. But when I do, I do it in production. 2011-08-10 23:26:25 +02:00
Jan-Christoph Borchardt bdba88d7f6 damn z-index 2011-08-10 23:12:41 +02:00
Jan-Christoph Borchardt 90136b6e0a fix search, sane z-indexes 2011-08-10 23:09:29 +02:00
Jan-Christoph Borchardt 6af4c2dd0f moved search box directly to template 2011-08-10 23:02:41 +02:00
Jan-Christoph Borchardt 1dac5bb390 fixed undo notification not showing 2011-08-10 20:48:56 +02:00
Bartek Przybylski ec31a29b3c Bug 279826 fix 2011-08-10 20:12:42 +02:00
Michael Gapczynski e1bde1a78e Merge branch 'master' into sharing
Conflicts:
	files/templates/index.php
2011-08-10 13:40:47 -04:00
Jan-Christoph Borchardt f754d6dc51 lots of CSS details 2011-08-10 15:11:26 +02:00
Robin Appelman 9059b55979 make more strings translatable 2011-08-10 14:03:54 +02:00
Michael Gapczynski ec6aed8475 Merge branch 'master' into sharing 2011-08-09 10:42:50 -04:00
Robin Appelman 5ecdd26902 show settings page in the correct context 2011-08-08 21:51:10 +02:00
Robin Appelman e6f6d3dabc dont use a different navigation page for settings stuff 2011-08-08 21:43:31 +02:00
Jan-Christoph Borchardt 3b34cba4ae first mediaplayer styling 2011-08-08 21:40:39 +02:00
Robin Appelman 90726b10c4 fix a problem with ranming files containing spaces 2011-08-08 18:05:39 +02:00
Jan-Christoph Borchardt 3c01c36202 various style fixes 2011-08-08 14:13:11 +02:00
Jan-Christoph Borchardt b9ce564053 Merge branch 'master' into sharing 2011-08-08 13:04:10 +02:00
Jan-Christoph Borchardt ecd2738e83 fixed upload button 2011-08-08 12:48:43 +02:00
Jan-Christoph Borchardt 5382ec66a2 fixed search box and file controls 2011-08-08 11:24:09 +02:00
Michael Gapczynski 1aa89b7cbb Merge branch 'master' into sharing
Conflicts:
	files/css/files.css
	lib/base.php
2011-08-07 15:56:26 -04:00
Jakob Sack 501b767e6e Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-06 11:38:49 +02:00
Jakob Sack 5f7c040ec0 Add principals, minor changes in base.php 2011-08-06 11:36:56 +02:00
Jan-Christoph Borchardt 193b9c9386 styled undo file deletion 2011-08-05 07:37:08 +02:00
Jan-Christoph Borchardt 12cc7c77ba widen upload and new folder so that upload button text does not overflow 2011-08-04 15:29:35 +02:00
Robin Appelman e209511f86 provide undo button when deleting files from the web interface 2011-08-04 00:22:44 +02:00
Michael Gapczynski 8f01abf054 Share dropdown updates, making public links now works 2011-08-03 15:21:53 -04:00
Robin Appelman 3829b1e7b9 hide the file icon when showing the checkbox again 2011-08-02 23:03:59 +02:00
Robin Appelman 6bda6de9a1 show table header in filebrowser always on top when files are selected 2011-08-02 23:00:40 +02:00
Jan-Christoph Borchardt d0b2a3b1ac moved dialog css to sharing, fixed position 2011-08-02 19:30:18 +02:00
Jan-Christoph Borchardt d71cca0e81 first style for sharing dropdown, some html fixes 2011-08-02 18:58:33 +02:00
Jan-Christoph Borchardt b5c213ce6d fixed starting breadcrumb divider 2011-08-02 03:59:25 +02:00
Jan-Christoph Borchardt 5c941e57d2 fixed showing mimetypes for new files 2011-08-02 03:17:26 +02:00
Jan-Christoph Borchardt 657a61e537 no more misclicking files on checkbox ticking 2011-08-02 02:29:51 +02:00
Michael Gapczynski 0d3ebbfefd Merge branch 'master' into sharing 2011-07-30 19:57:57 -04:00
Michael Gapczynski 11d1627513 Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts:
	lib/base.php
2011-07-30 19:40:19 -04:00