Commit Graph

1434 Commits

Author SHA1 Message Date
Jakob Sack 2bfad189e7 Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
Conflicts:
	lib/base.php
	lib/filestorage.php
2011-07-29 20:42:24 +02:00
Michael Gapczynski 5fd77084c4 Merge branch 'master' into sharing
Conflicts:
	core/templates/layout.user.php
2011-07-29 13:58:13 -04:00
Robin Appelman d12d08e2f3 some more changes for navigation subentries 2011-07-29 19:43:06 +02:00
Robin Appelman 8b872e326a merge work on subnavagation 2011-07-29 19:14:00 +02:00
Robin Appelman fe47d51598 some refactoring for subnavigation code 2011-07-29 19:12:55 +02:00
Michael Gapczynski 997e1f9743 Merge branch 'master' of git://anongit.kde.org/owncloud 2011-07-29 12:26:30 -04:00
Michael Gapczynski 9f867abe75 Display subnavigation entries in user layout template 2011-07-29 12:25:57 -04:00
Michael Gapczynski 45222f34a6 Make 'Share' a subnavigation entry of of 'Files' 2011-07-29 12:20:01 -04:00
Michael Gapczynski b12b8d6166 Display subnavigation entries in user layout template 2011-07-29 12:17:46 -04:00
Michael Gapczynski 1fc41a7bfc Integrate sharing app with the new interface 2011-07-29 12:11:53 -04:00
Robin Appelman b6ad416757 you can now move files to the root folder by draging them to the Files entry in the navigation panel 2011-07-29 18:00:42 +02:00
Robin Appelman 98e78c0599 some tweaks for renaming 2011-07-29 17:51:38 +02:00
Robin Appelman 2781fdeed8 automatically replace svg images with png for browsers that dont support svg 2011-07-29 17:51:38 +02:00
Robin Appelman dee7fb3b72 fix login header for ie 2011-07-29 17:51:38 +02:00
Michael Gapczynski fcc9f50641 Merge branch 'master' into sharing
Conflicts:
	files/templates/index.php
2011-07-29 10:23:15 -04:00
Jan-Christoph Borchardt 46400a8124 message and hint for upload if folder is empty 2011-07-29 13:01:15 +02:00
Jan-Christoph Borchardt 72402ff143 removed some more legacy CSS 2011-07-29 04:24:02 +02:00
Jan-Christoph Borchardt 7e0bbd20c0 revised coloring again 2011-07-29 03:09:30 +02:00
Jan-Christoph Borchardt d23d4e66c5 revised color calculation for size and age 2011-07-29 03:04:25 +02:00
Robin Appelman 18d8f34f96 fix breadcrumb look of Files in navigation panel 2011-07-29 02:54:19 +02:00
Robin Appelman 2d43f6e307 make foldernames also bold after renaming 2011-07-29 02:47:25 +02:00
Robin Appelman 468319fe04 no need for an ok button for creating folders 2011-07-29 02:37:17 +02:00
Jan-Christoph Borchardt 23f051ccd6 redesigned search box 2011-07-29 02:35:21 +02:00
Robin Appelman 3758b0d707 fix size of selected files with new uploaded files 2011-07-29 02:33:58 +02:00
Robin Appelman 952b83cbdc show proper cursor for rename textfield 2011-07-29 02:28:39 +02:00
Michael Gapczynski 67fe835f03 Add a function for removing any duplicate or trailing '/' from the paths 2011-07-28 20:28:22 -04:00
Robin Appelman a7748c14c6 dont need the ok button for renaming 2011-07-29 02:26:32 +02:00
Jan-Christoph Borchardt 224dbed79c narrow modified column, remove help cursor 2011-07-29 02:20:06 +02:00
Robin Appelman 0e76d06358 properly style filenames after renaming 2011-07-29 02:17:40 +02:00
Michael Gapczynski 7e3b796de8 More elegant solution for preparing IN ?s, thanks icewind 2011-07-28 20:05:18 -04:00
Robin Appelman 3a9af23cda always show download icon on hover 2011-07-29 02:02:17 +02:00
Jan-Christoph Borchardt e7a2627189 Merge branch 'interface' 2011-07-29 01:56:45 +02:00
Jan-Christoph Borchardt ebec36f190 better image icon 2011-07-29 01:53:29 +02:00
Jan-Christoph Borchardt 03713ede03 updated ownCloud icon and position 2011-07-29 01:42:15 +02:00
Michael Gapczynski 5bc0619234 Add support for sharing files with user groups 2011-07-28 19:42:02 -04:00
Robin Appelman 6d0c8ea7e4 use proper file icons for image and audio files 2011-07-29 01:37:08 +02:00
Jan-Christoph Borchardt dbcebba882 show media icon in settings as well 2011-07-29 01:33:03 +02:00
Jan-Christoph Borchardt 19d81add3d remove legacy styles 2011-07-29 01:27:02 +02:00
Jan-Christoph Borchardt b88e5ce9a1 added icon to media app 2011-07-29 01:19:09 +02:00
Jan-Christoph Borchardt c15db76aa0 icons for music and images 2011-07-29 01:16:30 +02:00
Robin Appelman 82261e9907 use relative times for new upload files 2011-07-29 01:10:08 +02:00
Jan-Christoph Borchardt f1616b0e62 implemented relative file size and coloring 2011-07-29 00:46:20 +02:00
Robin Appelman c73dd86713 confirmation dialogs for deletions 2011-07-29 00:26:23 +02:00
Robin Appelman 433ad8c3ce add size tooltip for selected files 2011-07-28 23:56:42 +02:00
Robin Appelman 4028178982 fix serveral styling issues on uploaded files 2011-07-28 23:52:49 +02:00
Robin Appelman ab81128e5c dont throw error when the collection scanner cant detect the length of an audio file 2011-07-28 23:34:39 +02:00
Robin Appelman f1c2b5b304 set installed version in config file 2011-07-28 23:34:39 +02:00
Robin Appelman 20f5a9f085 bumb version number for upcomming beta 2011-07-28 23:34:39 +02:00
Jan-Christoph Borchardt 68915f1852 header now blends beautifully into interface 2011-07-28 23:31:02 +02:00
Jan-Christoph Borchardt 9642a43129 correctly display icons and rename box 2011-07-28 23:24:00 +02:00