mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
37,988 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

37988 Commits

Author SHA1 Message Date
Roger Szabo 5e7723f15c restore ldap_password_renew_pr 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-03-31 15:16:22 +08: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
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
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
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
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
Juan Pablo Villafáñez ebd1a7d4b2
Add new testes to cover more cases 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez e9b96062e6
Adjust current tests to match the expectations 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez f9832ff347
Check if the user exists before trying to set the quota 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez 3345a72e7e
Correctly apply quota 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-03-29 13:32:11 +02:00
Juan Pablo Villafáñez 9e2e0c4c30
Convert the group limit to match the same behaviour as the user search 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-03-29 12:49:08 +02:00
Roeland Jago Douma 626d03e3d4 Merge pull request #4116 from nextcloud/swift-cache-token 
Cache swift authentication token in memcache
 2017-03-29 11:23:13 +02:00
Roeland Jago Douma 00839a5ac5 Merge pull request #4066 from nextcloud/always-fix-the-values-live 
Directly fix invalid values of DTEND and DTSTART
 2017-03-29 10:13:10 +02:00
Joas Schilling a88edce54f Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-p 
Replace unecessary unescaped prints with print
 2017-03-29 10:02:10 +02:00
Joas Schilling 784e06073b Merge pull request #4129 from nextcloud/remove-verbose-error-message 
Remove verbose error message
 2017-03-29 10:01:17 +02:00
Morris Jobke ac7ca1c3a8 Merge pull request #4060 from nextcloud/shared_by_for_own_calendars 
fix bug with shared_by for own calendars if shared
 2017-03-29 00:29:54 -06:00
Morris Jobke 9813023aab
Fix gzip files for Safari 
* Safari support gzip only if the filename does not
  end on .gz - so this renames them to .gzip

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-29 00:11:51 -06:00
Morris Jobke 05f2596311 Merge pull request #4091 from nextcloud/Rudloff-manifest 
Web app manifest for adding to Android home screen
 2017-03-28 21:36:54 -06:00
Morris Jobke f9bc53146d
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-28 21:00:12 -06:00
Pierre Rudloff 19d3133ccf
Web app manifest 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-28 18:39:57 -06:00
Nextcloud bot 58513255d2
[tx-robot] updated from transifex 2017-03-29 00:07:41 +00:00