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
|
b1a369b49f
|
quick fix for public links, removed expiration date and styled correctly
|
2011-08-08 11:17:03 +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 |
|
Michael Gapczynski
|
5d521d7c7c
|
Sharing dropdown changes: show users that have a parent folder shared with them and add the ability to change permissions
|
2011-08-07 15:20:57 -04:00 |
Jakob Sack
|
5e2f7bfda9
|
Small details in contacts
|
2011-08-06 23:29:25 +02:00 |
|
Jakob Sack
|
77fccc9d00
|
TEMPORARY update path for carddav testers
|
2011-08-06 23:09:55 +02:00 |
|
Jakob Sack
|
42a6549729
|
Database.xml
|
2011-08-06 23:09:38 +02:00 |
|
Jakob Sack
|
2f10598af6
|
New app: contacts
|
2011-08-06 22:32:06 +02:00 |
Robin Appelman
|
f039320a0b
|
move openid settings to Personal
|
2011-08-06 10:08:26 +02:00 |
|
Robin Appelman
|
c998bc1215
|
fix some issues with browsers not supporting html5 localStorage
|
2011-08-06 10:08:26 +02:00 |
|
Michael Gapczynski
|
843f8aca7c
|
Full support for making and deleting public links from share dropdown
|
2011-08-05 11:18:35 -04:00 |
|
Robin Appelman
|
60a7a9d6f0
|
allow users to use myhost/owncloud/?myusername as openid identity
|
2011-08-04 18:49:29 +02:00 |
|
Robin Appelman
|
122c3a3cf8
|
dont show confusing 'X files scanned' message when we are not scanning files
|
2011-08-04 01:26:29 +02:00 |
|
Robin Appelman
|
93b342ee39
|
only load the music player outside the media app if the media app isnt already open in another tab
|
2011-08-04 01:19:21 +02:00 |
|
Michael Gapczynski
|
8f01abf054
|
Share dropdown updates, making public links now works
|
2011-08-03 15:21:53 -04:00 |
|
Robin Appelman
|
4851a55c1d
|
cache the collection for the media player again
|
2011-08-03 15:36:47 +02:00 |
|
Robin Appelman
|
de0e16a6f3
|
fix a bug in the media player outside the media app
|
2011-08-03 14:26:37 +02:00 |
|
Robin Appelman
|
8e5184a8b9
|
correctly save the playlist if songs are removed and dont load the player outisde the media app if the playlist is empty
|
2011-08-03 14:23:35 +02:00 |
|
Jan-Christoph Borchardt
|
c79af7cc4f
|
removed icon for public links navigation subentry
|
2011-08-03 04:44:17 +02:00 |
|
Robin Appelman
|
fdb944e7a3
|
send the filename header for public links
|
2011-08-03 02:29:33 +02:00 |
|
Robin Appelman
|
6527048164
|
dont force a download for public links
|
2011-08-03 01:06:25 +02:00 |
|
Robin Appelman
|
a2062036d3
|
selecting a text file from the search results now activates the text viewer
|
2011-08-03 00:30:21 +02:00 |
|
Robin Appelman
|
ad51328408
|
some fixes for the textviewer already
|
2011-08-03 00:01:31 +02:00 |
|
Robin Appelman
|
dd5cc8dcaf
|
add textviewer plugin
|
2011-08-02 23:56:53 +02:00 |
|
Michael Gapczynski
|
96ab35a331
|
Animate appearance of share drop down
|
2011-08-02 15:23:17 -04: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 |
|
Michael Gapczynski
|
0d79560e94
|
New implementation of share dialog
|
2011-08-02 12:19:49 -04:00 |
|
Robin Appelman
|
957b9e8b84
|
send last modified header for media
|
2011-08-02 17:02:27 +02:00 |
|
Robin Appelman
|
900adb35d8
|
make the progres bar for scanning always go to the full 100%
|
2011-08-02 04:43:08 +02:00 |
|
Robin Appelman
|
02ebc4879a
|
rename media to music in the navigation
|
2011-08-02 04:27:11 +02:00 |
|
Robin Appelman
|
c0e7cf2e40
|
remove now useless 'media' entry from settings
|
2011-08-02 04:26:32 +02:00 |
|
Robin Appelman
|
c814f10d7f
|
fix media sub navigation entries
|
2011-08-02 04:14:54 +02:00 |
|
Robin Appelman
|
9f981de854
|
fance collection scanning wip
|
2011-08-01 23:55:47 +02:00 |
|
Michael Gapczynski
|
ddfc9fc001
|
Move registering shared storage out of base
|
2011-08-01 10:58:15 -04:00 |
|
Robin Appelman
|
29239d6638
|
remember volume and playback time in the media player
|
2011-08-01 16:43:02 +02:00 |
|
Robin Appelman
|
30ce4e5b6b
|
properly save play/pause state of media player
|
2011-08-01 16:20:15 +02:00 |
|
Michael Gapczynski
|
57ca70e27c
|
Add support for assigning permissions in share dialog and switch to post
|
2011-07-31 20:47:53 -04:00 |
|
Robin Appelman
|
ef22498c6f
|
some fixes for persistent playlists
|
2011-08-01 01:59:57 +02:00 |
|
Robin Appelman
|
9b764cb7f4
|
show names of next/previous song when you hover the next/previous button
|
2011-08-01 01:25:34 +02:00 |
|
Robin Appelman
|
28a64bc2f8
|
fix an isue with persitent playlists inside the media player app
|
2011-08-01 01:21:50 +02:00 |
|
Robin Appelman
|
1933426e3e
|
make the persitent playlist work anywhere
|
2011-08-01 01:20:00 +02:00 |
|
Robin Appelman
|
e1596cc65a
|
fix bug in saving currently played song
|
2011-08-01 01:17:54 +02:00 |
|
Robin Appelman
|
76a2f5b547
|
persistent playlist for the media player
|
2011-08-01 01:12:28 +02:00 |
|
Robin Appelman
|
cbf8f822de
|
automatically scan songs that are played from the filebrowser
|
2011-08-01 00:32:44 +02:00 |
|
Robin Appelman
|
f88b477459
|
fix search results not displaying
|
2011-08-01 00:25:53 +02:00 |
|
Robin Appelman
|
bd6b38e638
|
cache the media collection between page loads
|
2011-08-01 00:18:09 +02:00 |
|
Robin Appelman
|
2d19965750
|
some improvements to collection scanning
|
2011-08-01 00:07:46 +02:00 |
|
Michael Gapczynski
|
a14a83b9c6
|
Fix delTree(), it shouldn't be passed to the local storage provider unless the user has delete permission
|
2011-07-31 15:02:59 -04:00 |
|
Michael Gapczynski
|
c185743ae9
|
Update the folder sizes for shared folders
|
2011-07-31 14:48:23 -04:00 |
|
Robin Appelman
|
6e2ce76223
|
use db transitions for collection scanner
|
2011-07-31 20:25:13 +02:00 |
|
Robin Appelman
|
aff8bc62d2
|
some improvements in oc_media_collections
|
2011-07-31 20:24:27 +02:00 |
|
Michael Gapczynski
|
f88c4b1f48
|
Human readable permissions in shared files list
|
2011-07-31 13:15:07 -04:00 |
|
Michael Gapczynski
|
17058c9467
|
Merge branch 'master' into sharing
|
2011-07-31 12:53:34 -04:00 |
|
Robin Appelman
|
eb3526c9a6
|
show images on click in search results
|
2011-07-31 02:35:54 +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 |
|
Robin Appelman
|
3a08f747fb
|
more tweaks for media search results
|
2011-07-31 01:39:25 +02:00 |
|
Robin Appelman
|
0b44db954f
|
dont show play and add-to-playlist at the same time
|
2011-07-31 01:25:33 +02:00 |
|
Robin Appelman
|
e6821e9d7c
|
Show play and add-to-playlist buttons in instant search results
for now this only works from inside the media app
|
2011-07-31 00:50:04 +02:00 |
|
Robin Appelman
|
18949aaa0b
|
move public links to a subentry of files
|
2011-07-30 22:22:57 +02:00 |
|
Michael Gapczynski
|
d13ba0ee2d
|
Revise permissions system to support read, write, and delete
|
2011-07-30 16:03:32 -04:00 |
|
Jan-Christoph Borchardt
|
09e05d14a0
|
im in ur branch, fixin teh details
|
2011-07-30 14:40:10 +02:00 |
|
Jakob Sack
|
924cd17f2e
|
Icewind destroyed my changes :-(
|
2011-07-30 08:56:08 +02:00 |
|
Robin Appelman
|
51e00d074c
|
add play button to collection overview to add songs to the playlist and play them imediatly
|
2011-07-30 04:15:09 +02:00 |
|
Robin Appelman
|
eee2a2266d
|
disable unimplemented subentries for media player
|
2011-07-30 03:25:15 +02:00 |
|
Robin Appelman
|
773d23bbd5
|
open the correct subpage when the media player loads
|
2011-07-30 00:32:09 +02:00 |
|
Robin Appelman
|
93dd1c57cc
|
update playcount correctly without having to reload the collection
|
2011-07-30 00:21:24 +02:00 |
|
Robin Appelman
|
aa7c6f057b
|
fix issue with selecting songs in playlist
|
2011-07-30 00:05:44 +02:00 |
|
Robin Appelman
|
94e25ecb0c
|
Some much needed interface work on the media player
|
2011-07-29 23:55:54 +02:00 |
|
Michael Gapczynski
|
f0c1f38f98
|
Add share action for mutliple selected files
|
2011-07-29 15:43:29 -04:00 |
|
Jakob Sack
|
bafd684eb6
|
Renaming classes :-)
|
2011-07-29 21:36:03 +02:00 |
|
Jakob Sack
|
2ff8d7a8bc
|
One class per file!
|
2011-07-29 21:03:53 +02:00 |
|
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
|
45222f34a6
|
Make 'Share' a subnavigation entry of of 'Files'
|
2011-07-29 12:20:01 -04:00 |
|
Michael Gapczynski
|
1fc41a7bfc
|
Integrate sharing app with the new interface
|
2011-07-29 12:11:53 -04: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
|
72402ff143
|
removed some more legacy CSS
|
2011-07-29 04:24:02 +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 |
|
Michael Gapczynski
|
7e3b796de8
|
More elegant solution for preparing IN ?s, thanks icewind
|
2011-07-28 20:05:18 -04:00 |
|
Michael Gapczynski
|
5bc0619234
|
Add support for sharing files with user groups
|
2011-07-28 19:42:02 -04:00 |
|
Jan-Christoph Borchardt
|
dbcebba882
|
show media icon in settings as well
|
2011-07-29 01:33:03 +02:00 |
|
Jan-Christoph Borchardt
|
b88e5ce9a1
|
added icon to media app
|
2011-07-29 01:19:09 +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 |
|
Jan-Christoph Borchardt
|
ba246d3b27
|
Merge branch 'master' into interface
|
2011-07-28 22:20:34 +02:00 |
|
Michael Gapczynski
|
31a067b5a3
|
Add support for sharing multiple files from share dialog, move loops outside of OC_SHARE
|
2011-07-28 15:31:52 -04:00 |
|
Robin Appelman
|
bc51425bb7
|
keep track of playcount as last played time of music files
|
2011-07-28 20:59:36 +02:00 |
|
Robin Appelman
|
aa33812104
|
hopefully fix some issues with the openid server
|
2011-07-28 20:12:07 +02:00 |
|
Robin Appelman
|
0d408fe6f5
|
make use of the command line tools id3info and mp3info for scanning music if they are available
|
2011-07-28 20:10:58 +02:00 |
|
Robin Appelman
|
ece6bd663c
|
show icons instead of text for file actions
|
2011-07-28 04:29:04 +02:00 |
|
Michael Gapczynski
|
d36850f0f2
|
Close sharing dialog box on share success
|
2011-07-27 19:52:10 -04:00 |
|
Michael Gapczynski
|
64b5332f33
|
Make file sharing dialog work - only works for one file/folder and user
|
2011-07-27 19:25:33 -04:00 |
|
Jakob Sack
|
2f807a3c7f
|
Delete requires in applications where possible
|
2011-07-27 19:25:49 +02:00 |
|
Robin Appelman
|
0dad1f8ccb
|
merge master into interface
|
2011-07-27 16:42:58 +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 |
|
Michael Gapczynski
|
ff3140052a
|
Merge branch 'master' into sharing
|
2011-07-26 21:29:44 -04:00 |
|
Michael Gapczynski
|
1ec0b6ecc1
|
jQuery dialog for sharing files from within file browser - Not functional yet
|
2011-07-26 21:27:40 -04: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
|
48fe201dd5
|
fit player controls in smaller header
|
2011-07-26 16:43:41 +02:00 |
|
Robin Appelman
|
0e05a86484
|
some refactoring of the media player code
|
2011-07-26 16:05:24 +02:00 |
|
Michael Gapczynski
|
415ae8e40a
|
Merge branch 'master' into sharing
|
2011-07-24 16:08:39 -04:00 |
|
Michael Gapczynski
|
5148eb9121
|
Include groups in user autocomplete
|
2011-07-24 16:07:39 -04:00 |
|
Michael Gapczynski
|
4282a42b3f
|
Add support for user autocomplete
|
2011-07-24 15:47:37 -04:00 |
|
Michael Gapczynski
|
17b5bcb24f
|
Bug fixes for unshare() and opendir(), thanks darkh
|
2011-07-24 14:38:01 -04:00 |
|
Michael Gapczynski
|
4993fb4665
|
Filter out files you unshare from yourself in opendir()
|
2011-07-23 14:41:01 -04:00 |
|
Michael Gapczynski
|
e6e673d7c0
|
Use SUBSTR instead of LIKE in queries, should now work with SQLite
|
2011-07-22 20:41:16 -04:00 |
|
Robin Appelman
|
41a2da234a
|
remove some debug output and supress some possible errors
|
2011-07-22 19:37:25 +02:00 |
|
Michael Gapczynski
|
0387cc5f1f
|
Merge branch 'master' into sharing
|
2011-07-21 19:18:26 -04: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 |
|
Michael Gapczynski
|
302527c2d6
|
Remove shared items check, it prevents sharing items if there aren't already any.
|
2011-07-21 14:53:51 -04:00 |
|
Michael Gapczynski
|
4abefde290
|
Remove admin page, administration is not needed at this time for sharing
|
2011-07-20 16:54:06 -04:00 |
|
Michael Gapczynski
|
6af4c465b8
|
Change all occurences of ['user_id'] to OC_USER::getUser()
|
2011-07-20 16:52:01 -04:00 |
|
Michael Gapczynski
|
fcda3a338c
|
Fix bug in constructor for appending numbers to already existing targets
|
2011-07-20 16:41:39 -04:00 |
|
Michael Gapczynski
|
3e6037659e
|
Change permissions to is_writeable
|
2011-07-20 15:42:49 -04:00 |
|
Michael Gapczynski
|
22f8415045
|
Remove accidental kate swap file
|
2011-07-20 14:46:01 -04:00 |
|
Michael Gapczynski
|
1cfa911ce3
|
Update database.xml to current database fields, remove hard coded MTGap when mounting shared storage provider
|
2011-07-20 14:42:48 -04:00 |
|
Michael Gapczynski
|
abf6ba621a
|
Merge branch 'master' into sharing
|
2011-07-20 14:30:19 -04:00 |
|
Michael Gapczynski
|
c9082d5b0d
|
Append number to name if target file already exists
|
2011-07-20 14:16:20 -04:00 |
|
Michael Gapczynski
|
029b21bf54
|
First implementation of sharing user interface
|
2011-07-20 13:34:16 -04:00 |
|
Robin Appelman
|
6230001a3c
|
show expire dates of public links as date and not as datetime
|
2011-07-20 00:55:47 +02:00 |
|
Robin Appelman
|
9bc3991c23
|
serveral small fixes to the openid server
|
2011-07-20 00:53:55 +02:00 |
|
Michael Gapczynski
|
61837428ba
|
Add post_delete and post_rename hooks and fix the constructor
|
2011-07-18 16:36:34 -04:00 |
|
Robin Appelman
|
24e81ce4d5
|
fix some ldap errors
|
2011-07-18 18:50:21 +02:00 |
|
Robin Appelman
|
f4121339af
|
Fix expiring of public links
|
2011-07-17 17:41:46 +02:00 |
|
Michael Gapczynski
|
1a6718c979
|
Add extra check for opendir() so it only adds the file to fakedirs if it has a different name than the source
|
2011-07-16 15:15:18 -04:00 |
|
Michael Gapczynski
|
f3f8a96c6d
|
Add return true to unlink() and rename(), a return is expected by OC_FILESYSTEM
|
2011-07-16 14:58:12 -04:00 |
|
Michael Gapczynski
|
5aaacf3241
|
Fix bug in rename() so files in a folder that is in a shared folder also get their targets updated
|
2011-07-16 14:29:22 -04:00 |
|
Michael Gapczynski
|
dbcb35655e
|
Fix bugs in opendir() and add extra checks to ensure functionality in all cases
|
2011-07-16 14:24:59 -04:00 |
|
Michael Gapczynski
|
8ad4a44171
|
Fix bugs in unlink(), rename(), pullOutOfFolders(), and getItemsInFolder()
|
2011-07-16 13:06:59 -04:00 |
|
Michael Gapczynski
|
8ed0223bd6
|
Add pullOutOfFolder() function for use by unlink() and rename()
|
2011-07-14 21:04:09 -04:00 |
|
Michael Gapczynski
|
7920e706ea
|
Refactoring of OC_SHARE, added more documentation for functions
|
2011-07-14 19:24:48 -04:00 |
|
Michael Gapczynski
|
2fb1481613
|
Bug fix for setTarget() - append fetchAll() to query
|
2011-07-14 12:40:12 -04:00 |
|
Michael Gapczynski
|
24e24f1b65
|
Add support for copying files between shared folders, add check to fromTmpFile() to confirm path is writeable
|
2011-07-13 15:27:16 -04:00 |
|
Michael Gapczynski
|
d393ccfe2c
|
Fix bug in getSource(), return false if target isn't in database
|
2011-07-12 20:18:08 -04:00 |
|
Michael Gapczynski
|
b2b7d99302
|
Add checks in opendir() to prevent including the current directory or parent
|
2011-07-12 18:22:59 -04:00 |
|
Michael Gapczynski
|
6b303ee64b
|
Fix bug in opendir() and remove getStorageMountPoint(), now using datadir argument instead
|
2011-07-12 13:10:29 -04:00 |
|
Michael Gapczynski
|
163c490c92
|
Remove duplicate '/' from target when searching for source
|
2011-07-10 14:41:27 -04:00 |
|
Michael Gapczynski
|
010920ad08
|
Add support for files inside of shared folders having different names than the source file
|
2011-07-08 18:21:20 -04:00 |
|
Michael Gapczynski
|
73bab46758
|
Prevent searching for user directory in getParentFolders()
|
2011-07-08 15:23:41 -04:00 |
|
Michael Gapczynski
|
f1cac00396
|
Add wildcard to source for database query in unshare()
|
2011-07-08 15:03:05 -04:00 |
|
Michael Gapczynski
|
d91d2178b8
|
Fix unshare() to remove database entries of files within a shared folder
|
2011-07-08 14:58:35 -04:00 |
|
Michael Gapczynski
|
35d6051e9d
|
Fix bug in mkdir(), was passing the wrong path
|
2011-07-07 19:26:25 -04:00 |
|
Michael Gapczynski
|
b7c45ba240
|
mkdir() now checks isWriteable() to see if it has permission, rmdir unshares the folder from the user
|
2011-07-07 19:22:23 -04:00 |
|
Michael Gapczynski
|
58e8312b1c
|
Fix setIsWriteable() and setTarget()
|
2011-07-07 18:25:34 -04:00 |
|
Michael Gapczynski
|
5e560e9bd9
|
Merge branch 'master' into sharing
|
2011-07-06 20:19:44 -04:00 |
|
Michael Gapczynski
|
2212b5b5d7
|
Add wildcard to database query in unshareFromSelf()
|
2011-07-06 20:16:29 -04:00 |
|
Michael Gapczynski
|
2908145b94
|
Fix bug in is_writeable(), was passing the wrong path
|
2011-07-06 15:28:50 -04:00 |