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

12332 commits

Author SHA1 Message Date
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
Michael Gapczynski
732ad7f6c1 Add support for renaming, moving, and deleting shared files 2011-07-06 15:17:03 -04:00
Michael Gapczynski
cf33995892 Refactor OC_SHARE to allow for renaming and write permissions 2011-07-06 12:12:29 -04:00
Robin Appelman
7362f103ed only use ldap user backend when it is configured 2011-07-06 00:30:57 +02:00
Michael Gapczynski
9deab8302f Fix bugs in getSource() and implement new target path standard 2011-07-05 11:56:02 -04:00
Michael Gapczynski
05389827fd Merge branch 'master' into sharing 
Conflicts:
	.gitignore
	lib/base.php
 2011-07-04 16:36:30 -04:00
Dominik Schmidt
7f0dc638ae Hopefully fix errors if ldap plugin is not configured 2011-07-04 19:05:14 +02:00
Michael Gapczynski
e24e2d0e16 Append LIMIT 1 to getSource queries to improve performance 2011-07-03 11:43:49 -04:00
Michael Gapczynski
b03083b881 Fix check for parentDir and fix the return for a nonexistent target in the database 2011-06-27 18:14:04 -04:00
Michael Gapczynski
053edde780 Improvements to caching for shared folders 2011-06-27 12:53:10 -04:00
Michael Gapczynski
a402c8ffe1 Implement caching for source paths in OC_FILESTORAGE_SHARED 2011-06-27 11:47:36 -04:00
Michael Gapczynski
fe178310f3 Use php functions dirname() and basename() instead of manipulating strings in getSource() 2011-06-26 19:21:24 -04:00
Michael Gapczynski
12c168b6dd Add function setTarget(), implement recursion in getSource() for folders 2011-06-25 22:00:52 -04:00
Michael Gapczynski
78293ea244 Better implementation of getting shared folder size by using the source path 2011-06-24 19:52:35 -04:00
Michael Gapczynski
c8781b1caf Add error handling for getSource() 2011-06-24 19:38:39 -04:00
Michael Gapczynski
e91f42d249 Add support for sharing folders 2011-06-24 19:20:08 -04:00
Robin Appelman
4ac25942de you can now use your owncloud url as openid provider 2011-06-24 22:09:55 +02:00
Robin Appelman
7d2784c4c3 add openid headers to openid request page 2011-06-24 18:02:51 +02:00
Robin Appelman
1aa8399915 show error on openid request page when no user is selected 2011-06-24 17:17:07 +02:00
Kamil Domanski
2772c66259 Merge branch 'master' of git://anongit.kde.org/owncloud 2011-06-24 16:05:48 +02:00
Kamil Domanski
53cb4c16ed add template to openid request page 2011-06-24 00:27:46 +02:00
Dominik Schmidt
735738fe6f user_ldap: close ldap connection in dtor 2011-06-23 23:57:18 +02:00
Dominik Schmidt
5f29f8a831 user_ldap: implement userExists 2011-06-23 23:57:17 +02:00
Dominik Schmidt
d4618d633a user_ldap: use input-type-password for ldap_password 2011-06-23 23:57:17 +02:00
Dominik Schmidt
612f8cb954 user_ldap: add port setting 2011-06-23 23:57:17 +02:00
Dominik Schmidt
c8e57d5460 Add user_ldap plugin 2011-06-23 23:57:17 +02:00
Michael Gapczynski
467778d66f Merge branch 'master' into sharing 2011-06-23 17:54:49 -04:00
Kamil Domanski
6452f5b5cb OpenID now won't load if curl is not available 2011-06-23 18:20:59 +02:00
Robin Appelman
1ce24d892b don't show errors when the login isn't an openid identity 2011-06-23 17:58:27 +02:00
Robin Appelman
bd4aec2c4c Experimental OpenID user backend and server. 
Currently all users can set one OpenID identity that allows access to the account.

The identity url's for the server is owncloud/apps/user_openid/user.php/$username
 2011-06-23 17:08:04 +02:00
Michael Gapczynski
8cbee28416 Better implementation of filesize for shared directory, now storing in oc_foldersize 2011-06-22 21:05:31 -04:00
Michael Gapczynski
87097db4eb Changed self:: and OC_FILESTORAGE_SHARED to -> 2011-06-22 19:47:57 -04:00
Michael Gapczynski
e3ea84d048 Changed ctime for the shared folder to the earliest ctime 2011-06-22 19:17:31 -04:00
Michael Gapczynski
3f5fde50c1 Forgot to remove TODOs for file?time()s 2011-06-22 18:22:48 -04:00
Michael Gapczynski
098fc5ef95 Fixed stat(), file?time()'s now grab most recent time from shared files 2011-06-22 18:16:41 -04:00
Michael Gapczynski
ac0d41418e Correct calculation for shared folder size 2011-06-22 17:55:07 -04:00
Michael Gapczynski
18e776fa2f Changed mount point to 'Share', fixed is_dir() 2011-06-22 11:40:09 -04:00
Robin Appelman
83958ebd4b add oc_user::getUser to get the user id of the loggedin user 2011-06-22 12:50:57 +02:00
Robin Appelman
c0af177223 public link config is also for non admins 2011-06-22 12:40:13 +02:00
Kamil Domanski
a7b7f5a76c app files_publiclink is now translateable 2011-06-20 00:17:49 +02:00
Jakob Sack
14dddc0c9e forgot "event" as a parameter. 2011-06-19 14:23:24 +02:00
Kamil Domanski
97ab331b2a change db index names to avoid collisions 2011-06-18 23:57:03 +02:00
Michael Gapczynski
4e7d1c376f OC_FILESTOAGE_SHARED now works with hard coded values for files 2011-06-18 13:49:52 -04:00
Michael Gapczynski
69b5e01be1 OC_FILESTOAGE_SHARED updates + its own getInternalPath() 2011-06-18 13:29:16 -04:00
Michael Gapczynski
e6621b9c78 Added source and target to database fields 2011-06-16 15:54:25 -04:00
Michael Gapczynski
fe4a213e1b Fixed mistakes pointed out by icewind 2011-06-16 14:59:54 -04:00
Michael Gapczynski
bf66563cda First version of shared storage provider - not functional 2011-06-16 14:40:21 -04:00
Michael Gapczynski
8603b0973f Initial setup of sharing app 2011-06-11 16:14:24 -04:00
Alessandro Cosentino
86dd023448 Adding clear logs functions 2011-06-07 15:48:21 -04:00
Robin Appelman
bc0790381e fix loading of image viewer again 2011-06-04 23:14:33 +02:00
Robin Appelman
277e644558 only load image viewer when in file browser 2011-06-04 23:08:38 +02:00
Robin Appelman
b0476bf174 fix imageviewer again 2011-06-04 22:41:17 +02:00
Robin Appelman
dab656007d fix imageviewer not showing up when using the actions menu 2011-06-04 22:21:16 +02:00
Robin Appelman
e5816451c8 always show the image in the middle of the screen, regardless of scrolling 2011-06-04 22:20:57 +02:00
Robin Appelman
4b9665a952 image viewer plugin 2011-06-04 20:48:53 +02:00
Robin Appelman
da2c9aa807 fix broken links in shared folders 2011-06-02 03:00:20 +02:00
Robin Appelman
8c5a06028a port sharing by publiclink fully to the 2.0 codebase and provide a simple gui for it 2011-06-02 02:46:50 +02:00
Jakob Sack
f36f453dd2 apps are now stored in /apps 2011-04-16 09:46:58 +02:00