Michael Gapczynski
98997a51fa
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-15 17:48:18 -04:00
Michael Gapczynski
70405cc80e
Modify files css for sharing dropdown to avoid future merge conflicts
2011-08-15 17:47:54 -04:00
Jan-Christoph Borchardt
e954d2d013
seriously gone a bit overboard with tipsy
2011-08-15 23:45:25 +02: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
Robin Appelman
af55526164
fix enableing apps
2011-08-15 23:31:59 +02:00
Robin Appelman
13cbd7f578
some filesystem fixes
2011-08-15 22:55:14 +02:00
Arthur Schiwon
5608aaee8a
initial commit of Bookmarks App
2011-08-15 22:05:07 +02:00
Robin Appelman
523b0966d2
add option to set user quota
2011-08-15 21:09:13 +02:00
Robin Appelman
6173c0fbc2
a bit of refactoring for oc_filesystem and implement user quota
2011-08-15 21:09:13 +02:00
Jan-Christoph Borchardt
2f1a06b2ee
merged gitignores
2011-08-15 20:43:39 +02:00
Hans Bakker
66576de1b7
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-15 17:41:46 +02:00
Hans Bakker
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
Jan-Christoph Borchardt
4a52886728
updated why we do this
2011-08-15 17:02:26 +02:00
Robin Appelman
c08e85bf70
dont throw errors if we cant connect to the apps repository
2011-08-15 16:01:41 +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
0e25dd65c0
replaced some languages with their indigenous names
2011-08-14 16:29:22 +02:00
Jan-Christoph Borchardt
7bb261f810
more fixes for Personal and Tipsy
2011-08-14 16:12:31 +02:00
Robin Appelman
df532e3f82
Show language names in Personal
2011-08-14 15:30:30 +02:00
Robin Appelman
970888b92d
fix some details in Personal
2011-08-14 15:06:16 +02:00
Jan-Christoph Borchardt
6e30ade0b3
updated tipsy, tooltips finally work everywhere, thanks icewind
2011-08-14 14:55:43 +02:00
Jan-Christoph Borchardt
f2a21398d7
more info in personal, WebDAV, OpenID
2011-08-14 11:09:51 +02:00
Robin Appelman
4f43b0a729
fix creating users
2011-08-13 23:56:53 +02:00
Hans Bakker
bd12bdfe56
Add validateuser.php ajax file returning json data saying whether a user exists and the credentials are correct
2011-08-13 21:07:51 +02:00
Jan-Christoph Borchardt
6eabee3dfd
small CSS changes
2011-08-13 18:22:40 +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
44b59e3823
EVERYTHING MUST FADE
2011-08-13 17:13:04 +02:00
Jan-Christoph Borchardt
1f98f5cfda
wayyy better position for file upload and new folder
2011-08-13 16:54:54 +02:00
Jan-Christoph Borchardt
595329a8a0
some player styling
2011-08-13 16:34:40 +02:00
Jan-Christoph Borchardt
6b2862fcfe
various CSS fixes
2011-08-13 16:00:10 +02:00
Jan-Christoph Borchardt
7474c907dc
CSS update, Personal looks better now
2011-08-13 15:32:00 +02:00
Frank Karlitschek
9ac084d0b8
remove for now. main repository is at projects.kde.org/owncloud
2011-08-13 15:19: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
d5b4056514
fixed tipsy tooltips for actions
2011-08-13 05:40:03 +02:00
Jan-Christoph Borchardt
9648be97fb
better error messages for installation, still need to be inline
2011-08-13 05:37:12 +02:00
Jan-Christoph Borchardt
9be059aced
removed subnavigation code
2011-08-13 05:31:56 +02:00
Jan-Christoph Borchardt
7ece8ed314
added global action class for icons
2011-08-13 05:27:50 +02:00
Jan-Christoph Borchardt
b2768637d2
updated translations
2011-08-13 05:13:35 +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