760b47a62f
Use OC_Helper::linkTo also for absolute urls.
...
One central place to check for https.
2011-09-09 22:19:15 +02:00
80f5942868
translatable categories and other translations added
2011-09-09 20:39:38 +02:00
f031e308cd
show caldav url in choose calendar dialog
2011-09-09 18:44:33 +02:00
5fed5bab4a
Improving contacts
2011-09-08 23:36:47 +02:00
74f6dd5d5a
Add creating calendars with the web interface
2011-09-08 12:29:29 +02:00
f3e98878da
Implement calendar list view
2011-09-07 15:13:26 +02:00
dabf10f99c
Use js Date for holding dates in the whole calendar app
2011-09-07 09:49:23 +02:00
fbde66a56c
Eliminate most global calendar js vars
2011-09-07 09:49:23 +02:00
0df98b9a78
Remove generate_ prefix from vars
2011-09-07 09:49:23 +02:00
9b14c276e3
Store date for click in jQuery.data('date_info')
2011-09-07 09:49:23 +02:00
abb6a15aa4
Change generateDates to use js Date for calculations
2011-09-07 09:49:22 +02:00
b7ba0839c6
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-06 17:14:48 +04:30
c5aa139296
Use an animated gif in add-bookmark form, while fetching metadata.
2011-09-06 17:13:03 +04:30
0b5f0ac249
Don't clear bookmark description field, If it is empty in bookmark metadata.
2011-09-06 16:13:23 +04:30
75383a8308
small wording changes
2011-09-04 18:13:53 +02:00
f4b9895cbf
having non-editable stuff as input fields is really confusing. You were right Robin ;)
2011-09-04 10:34:57 +02:00
cfb932b073
Add simple popup to event
...
There is not a lot of infomation to display, yet.
2011-09-03 22:15:24 +02:00
3130234640
Remove execute permissions from source files
2011-09-03 22:15:23 +02:00
2e2bdb449f
Update calendar event label creation
2011-09-03 22:15:23 +02:00
1bf215cd08
updated translations
2011-09-03 15:08:58 +02:00
afb07d3e39
Use css class for view selection radio buttons hilighting
2011-09-02 23:51:18 +02:00
208852abf2
Fix event creation date in oneweekview
2011-09-02 23:50:51 +02:00
d33a5ea5d4
Use css classes to find elements, reduces the html size
2011-09-02 23:28:35 +02:00
6155c758be
Cleanup javascript in calendar template
2011-09-02 23:04:02 +02:00
6eff001ebb
another bugfix in new design of calendar
2011-09-02 21:29:59 +02:00
1940bc3dc0
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-02 15:49:43 +02:00
e89d622c3a
bug fixes in new design of calendar
2011-09-02 15:49:03 +02:00
e798c32375
renaming core_unhosted app to just unhosted, and cleaning up unused files in it
2011-09-02 15:25:04 +02:00
71205b8b07
adding core_unhosted app
2011-09-02 14:56:40 +02:00
8cdd9ab81b
export function and style fixes in calendar
2011-09-02 12:55:56 +02:00
62cca8264f
Refactor calendar loadEvents and updateView use
2011-09-01 23:27:00 +02:00
804af7f189
Move generate_dates function to Class/Object
2011-09-01 23:23:57 +02:00
b7e9e7e777
Simplify forward_day and backward_day
2011-09-01 22:29:57 +02:00
e765e7e9e8
Changing the active state of the calendar reloads the events.
...
Change from Georg Ehrke
2011-09-01 22:00:14 +02:00
1bb754299a
Change calendar js rendering to class/object
2011-09-01 22:00:14 +02:00
3d2b4b03af
Convert plain javascript to jQuery for readability
2011-09-01 22:00:13 +02:00
578d1de55d
Fix OC_USER_LDAP::checkPassword() to return the username
...
REVIEW: 102487
2011-09-01 13:56:30 -03:00
b579c812b2
Some commented code was still here
2011-09-01 18:33:19 +02:00
31a094becb
Buttons for play/add albums works. Folding albums too.
2011-09-01 18:31:44 +02:00
0c07312ad8
add some categories in calendar
2011-09-01 18:35:32 +02:00
6fa9be73f8
calendar_calendars.components needs to be longer, adjustments in info.xml
2011-09-01 17:27:12 +02:00
8cbe66b5c1
bug fixes at new event form (categorie and calendar)
2011-09-01 16:54:25 +02:00
58129f9a11
Merge branch 'calendar' of git://gitorious.org/owncloud-dump/owncloud-dump
2011-09-01 16:15:48 +02:00
3972774a2e
Removed db4app and test_db
2011-09-01 15:58:47 +02:00
a7496b1c9d
Create function getnumberofdays to get a list of month lengths
2011-08-31 21:24:08 +02:00
b0ce1ded97
Move date functions to class structure
2011-08-31 21:24:08 +02:00
361861295f
reload page after add event successfully
2011-08-31 20:41:18 +02:00
5678d78d54
new changes (e.g. show events) by Bart Visscher
2011-08-31 20:20:46 +02:00
9a60313c3b
commit changes of Bart Visscher, see http://gitorious.org/owncloud-dump/owncloud-dump/commits/calendar
2011-08-31 17:29:38 +02:00
f758d223a2
Merge branch 'calendar' of git://anongit.kde.org/owncloud into calendar
2011-08-30 21:01:10 +02:00
6ad64c6f8a
Timezone bug fixed
2011-08-29 13:41:19 +02:00
60a5581071
Merge branch 'master' into calendar
2011-08-28 23:38:24 +02:00
281b2187ab
fix detection of empty collection
2011-08-28 23:20:08 +02:00
947216942a
Merge branch 'calendar' of git.kde.org:owncloud into calendar
2011-08-28 20:16:40 +02:00
ca08ccb61c
first add event function in calendar app
2011-08-28 20:13:40 +02:00
d5c73c6d4a
always scan new music files
2011-08-28 19:32:52 +02:00
04eebccc39
apps/user_ldap/user_ldap.php: - Add support for ldapv3 and tls
2011-08-28 12:56:04 +02:00
0054197d02
updated translations
2011-08-28 01:14:32 +02:00
52ca447efc
Merge branch 'master' of git.kde.org:owncloud
2011-08-27 18:11:32 +02:00
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
f8fc8eb430
no alert popups, ever. They are just dismissed. Use undo instead.
2011-08-27 16:54:20 +02:00
56399d1d79
Play and add buttons in the collection.
2011-08-25 20:57:17 +02:00
ce1d13c9b6
playlist working
2011-08-25 20:37:51 +02:00
ad053d504c
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-25 17:03:56 +02:00
e6bdd25667
fix: links with parameters get cut off at &
2011-08-25 13:51:48 +02:00
0972606072
fix: URLs without protocol are now linked to via HTTP
2011-08-25 13:23:52 +02:00
e0a69bbeac
Make bookmarks sortable by clicks
2011-08-25 12:55:13 +02:00
55a8ee34bd
Make appeareance of the bookmarklet a bit nicer, still room for improvement left
2011-08-25 12:15:03 +02:00
df560b3d9d
Merge branch 'master' of git://anongit.kde.org/owncloud
...
Conflicts:
apps/media/js/collection.js
2011-08-25 09:07:02 +02:00
3fbc8973ee
My own version of music collection.
2011-08-25 09:04:08 +02:00
8c8490b28e
Show users shared with in the drop down for reshared files
2011-08-24 18:41:36 -04:00
e0ff57e8c2
fix javascript error in media player
2011-08-24 23:38:39 +02:00
7cd592e055
Added a Bookmarklet for the Bookmarks app
2011-08-24 22:16:44 +02:00
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
4c4b1e4c2d
Clear the folder size cache for the 'Shared' folder when a new item is shared
2011-08-24 11:59:03 -04:00
4028dc984a
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-24 14:36:16 +02:00
0f3ef8aeb0
check if tag is set, might not show bookmarks on some systems without doing so
2011-08-24 14:36:03 +02:00
f4c498edba
Full path for carddav path
2011-08-24 11:21:27 +02:00
112eccfe33
Support for etags in calendar
2011-08-24 10:19:48 +02:00
c87cee6b1f
Add VJOURNAL to objects that are allowed by default
2011-08-23 22:10:08 +02:00
778404fb29
VTODO and VJOURNAL exist as well
2011-08-23 22:07:40 +02:00
84761b1518
CalDAV seems to work now
2011-08-23 21:42:15 +02:00
cdf0d010eb
today hightlight in calendar app (fourweeksview and onemonthview)
2011-08-23 20:30:11 +02:00
bf68cd8ba4
better multiple language support, first integration of new calendar class
2011-08-23 18:02:36 +02:00
b09ba58ca6
autoretrieve title and description after entering new url
2011-08-23 16:30:55 +02:00
847347b58a
autoretrieve title and description after entering new url
2011-08-23 16:30:29 +02:00
672515c23f
Bookmarks DB structure change, description is optional
2011-08-23 15:24:44 +02:00
89839b4c63
fetch bookmarks even if they are not tagged
2011-08-23 15:12:34 +02:00
7e1759e775
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-23 12:03:49 +02:00
3c3a859b89
follow coding style and use single quotes in php
2011-08-23 12:03:20 +02:00
72a4703d82
simplify bookmarks tag filter sql
2011-08-23 11:57:56 +02:00
53f0381f0f
make tag filter compatible with sqlite
2011-08-23 11:43:27 +02:00
f5cef2fcbf
cleaned up LDAP settings
2011-08-23 11:40:00 +02:00
3b10cddceb
added icon for Admin
2011-08-23 11:37:29 +02:00
900382057d
updated translations
2011-08-23 11:20:37 +02:00
391e064e67
allow apps to register form for the settings and admin pages
2011-08-23 01:41:18 +02:00
b2fddc408c
/appinfo/app.php bug fixed
2011-08-22 20:09:33 +02:00
96ad8a15b4
Register OC_Share for autoloading and cleanup hooks
2011-08-22 12:37:44 -04:00
c72187474a
Check that the files exist before adding them to the fakedirs
2011-08-22 12:00:56 -04:00
1b64b7395c
Update documentation for unshareFromMySelf()
2011-08-22 11:31:47 -04:00
fbb63f11e4
Some more work on CalDAV integration
2011-08-22 16:59:16 +02:00
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
09c8cd17cc
remove reset button (again)
2011-08-20 22:50:43 +02:00
0eda75a193
One more bug fix in clearFolderSizeCache()
2011-08-20 15:48:48 -04:00
f10f916f8c
Clean-up in OC_Filestorage_Shared and bug fixes for calculating folder sizes
2011-08-20 15:43:18 -04:00
ceae4fa7b4
Fix bugs preventing file upload in shared folders with write permission
2011-08-20 12:36:20 -04:00
b05be2f26d
Fix textviewer in search results
2011-08-20 12:18:56 -04:00
6afc17be1a
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-20 12:03:22 -04:00
631152fc3e
Implement searching of files shared with you
2011-08-20 12:03:03 -04:00
d15673f13f
removed single quotes around publicly linked download file
2011-08-20 17:44:28 +02:00
3cb07254e5
allday bug fixed
2011-08-20 16:52:03 +02:00
fc4d31547b
spanish language pack
2011-08-20 16:02:44 +02:00
8e32cfbf15
bug/style fixes, multiple language support, german language pack
2011-08-20 15:19:43 +02:00
eac4d4ff06
When deleting a bookmark, remove its tags from database.
2011-08-20 12:38:15 +04:30
add0a90e1e
single quotes in JavaScript & PHP, double quotes in HTML
2011-08-20 05:56:04 +02:00
389b2775c2
translation update
2011-08-20 05:12:16 +02:00
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
c2f0fe51c4
Add getLocalFile() to OC_Filestorage_Shared
2011-08-19 20:05:57 -04:00
778b8543c1
Remove no longer needed functions in OC_Filestorage_Shared
2011-08-19 20:04:35 -04:00
b3f6eb2224
removed unneeded and dangerous reset button
2011-08-19 23:15:27 +02:00
86f6d2fc25
Merge branch 'master' into calendar
2011-08-19 22:58:45 +02:00
d1daca5029
a lot of new functions (e.g. add event form), style fixes, bug fixes
2011-08-19 20:33:48 +02:00
ca86093270
Full support for viewing public links from sharing drop down
2011-08-19 12:47:00 -04:00
5d310ebf92
* Use encodeEntities() function to check input
...
* Separate tags by space
2011-08-19 16:18:08 +04:30
262a652710
Show new bookmark in the list after insertion, And hide it after deletion.
2011-08-19 13:30:05 +04:30
a57d4726bc
Remove some scripts, now you can actually download the files in a public link folder
2011-08-18 19:44:00 -04:00
d1aebcddf2
Add downloadURL to files templates for both public links and files
2011-08-18 19:32:24 -04:00
498356fcb8
Copy get.php into files_sharing, public links now use files templates
2011-08-18 15:35:31 -04:00
4c49a81c8e
language updates, optimization of Help HTML
2011-08-18 19:22:44 +02:00
594532da9a
Merge public link icon check
2011-08-18 13:14:06 -04:00
2ee9e80afe
Swedish translation, thanks to HakanS
2011-08-18 14:33:05 +02:00
6720a45d65
updated translations
2011-08-18 11:46:49 +02:00
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
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
4078e0a242
-1 is now a class constant (UNSHARED), for unsharing files from self
2011-08-17 18:00:37 -04:00
1303e40b6e
Remove navigation entry for shared files
2011-08-17 17:44:10 -04:00
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
1c13b2681a
Fix my last commit 9ee4fc
2011-08-17 14:22:14 -04:00
9ee4fcdf2f
Only show 'Shared' directory if files are shared with you
2011-08-17 13:47:10 -04:00
5925697374
Fix bug in getPermissions() and clean-up unlink() and rename()
2011-08-17 12:58:09 -04:00
683e125042
Merge branch 'sharing'
2011-08-17 13:48:36 +02:00
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
0edce1796b
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
2011-08-16 20:21:57 -04:00
582dca4d91
Initial merging of files_sharing and files_publiclink
2011-08-16 20:21:18 -04:00
42ed3c6b7e
fix problem with building the IN query
2011-08-17 00:34:02 +02:00
9f28c20660
fix collection browsing using the ampache api
2011-08-17 00:07:17 +02:00
ea65d90a41
really open website after click
2011-08-16 23:50:46 +02:00
48df7a2a7d
gain compatibility with sqlite3
2011-08-16 23:49:53 +02:00
0573695d05
fix database layout for sqlite3
2011-08-16 21:56:12 +02:00
9c3a836044
hiding public links from navigation now that it's easier to use in the dropdown
2011-08-16 18:36:36 +02:00
717ab56419
Display public icon next to publicly shared files
2011-08-16 12:18:31 -04:00
726933831d
Public link folder uploading not implemented, comment out checkbox for it in dropdown
2011-08-16 12:06:08 -04:00
fd74e43afa
fix expire header for media player
2011-08-16 14:35:05 +02:00
b885bad2ee
wording fix for bookmarks
2011-08-16 12:45:44 +02:00
e4c9871299
This should actually make the 'Shared' directory automatically everytime
2011-08-15 20:45:07 -04:00
5fbed936bf
Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory
2011-08-15 20:33:02 -04:00
1ec75330ec
Merge branch 'master' into sharing
2011-08-15 17:49:36 -04:00
82bd2ad310
Merge branch 'master' into calendar
2011-08-15 23:40:03 +02:00
801e4f8611
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
2011-08-15 17:38:33 -04:00
5b09aef166
Additional user group sharing support and more clean-up in the constructor
2011-08-15 17:37:16 -04:00
5608aaee8a
initial commit of Bookmarks App
2011-08-15 22:05:07 +02:00
6096568da9
Small design changes in Contacts
2011-08-14 23:49:09 +02:00
39ecef39cd
Fix creation of UID in contacts
2011-08-14 23:49:09 +02:00
2cb231d0a4
resolved merge conflict
2011-08-14 19:31:38 +02:00
5cb687d168
Refactor getUserAndGroups() for new user group sharing standard - user@group
2011-08-14 12:16:14 -04:00
e1473cfe83
Change OC_GROUP to OC_Group
2011-08-14 11:44:37 -04:00
7bb261f810
more fixes for Personal and Tipsy
2011-08-14 16:12:31 +02:00
970888b92d
fix some details in Personal
2011-08-14 15:06:16 +02:00
f2a21398d7
more info in personal, WebDAV, OpenID
2011-08-14 11:09:51 +02:00
6f37f2917d
fix media player controlls not showing
2011-08-13 17:53:31 +02:00
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
595329a8a0
some player styling
2011-08-13 16:34:40 +02:00
2ba3793671
updated translations
2011-08-13 12:43:15 +02:00
c144976676
start scanning music automatically when in Music
2011-08-13 07:02:51 +02:00
ccf410c7b0
first styling for leftcontent
2011-08-13 07:02:25 +02:00
3b5f16b23c
NEEDS MORE FADING
2011-08-13 06:05:00 +02:00
0c903c63d8
first replacement of media player controls with svg
2011-08-13 05:58:11 +02:00
7ece8ed314
added global action class for icons
2011-08-13 05:27:50 +02:00
4a5ee765cf
merged admin, help and settings to settings
2011-08-13 05:13:34 +02:00
122018889a
Merge branch 'master' into sharing
...
Conflicts:
files/css/files.css
2011-08-12 21:00:41 -04:00
3c517499bb
OC_Share constructor refactored for user group sharing
2011-08-12 20:49:44 -04:00
b0b5a46543
style media player controls using em instead of px
2011-08-13 00:23:15 +02:00
382834ec2b
highlight playing songs in collection
2011-08-13 00:23:15 +02:00
497789cdd8
Clean up constructor for OC_Share, add some error handling for sharing files
2011-08-12 17:22:32 -04:00
a8e6be6016
Change the share file action icon if the file is already shared with someone
2011-08-12 11:34:17 -04:00
a61dde9b52
old files deleted
2011-08-12 14:39:24 +02:00
4ae5c4bc33
bug fixes, style fixes
2011-08-12 14:29:45 +02:00
5a26640f63
partly fix media player
2011-08-12 12:54:49 +02:00
4830555cce
Merge branch 'master' into sharing
...
Conflicts:
.gitignore
2011-08-11 17:42:37 -04:00
9e35d5a886
Remove hardcoded http:// when generating public links
2011-08-11 16:56:09 -04:00
ce9b36fd3e
some interaction design for user management
2011-08-11 21:00:48 +02:00
c65046773d
Make unshare work from dropdown
2011-08-11 14:20:50 -04:00
99790d6805
lots of image changes, use svg EVERYWHERE POSSIBLE
2011-08-11 19:00:32 +02:00
6d25943f2f
Fix some areas on dropdown triggering the dropdown to hide
2011-08-11 12:50:29 -04:00
0ad0ed77c5
Hide the dropdown if you click the share file action button
2011-08-11 12:03:48 -04:00
0f91438b80
Don't spawn a new dropdown if there is already one open
2011-08-11 11:52:10 -04:00
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
103d23b3a3
Refactoring in dropdown javascript
2011-08-11 11:09:14 -04:00
26ac7f0f1d
get rid of some js errors on the login screen
2011-08-11 16:53:00 +02:00
c824572b91
fix the getlink calls
2011-08-11 16:15:55 +02:00
568fd0df83
changed quotes
2011-08-11 13:53:25 +02:00
511c193631
only load share action when in file browser
2011-08-11 13:33:43 +02:00
b4e89871dd
merged master into sharing
2011-08-11 13:29:22 +02:00
c9c1633882
some work on media player
2011-08-11 11:27:20 +02:00
414e5e174d
merge Georgs calendar
2011-08-11 11:22:07 +02:00
4915610b5f
Fix creation of UID in contacts
2011-08-11 11:20:12 +02:00
8639630a18
polished public links a bit
2011-08-11 11:10:41 +02:00
110f96df78
At least dome layout in Contacts
2011-08-11 10:08:02 +02:00
5324d6f7df
Small fixes
2011-08-10 22:27:55 +02:00
e1bde1a78e
Merge branch 'master' into sharing
...
Conflicts:
files/templates/index.php
2011-08-10 13:40:47 -04:00
80660bdc07
Fix shared list for files inside of shared folders
2011-08-10 13:38:58 -04:00
c4931cff34
Delete addressbooks of deleted users
2011-08-10 14:28:14 +02:00
cdf91b6b3e
work in new app management
2011-08-10 14:03:54 +02:00
9059b55979
make more strings translatable
2011-08-10 14:03:54 +02:00
58ab3883b9
Add description to contacts
2011-08-10 11:32:06 +02:00
2b59912b3d
Add CardDAV path
2011-08-10 11:19:12 +02:00
88e338ec23
Only show can edit (if not checked) and unshare button on hover
2011-08-09 17:55:51 -04:00
891ac04c19
Remove references to "multiple addressbooks" :-(
2011-08-09 18:05:52 +02:00
ce76cece09
Remove warning
2011-08-09 18:00:14 +02:00
c6f499c685
Some more fixes. It basically works but looks ugly
2011-08-09 17:42:54 +02:00
7c840e9bbb
Remove users and groups from the select form that have already been shared with
2011-08-09 11:00:14 -04:00
c654442901
No more subnavigation entries, fixing 'Shared'
2011-08-09 10:45:12 -04:00
ec6aed8475
Merge branch 'master' into sharing
2011-08-09 10:42:50 -04:00
cdf2dbcd52
Use chosen select form for selecting users in sharing drop down
2011-08-09 10:34:00 -04:00
6d1c266e1e
You don't always have parameters in vcards!
2011-08-09 15:00:10 +02:00
075db9f7ea
Add default addressbook
2011-08-09 14:49:28 +02:00
5047b6e385
Fix naming bug
2011-08-09 14:15:11 +02:00
76fc062f27
Some more work on the address book
2011-08-09 13:53:58 +02:00
7b38e5d7c7
apps can now add their own forms to the Personal page
2011-08-08 23:46:52 +02:00
6aaa49d386
more media player fixes
2011-08-08 22:31:17 +02:00
23c8d7b3fb
Show which parent folder is shared with the user in the sharing drop down
2011-08-08 15:49:16 -04:00
e6f6d3dabc
dont use a different navigation page for settings stuff
2011-08-08 21:43:31 +02:00
3b34cba4ae
first mediaplayer styling
2011-08-08 21:40:39 +02:00
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
968f1282ce
Merge branch 'master' into sharing
2011-08-08 13:19:40 +02:00
544c61f983
updated public link fix
2011-08-08 13:19:22 +02:00
b9ce564053
Merge branch 'master' into sharing
2011-08-08 13:04:10 +02:00
ecd2738e83
fixed upload button
2011-08-08 12:48:43 +02:00
b1a369b49f
quick fix for public links, removed expiration date and styled correctly
2011-08-08 11:17:03 +02:00
1aa89b7cbb
Merge branch 'master' into sharing
...
Conflicts:
files/css/files.css
lib/base.php
2011-08-07 15:56:26 -04:00
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
5e2f7bfda9
Small details in contacts
2011-08-06 23:29:25 +02:00
77fccc9d00
TEMPORARY update path for carddav testers
2011-08-06 23:09:55 +02:00
42a6549729
Database.xml
2011-08-06 23:09:38 +02:00
2f10598af6
New app: contacts
2011-08-06 22:32:06 +02:00
f039320a0b
move openid settings to Personal
2011-08-06 10:08:26 +02:00
c998bc1215
fix some issues with browsers not supporting html5 localStorage
2011-08-06 10:08:26 +02:00
843f8aca7c
Full support for making and deleting public links from share dropdown
2011-08-05 11:18:35 -04:00
60a7a9d6f0
allow users to use myhost/owncloud/?myusername as openid identity
2011-08-04 18:49:29 +02:00
122c3a3cf8
dont show confusing 'X files scanned' message when we are not scanning files
2011-08-04 01:26:29 +02:00
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
8f01abf054
Share dropdown updates, making public links now works
2011-08-03 15:21:53 -04:00
4851a55c1d
cache the collection for the media player again
2011-08-03 15:36:47 +02:00
de0e16a6f3
fix a bug in the media player outside the media app
2011-08-03 14:26:37 +02:00
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
c79af7cc4f
removed icon for public links navigation subentry
2011-08-03 04:44:17 +02:00
fdb944e7a3
send the filename header for public links
2011-08-03 02:29:33 +02:00
6527048164
dont force a download for public links
2011-08-03 01:06:25 +02:00
a2062036d3
selecting a text file from the search results now activates the text viewer
2011-08-03 00:30:21 +02:00
ad51328408
some fixes for the textviewer already
2011-08-03 00:01:31 +02:00
dd5cc8dcaf
add textviewer plugin
2011-08-02 23:56:53 +02:00
96ab35a331
Animate appearance of share drop down
2011-08-02 15:23:17 -04:00
d0b2a3b1ac
moved dialog css to sharing, fixed position
2011-08-02 19:30:18 +02:00
d71cca0e81
first style for sharing dropdown, some html fixes
2011-08-02 18:58:33 +02:00
0d79560e94
New implementation of share dialog
2011-08-02 12:19:49 -04:00
957b9e8b84
send last modified header for media
2011-08-02 17:02:27 +02:00
900adb35d8
make the progres bar for scanning always go to the full 100%
2011-08-02 04:43:08 +02:00
02ebc4879a
rename media to music in the navigation
2011-08-02 04:27:11 +02:00
c0e7cf2e40
remove now useless 'media' entry from settings
2011-08-02 04:26:32 +02:00
c814f10d7f
fix media sub navigation entries
2011-08-02 04:14:54 +02:00
9f981de854
fance collection scanning wip
2011-08-01 23:55:47 +02:00
ddfc9fc001
Move registering shared storage out of base
2011-08-01 10:58:15 -04:00
29239d6638
remember volume and playback time in the media player
2011-08-01 16:43:02 +02:00
30ce4e5b6b
properly save play/pause state of media player
2011-08-01 16:20:15 +02:00
57ca70e27c
Add support for assigning permissions in share dialog and switch to post
2011-07-31 20:47:53 -04:00
ef22498c6f
some fixes for persistent playlists
2011-08-01 01:59:57 +02:00
9b764cb7f4
show names of next/previous song when you hover the next/previous button
2011-08-01 01:25:34 +02:00
28a64bc2f8
fix an isue with persitent playlists inside the media player app
2011-08-01 01:21:50 +02:00
1933426e3e
make the persitent playlist work anywhere
2011-08-01 01:20:00 +02:00
e1596cc65a
fix bug in saving currently played song
2011-08-01 01:17:54 +02:00
76a2f5b547
persistent playlist for the media player
2011-08-01 01:12:28 +02:00
cbf8f822de
automatically scan songs that are played from the filebrowser
2011-08-01 00:32:44 +02:00
f88b477459
fix search results not displaying
2011-08-01 00:25:53 +02:00
bd6b38e638
cache the media collection between page loads
2011-08-01 00:18:09 +02:00
2d19965750
some improvements to collection scanning
2011-08-01 00:07:46 +02:00
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
c185743ae9
Update the folder sizes for shared folders
2011-07-31 14:48:23 -04:00
6e2ce76223
use db transitions for collection scanner
2011-07-31 20:25:13 +02:00
aff8bc62d2
some improvements in oc_media_collections
2011-07-31 20:24:27 +02:00
f88c4b1f48
Human readable permissions in shared files list
2011-07-31 13:15:07 -04:00
17058c9467
Merge branch 'master' into sharing
2011-07-31 12:53:34 -04:00
eb3526c9a6
show images on click in search results
2011-07-31 02:35:54 +02:00
0d3ebbfefd
Merge branch 'master' into sharing
2011-07-30 19:57:57 -04:00
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
3a08f747fb
more tweaks for media search results
2011-07-31 01:39:25 +02:00
0b44db954f
dont show play and add-to-playlist at the same time
2011-07-31 01:25:33 +02:00
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
18949aaa0b
move public links to a subentry of files
2011-07-30 22:22:57 +02:00
d13ba0ee2d
Revise permissions system to support read, write, and delete
2011-07-30 16:03:32 -04:00
09e05d14a0
im in ur branch, fixin teh details
2011-07-30 14:40:10 +02:00
924cd17f2e
Icewind destroyed my changes :-(
2011-07-30 08:56:08 +02:00
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
eee2a2266d
disable unimplemented subentries for media player
2011-07-30 03:25:15 +02:00
773d23bbd5
open the correct subpage when the media player loads
2011-07-30 00:32:09 +02:00
93dd1c57cc
update playcount correctly without having to reload the collection
2011-07-30 00:21:24 +02:00
aa7c6f057b
fix issue with selecting songs in playlist
2011-07-30 00:05:44 +02:00
94e25ecb0c
Some much needed interface work on the media player
2011-07-29 23:55:54 +02:00
f0c1f38f98
Add share action for mutliple selected files
2011-07-29 15:43:29 -04:00
bafd684eb6
Renaming classes :-)
2011-07-29 21:36:03 +02:00
2ff8d7a8bc
One class per file!
2011-07-29 21:03:53 +02:00
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
45222f34a6
Make 'Share' a subnavigation entry of of 'Files'
2011-07-29 12:20:01 -04:00
1fc41a7bfc
Integrate sharing app with the new interface
2011-07-29 12:11:53 -04:00
fcc9f50641
Merge branch 'master' into sharing
...
Conflicts:
files/templates/index.php
2011-07-29 10:23:15 -04:00
72402ff143
removed some more legacy CSS
2011-07-29 04:24:02 +02:00
67fe835f03
Add a function for removing any duplicate or trailing '/' from the paths
2011-07-28 20:28:22 -04:00
7e3b796de8
More elegant solution for preparing IN ?s, thanks icewind
2011-07-28 20:05:18 -04:00
5bc0619234
Add support for sharing files with user groups
2011-07-28 19:42:02 -04:00
dbcebba882
show media icon in settings as well
2011-07-29 01:33:03 +02:00
b88e5ce9a1
added icon to media app
2011-07-29 01:19:09 +02:00
ab81128e5c
dont throw error when the collection scanner cant detect the length of an audio file
2011-07-28 23:34:39 +02:00
ba246d3b27
Merge branch 'master' into interface
2011-07-28 22:20:34 +02:00
31a067b5a3
Add support for sharing multiple files from share dialog, move loops outside of OC_SHARE
2011-07-28 15:31:52 -04:00
bc51425bb7
keep track of playcount as last played time of music files
2011-07-28 20:59:36 +02:00
aa33812104
hopefully fix some issues with the openid server
2011-07-28 20:12:07 +02:00
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
ece6bd663c
show icons instead of text for file actions
2011-07-28 04:29:04 +02:00
d36850f0f2
Close sharing dialog box on share success
2011-07-27 19:52:10 -04:00
64b5332f33
Make file sharing dialog work - only works for one file/folder and user
2011-07-27 19:25:33 -04:00
2f807a3c7f
Delete requires in applications where possible
2011-07-27 19:25:49 +02:00
0dad1f8ccb
merge master into interface
2011-07-27 16:42:58 +02:00
6585e83037
fix flash fallback for media player and bumb version of jplayer to 2.0.23
2011-07-27 16:40:26 +02:00
ff3140052a
Merge branch 'master' into sharing
2011-07-26 21:29:44 -04:00
1ec0b6ecc1
jQuery dialog for sharing files from within file browser - Not functional yet
2011-07-26 21:27:40 -04:00
344b7f548b
only show songs for which the current user has songs indexed
2011-07-26 22:21:28 +02:00
d6d38ac3fa
only load image viewer when in the file browser
2011-07-26 21:18:13 +02:00
48fe201dd5
fit player controls in smaller header
2011-07-26 16:43:41 +02:00
0e05a86484
some refactoring of the media player code
2011-07-26 16:05:24 +02:00
415ae8e40a
Merge branch 'master' into sharing
2011-07-24 16:08:39 -04:00
5148eb9121
Include groups in user autocomplete
2011-07-24 16:07:39 -04:00
4282a42b3f
Add support for user autocomplete
2011-07-24 15:47:37 -04:00
17b5bcb24f
Bug fixes for unshare() and opendir(), thanks darkh
2011-07-24 14:38:01 -04:00
4993fb4665
Filter out files you unshare from yourself in opendir()
2011-07-23 14:41:01 -04:00
e6e673d7c0
Use SUBSTR instead of LIKE in queries, should now work with SQLite
2011-07-22 20:41:16 -04:00
41a2da234a
remove some debug output and supress some possible errors
2011-07-22 19:37:25 +02:00
0387cc5f1f
Merge branch 'master' into sharing
2011-07-21 19:18:26 -04:00
101c6d151e
fix resizing images in image viewer
2011-07-21 23:30:00 +02:00
38f1cffab3
import media app
2011-07-22 06:30:52 +02:00
302527c2d6
Remove shared items check, it prevents sharing items if there aren't already any.
2011-07-21 14:53:51 -04:00
4abefde290
Remove admin page, administration is not needed at this time for sharing
2011-07-20 16:54:06 -04:00
6af4c465b8
Change all occurences of ['user_id'] to OC_USER::getUser()
2011-07-20 16:52:01 -04:00
fcda3a338c
Fix bug in constructor for appending numbers to already existing targets
2011-07-20 16:41:39 -04:00
3e6037659e
Change permissions to is_writeable
2011-07-20 15:42:49 -04:00
22f8415045
Remove accidental kate swap file
2011-07-20 14:46:01 -04:00
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
abf6ba621a
Merge branch 'master' into sharing
2011-07-20 14:30:19 -04:00
c9082d5b0d
Append number to name if target file already exists
2011-07-20 14:16:20 -04:00
029b21bf54
First implementation of sharing user interface
2011-07-20 13:34:16 -04:00
6230001a3c
show expire dates of public links as date and not as datetime
2011-07-20 00:55:47 +02:00
9bc3991c23
serveral small fixes to the openid server
2011-07-20 00:53:55 +02:00
61837428ba
Add post_delete and post_rename hooks and fix the constructor
2011-07-18 16:36:34 -04:00
24e81ce4d5
fix some ldap errors
2011-07-18 18:50:21 +02:00
f4121339af
Fix expiring of public links
2011-07-17 17:41:46 +02:00
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
f3f8a96c6d
Add return true to unlink() and rename(), a return is expected by OC_FILESYSTEM
2011-07-16 14:58:12 -04:00
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
dbcb35655e
Fix bugs in opendir() and add extra checks to ensure functionality in all cases
2011-07-16 14:24:59 -04:00
8ad4a44171
Fix bugs in unlink(), rename(), pullOutOfFolders(), and getItemsInFolder()
2011-07-16 13:06:59 -04:00
8ed0223bd6
Add pullOutOfFolder() function for use by unlink() and rename()
2011-07-14 21:04:09 -04:00
7920e706ea
Refactoring of OC_SHARE, added more documentation for functions
2011-07-14 19:24:48 -04:00
2fb1481613
Bug fix for setTarget() - append fetchAll() to query
2011-07-14 12:40:12 -04:00
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
d393ccfe2c
Fix bug in getSource(), return false if target isn't in database
2011-07-12 20:18:08 -04:00
b2b7d99302
Add checks in opendir() to prevent including the current directory or parent
2011-07-12 18:22:59 -04:00
6b303ee64b
Fix bug in opendir() and remove getStorageMountPoint(), now using datadir argument instead
2011-07-12 13:10:29 -04:00
163c490c92
Remove duplicate '/' from target when searching for source
2011-07-10 14:41:27 -04:00
010920ad08
Add support for files inside of shared folders having different names than the source file
2011-07-08 18:21:20 -04:00
73bab46758
Prevent searching for user directory in getParentFolders()
2011-07-08 15:23:41 -04:00
f1cac00396
Add wildcard to source for database query in unshare()
2011-07-08 15:03:05 -04:00
d91d2178b8
Fix unshare() to remove database entries of files within a shared folder
2011-07-08 14:58:35 -04:00
35d6051e9d
Fix bug in mkdir(), was passing the wrong path
2011-07-07 19:26:25 -04:00
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
58e8312b1c
Fix setIsWriteable() and setTarget()
2011-07-07 18:25:34 -04:00
5e560e9bd9
Merge branch 'master' into sharing
2011-07-06 20:19:44 -04:00
2212b5b5d7
Add wildcard to database query in unshareFromSelf()
2011-07-06 20:16:29 -04:00
2908145b94
Fix bug in is_writeable(), was passing the wrong path
2011-07-06 15:28:50 -04:00
732ad7f6c1
Add support for renaming, moving, and deleting shared files
2011-07-06 15:17:03 -04:00
cf33995892
Refactor OC_SHARE to allow for renaming and write permissions
2011-07-06 12:12:29 -04:00
7362f103ed
only use ldap user backend when it is configured
2011-07-06 00:30:57 +02:00
9deab8302f
Fix bugs in getSource() and implement new target path standard
2011-07-05 11:56:02 -04:00
05389827fd
Merge branch 'master' into sharing
...
Conflicts:
.gitignore
lib/base.php
2011-07-04 16:36:30 -04:00
7f0dc638ae
Hopefully fix errors if ldap plugin is not configured
2011-07-04 19:05:14 +02:00
e24e2d0e16
Append LIMIT 1 to getSource queries to improve performance
2011-07-03 11:43:49 -04:00
b03083b881
Fix check for parentDir and fix the return for a nonexistent target in the database
2011-06-27 18:14:04 -04:00
053edde780
Improvements to caching for shared folders
2011-06-27 12:53:10 -04:00
a402c8ffe1
Implement caching for source paths in OC_FILESTORAGE_SHARED
2011-06-27 11:47:36 -04:00
fe178310f3
Use php functions dirname() and basename() instead of manipulating strings in getSource()
2011-06-26 19:21:24 -04:00
12c168b6dd
Add function setTarget(), implement recursion in getSource() for folders
2011-06-25 22:00:52 -04:00
78293ea244
Better implementation of getting shared folder size by using the source path
2011-06-24 19:52:35 -04:00
c8781b1caf
Add error handling for getSource()
2011-06-24 19:38:39 -04:00
e91f42d249
Add support for sharing folders
2011-06-24 19:20:08 -04:00
4ac25942de
you can now use your owncloud url as openid provider
2011-06-24 22:09:55 +02:00
7d2784c4c3
add openid headers to openid request page
2011-06-24 18:02:51 +02:00
1aa8399915
show error on openid request page when no user is selected
2011-06-24 17:17:07 +02:00
2772c66259
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-06-24 16:05:48 +02:00
53cb4c16ed
add template to openid request page
2011-06-24 00:27:46 +02:00
735738fe6f
user_ldap: close ldap connection in dtor
2011-06-23 23:57:18 +02:00
5f29f8a831
user_ldap: implement userExists
2011-06-23 23:57:17 +02:00
d4618d633a
user_ldap: use input-type-password for ldap_password
2011-06-23 23:57:17 +02:00
612f8cb954
user_ldap: add port setting
2011-06-23 23:57:17 +02:00
c8e57d5460
Add user_ldap plugin
2011-06-23 23:57:17 +02:00
467778d66f
Merge branch 'master' into sharing
2011-06-23 17:54:49 -04:00
6452f5b5cb
OpenID now won't load if curl is not available
2011-06-23 18:20:59 +02:00
1ce24d892b
don't show errors when the login isn't an openid identity
2011-06-23 17:58:27 +02:00
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
8cbee28416
Better implementation of filesize for shared directory, now storing in oc_foldersize
2011-06-22 21:05:31 -04:00
87097db4eb
Changed self:: and OC_FILESTORAGE_SHARED to ->
2011-06-22 19:47:57 -04:00
e3ea84d048
Changed ctime for the shared folder to the earliest ctime
2011-06-22 19:17:31 -04:00
3f5fde50c1
Forgot to remove TODOs for file?time()s
2011-06-22 18:22:48 -04:00
098fc5ef95
Fixed stat(), file?time()'s now grab most recent time from shared files
2011-06-22 18:16:41 -04:00
ac0d41418e
Correct calculation for shared folder size
2011-06-22 17:55:07 -04:00
18e776fa2f
Changed mount point to 'Share', fixed is_dir()
2011-06-22 11:40:09 -04:00
83958ebd4b
add oc_user::getUser to get the user id of the loggedin user
2011-06-22 12:50:57 +02:00
c0af177223
public link config is also for non admins
2011-06-22 12:40:13 +02:00
a7b7f5a76c
app files_publiclink is now translateable
2011-06-20 00:17:49 +02:00
14dddc0c9e
forgot "event" as a parameter.
2011-06-19 14:23:24 +02:00
97ab331b2a
change db index names to avoid collisions
2011-06-18 23:57:03 +02:00
4e7d1c376f
OC_FILESTOAGE_SHARED now works with hard coded values for files
2011-06-18 13:49:52 -04:00
69b5e01be1
OC_FILESTOAGE_SHARED updates + its own getInternalPath()
2011-06-18 13:29:16 -04:00
e6621b9c78
Added source and target to database fields
2011-06-16 15:54:25 -04:00
fe4a213e1b
Fixed mistakes pointed out by icewind
2011-06-16 14:59:54 -04:00
bf66563cda
First version of shared storage provider - not functional
2011-06-16 14:40:21 -04:00
8603b0973f
Initial setup of sharing app
2011-06-11 16:14:24 -04:00
86dd023448
Adding clear logs functions
2011-06-07 15:48:21 -04:00
bc0790381e
fix loading of image viewer again
2011-06-04 23:14:33 +02:00
277e644558
only load image viewer when in file browser
2011-06-04 23:08:38 +02:00
b0476bf174
fix imageviewer again
2011-06-04 22:41:17 +02:00
dab656007d
fix imageviewer not showing up when using the actions menu
2011-06-04 22:21:16 +02:00
e5816451c8
always show the image in the middle of the screen, regardless of scrolling
2011-06-04 22:20:57 +02:00
4b9665a952
image viewer plugin
2011-06-04 20:48:53 +02:00
da2c9aa807
fix broken links in shared folders
2011-06-02 03:00:20 +02:00
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
f36f453dd2
apps are now stored in /apps
2011-04-16 09:46:58 +02:00
Bart Visscher
Georg Ehrke
Jakob Sack
Golnaz Nilieh
Jan-Christoph Borchardt
Michiel@unhosted
Caio Marcelo de Oliveira Filho
Côme BERNIGAUD
Jakob Sack
Robin Appelman
Sascha Schneider
Arthur Schiwon
Michael Gapczynski
Frank Karlitschek
Dominik Schmidt
Kamil Domanski
Alessandro Cosentino