upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-23 02:43:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
1376 commits 773 branches 1188 tags 6.5 GiB
Commit graph

276 commits

Author SHA1 Message Date
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
7bb261f810 more fixes for Personal and Tipsy 2011-08-14 16:12:31 +02:00
Robin Appelman
970888b92d fix some details in Personal 2011-08-14 15:06:16 +02:00
Jan-Christoph Borchardt
f2a21398d7 more info in personal, WebDAV, OpenID 2011-08-14 11:09:51 +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
595329a8a0 some player styling 2011-08-13 16:34: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
7ece8ed314 added global action class for icons 2011-08-13 05:27:50 +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
Michael Gapczynski
3c517499bb OC_Share constructor refactored for user group sharing 2011-08-12 20:49:44 -04:00
Robin Appelman
b0b5a46543 style media player controls using em instead of px 2011-08-13 00:23:15 +02:00
Robin Appelman
382834ec2b highlight playing songs in collection 2011-08-13 00:23:15 +02:00
Michael Gapczynski
497789cdd8 Clean up constructor for OC_Share, add some error handling for sharing files 2011-08-12 17:22:32 -04:00
Michael Gapczynski
a8e6be6016 Change the share file action icon if the file is already shared with someone 2011-08-12 11:34:17 -04:00
Robin Appelman
5a26640f63 partly fix media player 2011-08-12 12:54:49 +02:00
Michael Gapczynski
4830555cce Merge branch 'master' into sharing 
Conflicts:
	.gitignore
 2011-08-11 17:42:37 -04:00
Michael Gapczynski
9e35d5a886 Remove hardcoded http:// when generating public links 2011-08-11 16:56:09 -04:00
Jan-Christoph Borchardt
ce9b36fd3e some interaction design for user management 2011-08-11 21:00:48 +02:00
Michael Gapczynski
c65046773d Make unshare work from dropdown 2011-08-11 14:20:50 -04: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
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
Robin Appelman
26ac7f0f1d get rid of some js errors on the login screen 2011-08-11 16:53:00 +02:00
Frank Karlitschek
c824572b91 fix the getlink calls 2011-08-11 16:15:55 +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
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