Commit graph

979 commits

Author SHA1 Message Date
Robin Appelman
556bf2ef4d fix broken merge 2011-07-27 16:57:49 +02:00
Robin Appelman
0dad1f8ccb merge master into interface 2011-07-27 16:42:58 +02:00
Robin Appelman
606dec8da0 some minor changes in the javascript translation function
also provide Array.prototype.indexOf for browser that don't support it nativale (IE)
2011-07-27 16:40:26 +02:00
Robin Appelman
6585e83037 fix flash fallback for media player and bumb version of jplayer to 2.0.23 2011-07-27 16:40:26 +02:00
Jan-Christoph Borchardt
7e11bf280d updated localization script and removed duplicate strings 2011-07-27 12:05:41 +02:00
Jan-Christoph Borchardt
59e55b711b updated localization files again 2011-07-27 08:55:32 +02:00
Robin Appelman
344b7f548b only show songs for which the current user has songs indexed 2011-07-26 22:21:28 +02:00
Robin Appelman
d6d38ac3fa only load image viewer when in the file browser 2011-07-26 21:18:13 +02:00
Robin Appelman
00da23faf6 no longer show deleted files as selected 2011-07-26 17:00:29 +02:00
Robin Appelman
633d7826c9 remove debug alert 2011-07-26 16:59:16 +02:00
Robin Appelman
be45ad904e remove debug alert 2011-07-26 16:58:46 +02:00
Robin Appelman
ede0cc1cfa Merge branch 'master' into interface 2011-07-26 16:56:01 +02:00
Robin Appelman
7b02adf715 fix sorting on newly inserted items in the file list 2011-07-26 16:55:28 +02:00
Robin Appelman
48fe201dd5 fit player controls in smaller header 2011-07-26 16:43:41 +02:00
Robin Appelman
b0f166fc83 some javascript changes 2011-07-26 16:43:12 +02:00
Robin Appelman
543bdb8ccd merge master into interface 2011-07-26 16:16:47 +02:00
Robin Appelman
0e05a86484 some refactoring of the media player code 2011-07-26 16:05:24 +02:00
Jan-Christoph Borchardt
243199859b updated localization files 2011-07-26 01:00:49 +02:00
Robin Appelman
6a9a62b7d2 remove some dummy code 2011-07-25 23:21:07 +02:00
Robin Appelman
98cd83fabd bumb jquery and jquery-ui versions 2011-07-25 23:16:05 +02:00
Robin Appelman
ac0c33209d add js versions of linkTo, imagePath,addScript and addStyle 2011-07-25 22:30:55 +02:00
Robin Appelman
e03340b04d add getSelectedFiles() to files.js 2011-07-25 20:25:53 +02:00
Robin Appelman
edec37b402 add OC_APP::getCurrentApp() to get the id of the active app 2011-07-25 20:25:53 +02:00
Robin Appelman
a471d40cc8 Show installed apps as default for the apps entry on the settings page.
Installing new apps is moved to the subentry
2011-07-25 20:25:52 +02:00
Robin Appelman
9a989a284a fix sabredav for sqlite2 2011-07-25 03:14:22 +02:00
Robin Appelman
de7c110225 Merge branch 'master' into interface 2011-07-23 18:44:29 +02:00
Jakob Sack
3097e4f48a Merge branch 'sabredav' 2011-07-22 23:18:08 +02:00
Jakob Sack
ccc94819e2 Merge branch 'sabredav' of git://anongit.kde.org/owncloud into sabredav 2011-07-22 23:16:43 +02:00
Jakob Sack
5416c0e6f8 Remove HTTP_Webdav 2011-07-22 23:16:14 +02:00
Robin Appelman
18a36be28c fix problem with removing locks 2011-07-22 23:06:53 +02:00
Jakob Sack
0fa41e9171 Update docs, db scheme 2011-07-22 22:47:44 +02:00
Jakob Sack
3b92ec12c2 Properties work fine now 2011-07-22 22:30:45 +02:00
Robin Appelman
41a2da234a remove some debug output and supress some possible errors 2011-07-22 19:37:25 +02:00
Robin Appelman
ceb711dff4 some work on the breadcrumb navigation for files 2011-07-22 16:52:35 +02:00
Jakob Sack
5851da47f1 properties nearly work 2011-07-22 16:21:29 +02:00
Robin Appelman
d6bf5cd251 show error when trying to upload to large files 2011-07-22 15:48:30 +02:00
Jakob Sack
7c9f356abe Support for locks, minor changes 2011-07-22 14:38:42 +02:00
Robin Appelman
e6e14719c9 Merge branch 'master' into interface 2011-07-22 00:47:35 +02:00
Robin Appelman
9d1c5c855b fix warning if no username is set in the cookie 2011-07-22 00:47:20 +02:00
Robin Appelman
9be2dc8290 show fixed filecontrols over the filelist that can scroll underneath it 2011-07-22 00:43:35 +02:00
Robin Appelman
9950f06c59 Merge branch 'master' into interface 2011-07-22 00:28:17 +02:00
Robin Appelman
828a26c69e dont load some javascript files multiply times 2011-07-22 00:24:25 +02:00
Robin Appelman
d9a79c0f7e show fileactions inline on hover 2011-07-22 00:18:41 +02:00
Robin Appelman
101c6d151e fix resizing images in image viewer 2011-07-21 23:30:00 +02:00
Robin Appelman
38f1cffab3 import media app 2011-07-22 06:30:52 +02:00
Robin Appelman
f441059b01 add getLocalFile to local storage provider 2011-07-22 06:29:45 +02:00
Robin Appelman
4ff2dc3035 finally the missing file for moving files from the web interface 2011-07-22 06:21:53 +02:00
Robin Appelman
aa335f57d6 only show actions for selected file if there are selected files 2011-07-21 23:28:13 +02:00
Robin Appelman
bc40532109 give the file sizes some more space 2011-07-21 23:28:13 +02:00
Robin Appelman
0accf2d647 Merge branch 'master' into interface 2011-07-22 06:32:30 +02:00