683e125042
Merge branch 'sharing'
2011-08-17 13:48:36 +02:00
0bd92fecec
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-17 12:51:51 +02:00
30dab8473d
Change authentication method to basic http auth instead of using $_GET variables
...
Also use OC_User::isLoggedIn to check if new authentication is needed for grouplist.php and userlist.php
For validateuser.php, credentials are always needed.
2011-08-17 12:47:56 +02:00
83911837be
remove ugly chrome automatic focus border
2011-08-17 11:25:18 +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
4496624685
rounded bar fillings for quota and media player
2011-08-17 01:09:30 +02:00
382b67a4b5
removed the bottomless bottom
2011-08-17 00:52:23 +02:00
42ed3c6b7e
fix problem with building the IN query
2011-08-17 00:34:02 +02:00
cb9fc6d901
make the help section working and pretty. knowledge base entries are fetched via OCS from a different server. cool stuff
2011-08-17 00:24:50 +02:00
462fe1e56b
fix default file actions not working
2011-08-17 00:21:12 +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
c078966511
trying SVG check that Modernizr uses, to fix Firefox 3.6 problems
2011-08-16 12:46:25 +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
98997a51fa
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-15 17:48:18 -04:00
70405cc80e
Modify files css for sharing dropdown to avoid future merge conflicts
2011-08-15 17:47:54 -04:00
e954d2d013
seriously gone a bit overboard with tipsy
2011-08-15 23:45:25 +02: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
af55526164
fix enableing apps
2011-08-15 23:31:59 +02:00
13cbd7f578
some filesystem fixes
2011-08-15 22:55:14 +02:00
5608aaee8a
initial commit of Bookmarks App
2011-08-15 22:05:07 +02:00
523b0966d2
add option to set user quota
2011-08-15 21:09:13 +02:00
6173c0fbc2
a bit of refactoring for oc_filesystem and implement user quota
2011-08-15 21:09:13 +02:00
2f1a06b2ee
merged gitignores
2011-08-15 20:43:39 +02:00
66576de1b7
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-15 17:41:46 +02:00
4f3fdf6c45
Add scripts to get user list and group list as json data.
...
Info about which groups the users belong to are also in the user list. Both files need logging in through GET because unauthorized users are not allowed to see this data.
2011-08-15 17:38:31 +02:00
4a52886728
updated why we do this
2011-08-15 17:02:26 +02:00
c08e85bf70
dont throw errors if we cant connect to the apps repository
2011-08-15 16:01:41 +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
0e25dd65c0
replaced some languages with their indigenous names
2011-08-14 16:29:22 +02:00
7bb261f810
more fixes for Personal and Tipsy
2011-08-14 16:12:31 +02:00
df532e3f82
Show language names in Personal
2011-08-14 15:30:30 +02:00
970888b92d
fix some details in Personal
2011-08-14 15:06:16 +02:00
Jan-Christoph Borchardt
Hans Bakker
Frank Karlitschek
Michael Gapczynski
Robin Appelman
Arthur Schiwon
Jakob Sack