wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
37303 commits 157 branches 562 tags 714 MiB
Commit graph

37303 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
2520a4831b
Make sure we use the correct storage id when scanning a jailed storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-25 17:03:45 +01:00
Björn Schießle
ffe2543a57 Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api 
add data from the users profile to the provisioning api
 2017-01-25 15:44:36 +01:00
John Molakvoæ (skjnldsv)
4e91759825
No more height css calc for app-navigation children 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 15:39:54 +01:00
Björn Schießle
5873a0a7d4 Merge pull request #3231 from nextcloud/allow-editing-public-links 
allow editing single files shared as public link
 2017-01-25 15:35:57 +01:00
John Molakvoæ (skjnldsv)
87fd41dba2
Fix popover conflicts with app-navigation li (color & opacity) 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 15:22:51 +01:00
John Molakvoæ (skjnldsv)
179bd5824f
Border radius fix on popover 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 15:13:38 +01:00
John Molakvoæ (skjnldsv)
bf6505f30c
Everyone gets a copyright! 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 14:13:28 +01:00
Jan-Christoph Borchardt
3384b2f53c fix personal page password form layout 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-01-25 12:05:43 +01:00
Björn Schießle
f469b3e958 Merge pull request #3223 from nextcloud/fix-public-page-style 
Fix public page style
 2017-01-25 11:45:36 +01:00
Jan-Christoph Borchardt
8c732e376b properly compress close-white.svg 2017-01-25 11:28:43 +01:00
Joas Schilling
95ef625a9d
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-25 11:24:42 +01:00
Bjoern Schiessle
5086335643
unify endpoints form core and the the provisioning api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-25 11:20:35 +01:00
Joas Schilling
10a55e6006 Merge pull request #3241 from nextcloud/fix-padding-settings 
Fix left padding for settings sidebar
 2017-01-25 11:12:48 +01:00
Joas Schilling
7e3bd63a70
Remove the icon since it's defined by the app itself 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-25 10:50:31 +01:00
John Molakvoæ (skjnldsv)
5834ab1ffd
Scour opt 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 09:19:49 +01:00
John Molakvoæ (skjnldsv)
d0e88e328c
Add clear search button 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 09:15:37 +01:00
Christoph Wurst
77fcee7979 Merge pull request #3239 from nextcloud/added-inline-button 
fix #3235
 2017-01-25 08:53:22 +01:00
Christoph Wurst
933fd9c94d Merge pull request #3240 from nextcloud/storage-interface-tweaks 
minor storage interface tweaks
 2017-01-25 08:52:32 +01:00
John Molakvoæ
5d985deb4d Merge pull request #3215 from nextcloud/fix-search-border 
Fix #3205
 2017-01-25 08:04:41 +01:00
Morris Jobke
95ab46e3d2 Merge pull request #3030 from nextcloud/filesapi-renamefailcase 
Fix files node API failed rename/copy
 2017-01-24 21:23:59 -06:00
Nextcloud bot
c3e57d228f
[tx-robot] updated from transifex 2017-01-25 01:10:00 +00:00
Morris Jobke
8f5c62c99f Merge pull request #3204 from nextcloud/remove-button-shadow 
remove button shadow effect, fix #3203
 2017-01-24 13:34:12 -06:00
Morris Jobke
fa5cb9c875 Merge pull request #3227 from nextcloud/fix-avatar-user-menu-header 
Fixed menu arrow, padding and avatar position, fix #3217
 2017-01-24 13:30:04 -06:00
Morris Jobke
f9c3639607
add icon for encryption settings on personal page 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-24 12:59:36 -06:00
Morris Jobke
e46410e856
Add icon to admin page sidebar for LDAP 
* follow up to nextcloud/server#3151

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-24 12:54:32 -06:00
Christoph Wurst
ca6f5735b1 Merge pull request #3226 from nextcloud/header-app-menu-flex-fix 
Fix header layout issue on narrow screens #3225
 2017-01-24 18:15:22 +01:00
Morris Jobke
b5d171a3ed
Fix left padding for settings sidebar 
* followup to #3151

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-24 11:00:31 -06:00
Morris Jobke
e09bba5e36 Merge pull request #3151 from nextcloud/navigation-icons 
add icons to navigation of personal & admin settings
 2017-01-24 10:56:31 -06:00
John Molakvoæ (skjnldsv)
dcad6032b1
Appdata var fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-24 17:46:20 +01:00
John Molakvoæ (skjnldsv)
a440c3e94c
Remove unused webroot 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-24 17:27:35 +01:00
Robin Appelman
f73527c42f
minor storage interface tweaks 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-24 16:58:04 +01:00
Robin Appelman
38ec2a35f2
Make DAV external storage test more reliable 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-24 16:56:24 +01:00
John Molakvoæ (skjnldsv)
befc49d937
fix #3235 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-24 16:54:51 +01:00
Bjoern Schiessle
fee42647fb
add data from the users profile to the provisioning api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-24 14:23:18 +01:00
Robin Appelman
f55260bc83 Merge pull request #3214 from nextcloud/cache-storage-info 
cache the storage info for 5 min
 2017-01-24 13:49:45 +01:00
Bjoern Schiessle
92d7dd4781
allow editing single files shared as public link 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-24 13:41:27 +01:00
Robin Appelman
cbc18b7c8b
hash the path used for the cache key to prevent key length problems 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-24 11:18:05 +01:00
Nextcloud bot
30e9d67ee9
[tx-robot] updated from transifex 2017-01-24 01:07:14 +00:00
Morris Jobke
c0341f3459 Merge pull request #3192 from nextcloud/fix-app-settings-layout-minor 
Fix gap by filter svg and empty search message overflow
 2017-01-23 18:29:36 -06:00
Jan-Christoph Borchardt
38f684aadf fix positioning details of icons in navigation 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-01-24 01:00:00 +01:00
John Molakvoæ (skjnldsv)
c30cf00ec3
Fixed menu arrow, padding and avatar position, fix #3217 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-24 00:25:09 +01:00
John Molakvoæ (skjnldsv)
d992af82b2
Fix #3225 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-24 00:03:45 +01:00
Robin Appelman
d4d116503c Merge pull request #3212 from mwalbeck/mimetype-hidden-files 
Mimetype detection for hidden files
 2017-01-23 21:45:16 +01:00
Morris Jobke
f19feccf9f Merge pull request #3209 from nextcloud/fix-theming-typo 
Fix typo in theming description
 2017-01-23 13:54:52 -06:00
Morris Jobke
9b0c6c0eff Merge pull request #3157 from nextcloud/fcloseafterkill 
[uc] Prevent PHP request to get killed when using fclose callback (#26775)
 2017-01-23 13:51:43 -06:00
Morris Jobke
a13ea677ed
add comment about ISO 8601 and PHP 🙈 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-23 13:39:08 -06:00
Morris Jobke
30c32e0b16 Merge pull request #3220 from nextcloud/direct-link-open-sidebar 
open the sidebar when opening a permalink
 2017-01-23 12:57:52 -06:00
Morris Jobke
1bc3a26042
Fix white flashing of search background 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-23 12:54:20 -06:00
John Molakvoæ (skjnldsv)
15134af5f3
Fix #3205 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-23 12:54:20 -06:00
Morris Jobke
46ef0f832d
Fix public page style 
* checks if the user is on the login page or not instead of check if the user is logged in
* fixes #3207

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-23 12:42:59 -06:00