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

477 Commits

Author SHA1 Message Date
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