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 |
|
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 |
|
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 |
|