mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,116 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

727 Commits

Author SHA1 Message Date
Bart Visscher cfb932b073 Add simple popup to event 
There is not a lot of infomation to display, yet.
 2011-09-03 22:15:24 +02:00
Bart Visscher 3130234640 Remove execute permissions from source files 2011-09-03 22:15:23 +02:00
Bart Visscher 2e2bdb449f Update calendar event label creation 2011-09-03 22:15:23 +02:00
Jan-Christoph Borchardt 1bf215cd08 updated translations 2011-09-03 15:08:58 +02:00
Bart Visscher afb07d3e39 Use css class for view selection radio buttons hilighting 2011-09-02 23:51:18 +02:00
Bart Visscher 208852abf2 Fix event creation date in oneweekview 2011-09-02 23:50:51 +02:00
Bart Visscher d33a5ea5d4 Use css classes to find elements, reduces the html size 2011-09-02 23:28:35 +02:00
Bart Visscher 6155c758be Cleanup javascript in calendar template 2011-09-02 23:04:02 +02:00
Georg Ehrke 6eff001ebb another bugfix in new design of calendar 2011-09-02 21:29:59 +02:00
Georg Ehrke 1940bc3dc0 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-02 15:49:43 +02:00
Georg Ehrke e89d622c3a bug fixes in new design of calendar 2011-09-02 15:49:03 +02:00
Michiel@unhosted e798c32375 renaming core_unhosted app to just unhosted, and cleaning up unused files in it 2011-09-02 15:25:04 +02:00
Michiel@unhosted 71205b8b07 adding core_unhosted app 2011-09-02 14:56:40 +02:00
Georg Ehrke 8cdd9ab81b export function and style fixes in calendar 2011-09-02 12:55:56 +02:00
Bart Visscher 62cca8264f Refactor calendar loadEvents and updateView use 2011-09-01 23:27:00 +02:00
Bart Visscher 804af7f189 Move generate_dates function to Class/Object 2011-09-01 23:23:57 +02:00
Bart Visscher b7e9e7e777 Simplify forward_day and backward_day 2011-09-01 22:29:57 +02:00
Bart Visscher e765e7e9e8 Changing the active state of the calendar reloads the events. 
Change from Georg Ehrke
 2011-09-01 22:00:14 +02:00
Bart Visscher 1bb754299a Change calendar js rendering to class/object 2011-09-01 22:00:14 +02:00
Bart Visscher 3d2b4b03af Convert plain javascript to jQuery for readability 2011-09-01 22:00:13 +02:00
Caio Marcelo de Oliveira Filho 578d1de55d Fix OC_USER_LDAP::checkPassword() to return the username 
REVIEW: 102487
 2011-09-01 13:56:30 -03:00
Côme BERNIGAUD b579c812b2 Some commented code was still here 2011-09-01 18:33:19 +02:00
Côme BERNIGAUD 31a094becb Buttons for play/add albums works. Folding albums too. 2011-09-01 18:31:44 +02:00
Georg Ehrke 0c07312ad8 add some categories in calendar 2011-09-01 18:35:32 +02:00
Jakob Sack 6fa9be73f8 calendar_calendars.components needs to be longer, adjustments in info.xml 2011-09-01 17:27:12 +02:00
Georg Ehrke 8cbe66b5c1 bug fixes at new event form (categorie and calendar) 2011-09-01 16:54:25 +02:00
Georg Ehrke 58129f9a11 Merge branch 'calendar' of git://gitorious.org/owncloud-dump/owncloud-dump 2011-09-01 16:15:48 +02:00
Côme BERNIGAUD 3972774a2e Removed db4app and test_db 2011-09-01 15:58:47 +02:00
Bart Visscher a7496b1c9d Create function getnumberofdays to get a list of month lengths 2011-08-31 21:24:08 +02:00
Bart Visscher b0ce1ded97 Move date functions to class structure 2011-08-31 21:24:08 +02:00
Georg Ehrke 361861295f reload page after add event successfully 2011-08-31 20:41:18 +02:00
Georg Ehrke 5678d78d54 new changes (e.g. show events) by Bart Visscher 2011-08-31 20:20:46 +02:00
Georg Ehrke 9a60313c3b commit changes of Bart Visscher, see http://gitorious.org/owncloud-dump/owncloud-dump/commits/calendar 2011-08-31 17:29:38 +02:00
Jan-Christoph Borchardt f758d223a2 Merge branch 'calendar' of git://anongit.kde.org/owncloud into calendar 2011-08-30 21:01:10 +02:00
Georg Ehrke 6ad64c6f8a Timezone bug fixed 2011-08-29 13:41:19 +02:00
Jan-Christoph Borchardt 60a5581071 Merge branch 'master' into calendar 2011-08-28 23:38:24 +02:00
Robin Appelman 281b2187ab fix detection of empty collection 2011-08-28 23:20:08 +02:00
Georg Ehrke 947216942a Merge branch 'calendar' of git.kde.org:owncloud into calendar 2011-08-28 20:16:40 +02:00
Georg Ehrke ca08ccb61c first add event function in calendar app 2011-08-28 20:13:40 +02:00
Robin Appelman d5c73c6d4a always scan new music files 2011-08-28 19:32:52 +02:00
Sascha Schneider 04eebccc39 apps/user_ldap/user_ldap.php: - Add support for ldapv3 and tls 2011-08-28 12:56:04 +02:00
Jan-Christoph Borchardt 0054197d02 updated translations 2011-08-28 01:14:32 +02:00
Côme BERNIGAUD 52ca447efc Merge branch 'master' of git.kde.org:owncloud 2011-08-27 18:11:32 +02:00
Côme BERNIGAUD e8fa2d3442 Added db4app lib, and apps test_db that shows how it works. 
Also fixed a typo in db.php
 2011-08-27 18:09:14 +02:00
Jan-Christoph Borchardt f8fc8eb430 no alert popups, ever. They are just dismissed. Use undo instead. 2011-08-27 16:54:20 +02:00
Côme BERNIGAUD 56399d1d79 Play and add buttons in the collection. 2011-08-25 20:57:17 +02:00
Côme BERNIGAUD ce1d13c9b6 playlist working 2011-08-25 20:37:51 +02:00
Côme BERNIGAUD ad053d504c Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-25 17:03:56 +02:00
Arthur Schiwon e6bdd25667 fix: links with parameters get cut off at & 2011-08-25 13:51:48 +02:00
Arthur Schiwon 0972606072 fix: URLs without protocol are now linked to via HTTP 2011-08-25 13:23:52 +02:00
Arthur Schiwon e0a69bbeac Make bookmarks sortable by clicks 2011-08-25 12:55:13 +02:00
Arthur Schiwon 55a8ee34bd Make appeareance of the bookmarklet a bit nicer, still room for improvement left 2011-08-25 12:15:03 +02:00
Côme BERNIGAUD df560b3d9d Merge branch 'master' of git://anongit.kde.org/owncloud 
Conflicts:
	apps/media/js/collection.js
 2011-08-25 09:07:02 +02:00
Côme BERNIGAUD 3fbc8973ee My own version of music collection. 2011-08-25 09:04:08 +02:00
Michael Gapczynski 8c8490b28e Show users shared with in the drop down for reshared files 2011-08-24 18:41:36 -04:00
Robin Appelman e0ff57e8c2 fix javascript error in media player 2011-08-24 23:38:39 +02:00
Arthur Schiwon 7cd592e055 Added a Bookmarklet for the Bookmarks app 2011-08-24 22:16:44 +02:00
Michael Gapczynski 365c4fdae2 Allow sharing of files shared with you - Bug: Doesn't show up as being shared in the drop down 2011-08-24 12:32:02 -04:00
Michael Gapczynski 4c4b1e4c2d Clear the folder size cache for the 'Shared' folder when a new item is shared 2011-08-24 11:59:03 -04:00
Arthur Schiwon 4028dc984a Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-24 14:36:16 +02:00
Arthur Schiwon 0f3ef8aeb0 check if tag is set, might not show bookmarks on some systems without doing so 2011-08-24 14:36:03 +02:00
Jakob Sack f4c498edba Full path for carddav path 2011-08-24 11:21:27 +02:00
Jakob Sack 112eccfe33 Support for etags in calendar 2011-08-24 10:19:48 +02:00
Jakob Sack c87cee6b1f Add VJOURNAL to objects that are allowed by default 2011-08-23 22:10:08 +02:00
Jakob Sack 778404fb29 VTODO and VJOURNAL exist as well 2011-08-23 22:07:40 +02:00
Jakob Sack 84761b1518 CalDAV seems to work now 2011-08-23 21:42:15 +02:00
Georg Ehrke cdf0d010eb today hightlight in calendar app (fourweeksview and onemonthview) 2011-08-23 20:30:11 +02:00
Georg Ehrke bf68cd8ba4 better multiple language support, first integration of new calendar class 2011-08-23 18:02:36 +02:00
Arthur Schiwon b09ba58ca6 autoretrieve title and description after entering new url 2011-08-23 16:30:55 +02:00
Arthur Schiwon 847347b58a autoretrieve title and description after entering new url 2011-08-23 16:30:29 +02:00
Arthur Schiwon 672515c23f Bookmarks DB structure change, description is optional 2011-08-23 15:24:44 +02:00
Arthur Schiwon 89839b4c63 fetch bookmarks even if they are not tagged 2011-08-23 15:12:34 +02:00
Arthur Schiwon 7e1759e775 Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-23 12:03:49 +02:00
Arthur Schiwon 3c3a859b89 follow coding style and use single quotes in php 2011-08-23 12:03:20 +02:00
Arthur Schiwon 72a4703d82 simplify bookmarks tag filter sql 2011-08-23 11:57:56 +02:00
Arthur Schiwon 53f0381f0f make tag filter compatible with sqlite 2011-08-23 11:43:27 +02:00
Jan-Christoph Borchardt f5cef2fcbf cleaned up LDAP settings 2011-08-23 11:40:00 +02:00
Jan-Christoph Borchardt 3b10cddceb added icon for Admin 2011-08-23 11:37:29 +02:00
Jan-Christoph Borchardt 900382057d updated translations 2011-08-23 11:20:37 +02:00
Robin Appelman 391e064e67 allow apps to register form for the settings and admin pages 2011-08-23 01:41:18 +02:00
Georg Ehrke b2fddc408c /appinfo/app.php bug fixed 2011-08-22 20:09:33 +02:00
Michael Gapczynski 96ad8a15b4 Register OC_Share for autoloading and cleanup hooks 2011-08-22 12:37:44 -04:00
Michael Gapczynski c72187474a Check that the files exist before adding them to the fakedirs 2011-08-22 12:00:56 -04:00
Michael Gapczynski 1b64b7395c Update documentation for unshareFromMySelf() 2011-08-22 11:31:47 -04:00
Jakob Sack fbb63f11e4 Some more work on CalDAV integration 2011-08-22 16:59:16 +02:00
Robin Appelman c9a11d0aab some work on media player interface, artists can be collapsed in the collection view again and single albums/songs can be played 2011-08-21 15:28:20 +02:00
Georg Ehrke 09c8cd17cc remove reset button (again) 2011-08-20 22:50:43 +02:00
Michael Gapczynski 0eda75a193 One more bug fix in clearFolderSizeCache() 2011-08-20 15:48:48 -04:00
Michael Gapczynski f10f916f8c Clean-up in OC_Filestorage_Shared and bug fixes for calculating folder sizes 2011-08-20 15:43:18 -04:00
Michael Gapczynski ceae4fa7b4 Fix bugs preventing file upload in shared folders with write permission 2011-08-20 12:36:20 -04:00
Michael Gapczynski b05be2f26d Fix textviewer in search results 2011-08-20 12:18:56 -04:00
Michael Gapczynski 6afc17be1a Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-20 12:03:22 -04:00
Michael Gapczynski 631152fc3e Implement searching of files shared with you 2011-08-20 12:03:03 -04:00
Jan-Christoph Borchardt d15673f13f removed single quotes around publicly linked download file 2011-08-20 17:44:28 +02:00
Georg Ehrke 3cb07254e5 allday bug fixed 2011-08-20 16:52:03 +02:00
Georg Ehrke fc4d31547b spanish language pack 2011-08-20 16:02:44 +02:00
Georg Ehrke 8e32cfbf15 bug/style fixes, multiple language support, german language pack 2011-08-20 15:19:43 +02:00
Golnaz Nilieh eac4d4ff06 When deleting a bookmark, remove its tags from database. 2011-08-20 12:38:15 +04:30
Jan-Christoph Borchardt add0a90e1e single quotes in JavaScript & PHP, double quotes in HTML 2011-08-20 05:56:04 +02:00
Jan-Christoph Borchardt 389b2775c2 translation update 2011-08-20 05:12:16 +02:00
Jan-Christoph Borchardt d9aae20003 more valid HTML, alt attributes, refactored pagenavi etc. 2011-08-20 05:07:58 +02:00
Michael Gapczynski c2f0fe51c4 Add getLocalFile() to OC_Filestorage_Shared 2011-08-19 20:05:57 -04:00
Michael Gapczynski 778b8543c1 Remove no longer needed functions in OC_Filestorage_Shared 2011-08-19 20:04:35 -04:00
Jan-Christoph Borchardt b3f6eb2224 removed unneeded and dangerous reset button 2011-08-19 23:15:27 +02:00
Jan-Christoph Borchardt 86f6d2fc25 Merge branch 'master' into calendar 2011-08-19 22:58:45 +02:00
Georg Ehrke d1daca5029 a lot of new functions (e.g. add event form), style fixes, bug fixes 2011-08-19 20:33:48 +02:00
Michael Gapczynski ca86093270 Full support for viewing public links from sharing drop down 2011-08-19 12:47:00 -04:00
Golnaz Nilieh 5d310ebf92 * Use encodeEntities() function to check input 
* Separate tags by space
 2011-08-19 16:18:08 +04:30
Golnaz Nilieh 262a652710 Show new bookmark in the list after insertion, And hide it after deletion. 2011-08-19 13:30:05 +04:30
Michael Gapczynski a57d4726bc Remove some scripts, now you can actually download the files in a public link folder 2011-08-18 19:44:00 -04:00
Michael Gapczynski d1aebcddf2 Add downloadURL to files templates for both public links and files 2011-08-18 19:32:24 -04:00
Michael Gapczynski 498356fcb8 Copy get.php into files_sharing, public links now use files templates 2011-08-18 15:35:31 -04:00
Jan-Christoph Borchardt 4c49a81c8e language updates, optimization of Help HTML 2011-08-18 19:22:44 +02:00
Michael Gapczynski 594532da9a Merge public link icon check 2011-08-18 13:14:06 -04:00
Jan-Christoph Borchardt 2ee9e80afe Swedish translation, thanks to HakanS 2011-08-18 14:33:05 +02:00
Jan-Christoph Borchardt 6720a45d65 updated translations 2011-08-18 11:46:49 +02:00
Michael Gapczynski 8fb75f379a Comment rename() and prevent trying to move items if the user doesn't have write permission 2011-08-17 22:10:25 -04:00
Michael Gapczynski b4cf61ee32 Bug fixes for mkdir(), renaming/moving support for files inside a shared folder with write permission 2011-08-17 21:58:53 -04:00
Michael Gapczynski 4078e0a242 -1 is now a class constant (UNSHARED), for unsharing files from self 2011-08-17 18:00:37 -04:00
Michael Gapczynski 1303e40b6e Remove navigation entry for shared files 2011-08-17 17:44:10 -04:00
Michael Gapczynski 5b8658ca10 New system of unsharing files from self, and a small bug fix when all files inside a shared folder are unshared from self 2011-08-17 17:43:15 -04:00
Michael Gapczynski 1c13b2681a Fix my last commit 9ee4fc 2011-08-17 14:22:14 -04:00
Michael Gapczynski 9ee4fcdf2f Only show 'Shared' directory if files are shared with you 2011-08-17 13:47:10 -04:00
Michael Gapczynski 5925697374 Fix bug in getPermissions() and clean-up unlink() and rename() 2011-08-17 12:58:09 -04:00
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
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