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

38004 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
c6613ee8fc
fix share provider id 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:20:49 +02:00
Bjoern Schiessle
0d5147bd49
add new password column to the share table in order to set passwords for share by mails 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:20:49 +02:00
Bjoern Schiessle
d0eefd17d3
allow the user to set a expire date for all shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:20:47 +02:00
Nextcloud bot
d56f6399eb
[tx-robot] updated from transifex 2017-04-03 00:08:20 +00:00
Lukas Reschke
f31dafe4a8 Merge pull request #4183 from nextcloud/css-shortcuts-view 
Add CSS for styling of keyboard shortcuts view
 2017-04-02 16:45:07 +02:00
Nextcloud bot
0056211672
[tx-robot] updated from transifex 2017-04-02 00:07:48 +00:00
Roeland Jago Douma
2fa84ecfe0 Merge pull request #4139 from nextcloud/phpseclib 
[3rdparty] Bump phpseclib to 2.0.4
 2017-04-01 14:00:25 +02:00
Christoph Wurst
468f502c8d Merge pull request #4174 from nextcloud/mergejs-newline 
mergejs should print a newline between imports
 2017-04-01 08:38:47 +02:00
Nextcloud bot
9098042c95
[tx-robot] updated from transifex 2017-04-01 00:08:09 +00:00
Roeland Jago Douma
04fc00fcdf
mergejs should print a newline between imports 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-31 17:06:38 +02:00
Roeland Jago Douma
57020a0c36 Merge pull request #3438 from nextcloud/external-storage-user-folder 
Allow using '/' as external storage mountpoint
 2017-03-31 15:07:39 +02:00
Björn Schießle
85da9378c0 Merge pull request #4140 from nextcloud/no_encryption_no_wrapper 
Don't add the Encryption Storage Wrapper if there are no encryption modules
 2017-03-31 14:49:38 +02:00
Nextcloud bot
6a6300b1f2
[tx-robot] updated from transifex 2017-03-31 00:08:35 +00:00
Roeland Jago Douma
548871a9f3 Merge pull request #3832 from nextcloud/fix_1303 
Do not clear CSRF token on logout (fix for #1303)
 2017-03-30 18:25:50 +02:00
Robin Appelman
7d4c4224d1
fix setup of external storage integration tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 17:16:59 +02:00
Joas Schilling
a51e4dd259 Merge pull request #4150 from nextcloud/capped-memcache-push 
support pushing to CappedMemoryCache
 2017-03-30 15:16:33 +02:00
Joas Schilling
0fb7c631ce Merge pull request #4128 from nextcloud/updateclipboard 
Update clipboard.js
 2017-03-30 14:37:03 +02:00
Roeland Jago Douma
70f93bf53a Merge pull request #4143 from nextcloud/ldap-downstream-64 
Correctly apply quota
 2017-03-30 14:10:21 +02:00
Roeland Jago Douma
bca7257920 Merge pull request #3089 from nextcloud/cache-move-single-query 
Move all children of a folder in a single query
 2017-03-30 14:08:31 +02:00
Jan-Christoph Borchardt
7788afaccf Add CSS for styling of keyboard shortcuts view 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-30 13:07:26 +02:00
Robin Appelman
0aeb595784
user ids are strings 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 12:24:46 +02:00
Robin Appelman
dc4b983639
support pushing to CappedMemoryCache 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:21:32 +02:00
Robin Appelman
d4a7cfec7c
rename fun to func 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:15:06 +02:00
Robin Appelman
fee818f493
Add tests for query builder (i)like 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:15:03 +02:00
Robin Appelman
3355fd549f
dont double escape 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:14:59 +02:00
Robin Appelman
07449a4885
update autoloader 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:14:56 +02:00
Robin Appelman
4125bdeb93
fix licence headers 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:14:52 +02:00
Robin Appelman
4b7bc2af0e
Move all children of a folder in a single query 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:14:48 +02:00
Robin Appelman
4279b13270
Add function builder to the query builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:09:26 +02:00
Robin Appelman
a65652fc1e
add support for escaping like parameters when using the query builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:09:22 +02:00
Robin Appelman
83f3990e06
Add MD5() to sqlite 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:09:19 +02:00
Lukas Reschke
1ee7e1c0b1 Merge pull request #4132 from nextcloud/fix-safari-gzip 
Fix gzip files for Safari
 2017-03-30 10:47:28 +02:00
Roeland Jago Douma
4debe9b080
[3rdparty] Bump phpseclib to 2.0.4 
See: https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-30 09:43:59 +02:00
Morris Jobke
85fcd42065 Merge pull request #4100 from nextcloud/header-indicator 
show triangle below user menu too when an entry inside there is active
 2017-03-29 21:43:18 -06:00
Nextcloud bot
f984cf0987
[tx-robot] updated from transifex 2017-03-30 00:07:41 +00:00
Morris Jobke
e8f2ee769b Merge pull request #4142 from nextcloud/numeric_avatar 
Allow avatars for full numeric users
 2017-03-29 17:17:19 -06:00
Morris Jobke
d17678b5b2 Merge pull request #4141 from nextcloud/ldap-downstream-9 
Convert the group limit to match the same behaviour as the user search
 2017-03-29 15:47:28 -06:00
Roeland Jago Douma
0da04fd284
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-29 22:54:08 +02:00
Roeland Jago Douma
0315e2ea36 Merge pull request #4145 from nextcloud/ldap-downstream-54 
Add tooltips to LDAP wizard special attributtes
 2017-03-29 19:31:35 +02:00
Roeland Jago Douma
6d8e447895 Merge pull request #4108 from nextcloud/color-variable-rename 
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
 2017-03-29 19:13:36 +02:00
Roeland Jago Douma
636575e3de Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid 
Ldap no memberof with memberuid
 2017-03-29 19:12:51 +02:00
Roeland Jago Douma
111c9f7563
Don't add the Encryption Storage Wrapper if there are no encryption modules 
fixes #4125

If there is no encryption module enabled it makes no sense to setup the
encryption wrapper (because we can't do anything anyway).

This saves reading the header of files.
Especialy on external storage/objectstore this should improve
performance

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-29 18:57:56 +02:00
Morris Jobke
c1030a34a5 Merge pull request #4062 from nextcloud/downstream-26872 
Adding dav resource for avatars
 2017-03-29 10:30:22 -06:00
Jan-Christoph Borchardt
354a24e0aa
also rename defaultMailHeaderColor to defaultColorPrimary 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-29 18:23:23 +02:00
Julius Härtl
698396a927
Add fallback to getMailHeaderColor so we don't break existing themes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-29 18:23:23 +02:00
Jan-Christoph Borchardt
9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-29 18:23:23 +02:00
David Toledo
a4b9bd29a9
Add tooltips to LDAP wizard special attributtes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-03-29 14:38:01 +02:00
Roeland Jago Douma
54c68519ce
Allow avatars for full numeric users 
Fixes #4087

Because of fancy javascript if a full numeric uid was used javascript
would convert this to an int. Now we just convert everything to a string
first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-29 13:39:48 +02:00
Juan Pablo Villafáñez
4622bebded
Include tests for "default" and "none" quotas 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez
3676189e05
Add comments in the updateQuota method to explain the behavior 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-03-29 13:32:16 +02:00