Commit graph

1318 commits

Author SHA1 Message Date
Michael Gapczynski
4830555cce Merge branch 'master' into sharing
Conflicts:
	.gitignore
2011-08-11 17:42:37 -04:00
Jan-Christoph Borchardt
52df7accfd added public icon for shared files 2011-08-11 23:11:14 +02:00
Michael Gapczynski
9e35d5a886 Remove hardcoded http:// when generating public links 2011-08-11 16:56:09 -04:00
Jan-Christoph Borchardt
57bdb6115c styled installation radio buttons more unobtrusive 2011-08-11 22:32:10 +02:00
Dawid Opis
11b3c10cc6 resolved merge conflicts 2011-08-11 22:29:48 +02:00
Dawid Opis
9683d44633 fixed upload button 2011-08-11 22:22:32 +02:00
Jan-Christoph Borchardt
ce9b36fd3e some interaction design for user management 2011-08-11 21:00:48 +02:00
Robin Appelman
0bcb4a6a8f set default max upload size in the .htaccess file to something rediculous
and don't show the max filesize message when the limit is over 10GB
2011-08-11 21:00:18 +02:00
Robin Appelman
dfb923f34e automatically set background images to png when needed 2011-08-11 20:36:31 +02:00
Michael Gapczynski
c65046773d Make unshare work from dropdown 2011-08-11 14:20:50 -04:00
Dawid Opis
8aac43c12b fixed width for three database type buttons, more highlighted when selected 2011-08-11 19:50:44 +02:00
Jan-Christoph Borchardt
99790d6805 lots of image changes, use svg EVERYWHERE POSSIBLE 2011-08-11 19:00:32 +02:00
Michael Gapczynski
6d25943f2f Fix some areas on dropdown triggering the dropdown to hide 2011-08-11 12:50:29 -04:00
Dawid Opis
ef5e253bf5 changed radiobuttons to jQuery UI buttons (restyled) on installation page 2011-08-11 18:18:50 +02: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
Frank Karlitschek
aa582ec43a more work on encryption 2011-08-11 17:49:36 +02:00
Frank Karlitschek
4a334f0d12 Merge branch 'master' of git.kde.org:owncloud 2011-08-11 17:22:10 +02: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
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
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