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

453 commits

Author SHA1 Message Date
Jan-Christoph Borchardt
683e125042 Merge branch 'sharing' 2011-08-17 13:48:36 +02:00
Michael Gapczynski
b7b3a49203 Functions to get the token of a public link now stored by OC_Share, remove no longer needed ajax call to getlink.php 2011-08-16 21:32:51 -04:00
Michael Gapczynski
0edce1796b Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing 2011-08-16 20:21:57 -04:00
Michael Gapczynski
582dca4d91 Initial merging of files_sharing and files_publiclink 2011-08-16 20:21:18 -04:00
Robin Appelman
42ed3c6b7e fix problem with building the IN query 2011-08-17 00:34:02 +02:00
Robin Appelman
9f28c20660 fix collection browsing using the ampache api 2011-08-17 00:07:17 +02:00
Arthur Schiwon
ea65d90a41 really open website after click 2011-08-16 23:50:46 +02:00
Arthur Schiwon
48df7a2a7d gain compatibility with sqlite3 2011-08-16 23:49:53 +02:00
Arthur Schiwon
0573695d05 fix database layout for sqlite3 2011-08-16 21:56:12 +02:00
Jan-Christoph Borchardt
9c3a836044 hiding public links from navigation now that it's easier to use in the dropdown 2011-08-16 18:36:36 +02:00
Michael Gapczynski
717ab56419 Display public icon next to publicly shared files 2011-08-16 12:18:31 -04:00
Michael Gapczynski
726933831d Public link folder uploading not implemented, comment out checkbox for it in dropdown 2011-08-16 12:06:08 -04:00
Robin Appelman
fd74e43afa fix expire header for media player 2011-08-16 14:35:05 +02:00
Jan-Christoph Borchardt
b885bad2ee wording fix for bookmarks 2011-08-16 12:45:44 +02:00
Michael Gapczynski
e4c9871299 This should actually make the 'Shared' directory automatically everytime 2011-08-15 20:45:07 -04:00
Michael Gapczynski
5fbed936bf Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory 2011-08-15 20:33:02 -04:00
Michael Gapczynski
1ec75330ec Merge branch 'master' into sharing 2011-08-15 17:49:36 -04:00
Jan-Christoph Borchardt
82bd2ad310 Merge branch 'master' into calendar 2011-08-15 23:40:03 +02:00
Michael Gapczynski
801e4f8611 Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing 2011-08-15 17:38:33 -04:00
Michael Gapczynski
5b09aef166 Additional user group sharing support and more clean-up in the constructor 2011-08-15 17:37:16 -04:00
Arthur Schiwon
5608aaee8a initial commit of Bookmarks App 2011-08-15 22:05:07 +02:00
Jakob Sack
6096568da9 Small design changes in Contacts 2011-08-14 23:49:09 +02:00
Jakob Sack
39ecef39cd Fix creation of UID in contacts 2011-08-14 23:49:09 +02:00
Jan-Christoph Borchardt
2cb231d0a4 resolved merge conflict 2011-08-14 19:31:38 +02:00
Michael Gapczynski
5cb687d168 Refactor getUserAndGroups() for new user group sharing standard - user@group 2011-08-14 12:16:14 -04:00
Michael Gapczynski
e1473cfe83 Change OC_GROUP to OC_Group 2011-08-14 11:44:37 -04:00
Jan-Christoph Borchardt
7bb261f810 more fixes for Personal and Tipsy 2011-08-14 16:12:31 +02:00
Robin Appelman
970888b92d fix some details in Personal 2011-08-14 15:06:16 +02:00
Jan-Christoph Borchardt
f2a21398d7 more info in personal, WebDAV, OpenID 2011-08-14 11:09:51 +02:00
Robin Appelman
6f37f2917d fix media player controlls not showing 2011-08-13 17:53:31 +02:00
Robin Appelman
ee8e6d5442 DONT always scan the collection, I would like to keep some cpu cycles to actually use my pc 2011-08-13 17:41:34 +02:00
Jan-Christoph Borchardt
595329a8a0 some player styling 2011-08-13 16:34:40 +02:00
Jan-Christoph Borchardt
2ba3793671 updated translations 2011-08-13 12:43:15 +02:00
Jan-Christoph Borchardt
c144976676 start scanning music automatically when in Music 2011-08-13 07:02:51 +02:00
Jan-Christoph Borchardt
ccf410c7b0 first styling for leftcontent 2011-08-13 07:02:25 +02:00
Jan-Christoph Borchardt
3b5f16b23c NEEDS MORE FADING 2011-08-13 06:05:00 +02:00
Jan-Christoph Borchardt
0c903c63d8 first replacement of media player controls with svg 2011-08-13 05:58:11 +02:00
Jan-Christoph Borchardt
7ece8ed314 added global action class for icons 2011-08-13 05:27:50 +02:00
Jan-Christoph Borchardt
4a5ee765cf merged admin, help and settings to settings 2011-08-13 05:13:34 +02:00
Michael Gapczynski
122018889a Merge branch 'master' into sharing 
Conflicts:
	files/css/files.css
 2011-08-12 21:00:41 -04:00
Michael Gapczynski
3c517499bb OC_Share constructor refactored for user group sharing 2011-08-12 20:49:44 -04:00
Robin Appelman
b0b5a46543 style media player controls using em instead of px 2011-08-13 00:23:15 +02:00
Robin Appelman
382834ec2b highlight playing songs in collection 2011-08-13 00:23:15 +02:00
Michael Gapczynski
497789cdd8 Clean up constructor for OC_Share, add some error handling for sharing files 2011-08-12 17:22:32 -04:00
Michael Gapczynski
a8e6be6016 Change the share file action icon if the file is already shared with someone 2011-08-12 11:34:17 -04:00
Georg Ehrke
a61dde9b52 old files deleted 2011-08-12 14:39:24 +02:00
Georg Ehrke
4ae5c4bc33 bug fixes, style fixes 2011-08-12 14:29:45 +02:00
Robin Appelman
5a26640f63 partly fix media player 2011-08-12 12:54:49 +02:00
Michael Gapczynski
4830555cce Merge branch 'master' into sharing 
Conflicts:
	.gitignore
 2011-08-11 17:42:37 -04:00
Michael Gapczynski
9e35d5a886 Remove hardcoded http:// when generating public links 2011-08-11 16:56:09 -04:00
Jan-Christoph Borchardt
ce9b36fd3e some interaction design for user management 2011-08-11 21:00:48 +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
Michael Gapczynski
6d25943f2f Fix some areas on dropdown triggering the dropdown to hide 2011-08-11 12:50:29 -04:00
Michael Gapczynski
0ad0ed77c5 Hide the dropdown if you click the share file action button 2011-08-11 12:03:48 -04:00
Michael Gapczynski
0f91438b80 Don't spawn a new dropdown if there is already one open 2011-08-11 11:52:10 -04:00
Michael Gapczynski
2af0269eb9 Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing 
Conflicts:
	apps/files_sharing/js/share.js
 2011-08-11 11:15:17 -04:00
Michael Gapczynski
103d23b3a3 Refactoring in dropdown javascript 2011-08-11 11:09:14 -04:00
Robin Appelman
26ac7f0f1d get rid of some js errors on the login screen 2011-08-11 16:53:00 +02:00
Frank Karlitschek
c824572b91 fix the getlink calls 2011-08-11 16:15:55 +02:00
Jan-Christoph Borchardt
568fd0df83 changed quotes 2011-08-11 13:53:25 +02:00
Jan-Christoph Borchardt
511c193631 only load share action when in file browser 2011-08-11 13:33:43 +02:00
Jan-Christoph Borchardt
b4e89871dd merged master into sharing 2011-08-11 13:29:22 +02:00
Robin Appelman
c9c1633882 some work on media player 2011-08-11 11:27:20 +02:00
Jakob Sack
414e5e174d merge Georgs calendar 2011-08-11 11:22:07 +02:00
Jakob Sack
4915610b5f Fix creation of UID in contacts 2011-08-11 11:20:12 +02:00
Jan-Christoph Borchardt
8639630a18 polished public links a bit 2011-08-11 11:10:41 +02:00
Jakob Sack
110f96df78 At least dome layout in Contacts 2011-08-11 10:08:02 +02:00
Jakob Sack
5324d6f7df Small fixes 2011-08-10 22:27:55 +02:00
Michael Gapczynski
e1bde1a78e Merge branch 'master' into sharing 
Conflicts:
	files/templates/index.php
 2011-08-10 13:40:47 -04:00
Michael Gapczynski
80660bdc07 Fix shared list for files inside of shared folders 2011-08-10 13:38:58 -04:00
Jakob Sack
c4931cff34 Delete addressbooks of deleted users 2011-08-10 14:28:14 +02:00
Robin Appelman
cdf91b6b3e work in new app management 2011-08-10 14:03:54 +02:00
Robin Appelman
9059b55979 make more strings translatable 2011-08-10 14:03:54 +02:00
Jakob Sack
58ab3883b9 Add description to contacts 2011-08-10 11:32:06 +02:00
Jakob Sack
2b59912b3d Add CardDAV path 2011-08-10 11:19:12 +02:00
Michael Gapczynski
88e338ec23 Only show can edit (if not checked) and unshare button on hover 2011-08-09 17:55:51 -04:00
Jakob Sack
891ac04c19 Remove references to "multiple addressbooks" :-( 2011-08-09 18:05:52 +02:00
Jakob Sack
ce76cece09 Remove warning 2011-08-09 18:00:14 +02:00
Jakob Sack
c6f499c685 Some more fixes. It basically works but looks ugly 2011-08-09 17:42:54 +02:00
Michael Gapczynski
7c840e9bbb Remove users and groups from the select form that have already been shared with 2011-08-09 11:00:14 -04:00
Michael Gapczynski
c654442901 No more subnavigation entries, fixing 'Shared' 2011-08-09 10:45:12 -04:00
Michael Gapczynski
ec6aed8475 Merge branch 'master' into sharing 2011-08-09 10:42:50 -04:00
Michael Gapczynski
cdf2dbcd52 Use chosen select form for selecting users in sharing drop down 2011-08-09 10:34:00 -04:00
Jakob Sack
6d1c266e1e You don't always have parameters in vcards! 2011-08-09 15:00:10 +02:00
Jakob Sack
075db9f7ea Add default addressbook 2011-08-09 14:49:28 +02:00
Jakob Sack
5047b6e385 Fix naming bug 2011-08-09 14:15:11 +02:00
Jakob Sack
76fc062f27 Some more work on the address book 2011-08-09 13:53:58 +02:00
Robin Appelman
7b38e5d7c7 apps can now add their own forms to the Personal page 2011-08-08 23:46:52 +02:00
Jan-Christoph Borchardt
6aaa49d386 more media player fixes 2011-08-08 22:31:17 +02:00
Michael Gapczynski
23c8d7b3fb Show which parent folder is shared with the user in the sharing drop down 2011-08-08 15:49:16 -04: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
8c34ea496a initial work on the media player interface rework 
it looks bad atm bu should work enough to be stylable
 2011-08-08 17:53:03 +02:00
Jan-Christoph Borchardt
968f1282ce Merge branch 'master' into sharing 2011-08-08 13:19:40 +02:00
Jan-Christoph Borchardt
544c61f983 updated public link fix 2011-08-08 13:19:22 +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
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