Commit Graph

1702 Commits

Author SHA1 Message Date
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
Dawid Opis 6b9cf8d2d5 fixed mysql/sqlite selection labels in installation screen 2011-08-11 16:38:54 +02:00
Dawid Opis 952d88a28c fixed mysql/sqlite selection labels in installation screen 2011-08-11 16:37:20 +02:00
Frank Karlitschek d75faac09e Merge branch 'master' of git.kde.org:owncloud 2011-08-11 16:33:53 +02:00
Frank Karlitschek 5b9f6b4001 hide the files admin page as long as we don have settings on the page 2011-08-11 16:24:53 +02:00
Robin Appelman 50c1553c38 automaticaly login after setup 2011-08-11 16:22:25 +02:00
Frank Karlitschek c824572b91 fix the getlink calls 2011-08-11 16:15:55 +02:00
Robin Appelman bc5bf18eed bit of work on app management 2011-08-11 15:11:06 +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 592eacf37d tweak settings passwords a bit 2011-08-11 11:38:37 +02:00
Robin Appelman c9c1633882 some work on media player 2011-08-11 11:27:20 +02:00
Robin Appelman 2e58752e12 more work on user management 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
Robin Appelman bbfb93c655 remove groups if there are no users in them 2011-08-11 10:12:17 +02:00
Robin Appelman bfd72501a1 add OC_Group::usersInGroup() to get a list of all users in a group 2011-08-11 10:12:17 +02:00
Jakob Sack 110f96df78 At least dome layout in Contacts 2011-08-11 10:08:02 +02:00
Jan-Christoph Borchardt b6b00393a2 some more CSS cleanup 2011-08-11 00:47:21 +02:00
Jan-Christoph Borchardt a8cb411a92 restyle logout 2011-08-11 00:47:21 +02:00
Dawid Opis fa61279e45 fixed upload button overlapping new folder input 2011-08-11 00:03:26 +02:00
Jan-Christoph Borchardt 1128b15833 fixed navigation and breadcrumb graphics 2011-08-10 23:44:18 +02:00
Jan-Christoph Borchardt 225d000491 I don't always test my code. But when I do, I do it in production. 2011-08-10 23:26:25 +02:00
Jan-Christoph Borchardt bdba88d7f6 damn z-index 2011-08-10 23:12:41 +02:00
Jan-Christoph Borchardt 90136b6e0a fix search, sane z-indexes 2011-08-10 23:09:29 +02:00
Jan-Christoph Borchardt 6af4c2dd0f moved search box directly to template 2011-08-10 23:02:41 +02:00
Jan-Christoph Borchardt 05f3910718 moved search box directly to template 2011-08-10 22:56:55 +02:00
Robin Appelman fa102cd229 create the necessary groups when creating a user 2011-08-10 22:48:26 +02:00
Robin Appelman f03874ac49 work on user management 2011-08-10 22:38:28 +02:00
Jakob Sack b54d790a87 Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-10 22:28:18 +02:00
Jakob Sack 5324d6f7df Small fixes 2011-08-10 22:27:55 +02:00
Jan-Christoph Borchardt 1dac5bb390 fixed undo notification not showing 2011-08-10 20:48:56 +02:00
Bartek Przybylski ec31a29b3c Bug 279826 fix 2011-08-10 20:12:42 +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
Jan-Christoph Borchardt fbf86c6683 made sliding settings more awesome 2011-08-10 17:31:01 +02:00
Frank Karlitschek 613ab41eb3 more work on the encryption library 2011-08-10 17:24:38 +02:00
Jan-Christoph Borchardt 8ff736b571 some app styling 2011-08-10 16:46:54 +02:00
Jan-Christoph Borchardt 338e350e0f removed settings padding 2011-08-10 16:05:13 +02:00
Jan-Christoph Borchardt 3e3488139e added CSS reset 2011-08-10 16:02:28 +02:00
Jan-Christoph Borchardt f754d6dc51 lots of CSS details 2011-08-10 15:11:26 +02:00
Jan-Christoph Borchardt 6822a7a215 better CSS, remove legacy 2011-08-10 15:11:26 +02:00
Jakob Sack f633492dfc Update SabreDAV 2011-08-10 14:39:12 +02:00
Jakob Sack c4931cff34 Delete addressbooks of deleted users 2011-08-10 14:28:14 +02:00
Robin Appelman 1f1498ceca remove Log completely 2011-08-10 14:03:54 +02:00
Robin Appelman cdf91b6b3e work in new app management 2011-08-10 14:03:54 +02:00