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

37347 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frank Isemann
3c18096812 Serve robots.txt if the RewriteBase is configured 2017-03-06 21:55:29 +01:00
Nextcloud bot
15673bc601
[tx-robot] updated from transifex 2017-03-06 01:07:58 +00:00
Nextcloud bot
1d5e94a4f2
[tx-robot] updated from transifex 2017-03-05 01:07:46 +00:00
Nextcloud bot
badb45fce4
[tx-robot] updated from transifex 2017-03-04 01:07:41 +00:00
Roeland Jago Douma
53a484ede6 Merge pull request #3597 from nextcloud/remove-data-from-lookup-server 
add posibility to remove all personal data from lookup server
 2017-03-03 14:31:21 +01:00
Roeland Jago Douma
8e27b8197d Merge pull request #3684 from nextcloud/run-lang-update-only-once 
Execute UpdateLanguageCode only once
 2017-03-03 13:51:32 +01:00
Roeland Jago Douma
f8c459f1a4 Merge pull request #3607 from nextcloud/api-to-resend-welcome-message 
OCS API endpoint to resend welcome message
 2017-03-03 13:50:30 +01:00
Roeland Jago Douma
e54b9d3fcd Merge pull request #3678 from nextcloud/issue-3677-caldav-sharing-permission-problem 
CalDAV sharing permissions should not depend on the order
 2017-03-03 13:48:33 +01:00
Joas Schilling
0beb78517f
Fix DI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-03 12:20:02 +01:00
Joas Schilling
9f82bb9b4f Merge pull request #3689 from nextcloud/cleanup-legacy-classes 
Cleanup not used legacy classes
 2017-03-03 12:04:27 +01:00
Joas Schilling
342ee51dad
Make the test useful 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-03 12:01:38 +01:00
Joas Schilling
dd646fdf58 Merge pull request #3687 from nextcloud/proper-transfer-ownership-date 
Use a proper date format for transfer ownership
 2017-03-03 11:56:59 +01:00
Joas Schilling
29e9b1f3d5 Merge pull request #3686 from nextcloud/downstream-27282 
filelist only refreshed if directory changes
 2017-03-03 11:55:53 +01:00
Roeland Jago Douma
e648b8cb6d Merge pull request #3682 from whitekiba/master 
Remove deprecated OC_User::isLoggedIn
 2017-03-03 09:23:42 +01:00
Morris Jobke
6174a514b7
Get rid of static OCS::notFound() 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-03 00:41:21 -06:00
Morris Jobke
d85a351e77
Cleanup not used legacy classes 
* Person was removed via #2170
* other lcasses/interfaces are not used at all

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-03 00:31:33 -06:00
Morris Jobke
503a9160ae
Use a proper date format for transfer ownership 
* on Windows : is not allowed as filename and doesn't get synced then
* uses 2017-03-02 22-00-00 instead of 2017-03-02T22:00:00+00:00 as format

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-02 22:36:18 -06:00
Morris Jobke
8e9b119c5f Merge pull request #3681 from nextcloud/dav-nonexisting-owner 
handle non existing owners when handling dav requests
 2017-03-02 21:55:51 -06:00
Morris Jobke
0b12eb0640
Execute UpdateLanguageCode only once 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-02 21:53:36 -06:00
noveens
93f9db4d59
filelist only refreshed if directory changes 
check introduced at another method

comment added to explain one check

comment added to explain one check

unit tests added

small fixes in unit tests

missing semicolon added

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-02 21:43:44 -06:00
Nextcloud bot
b55ce43ba5
[tx-robot] updated from transifex 2017-03-03 01:07:45 +00:00
Sebastian Wessalowski
e399097e3a Remove deprecated OC_User::isLoggedIn 
Signed-off-by: Sebastian Wessalowski <sebastian@wessalowski.org>
 2017-03-02 22:59:39 +01:00
Nextcloud bot
53195b156c
[tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Robin Appelman
8f289286a7
handle non existing owners when handling dav requests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-02 15:26:00 +01:00
Joas Schilling
0ef15f93c4 Merge pull request #1377 from nextcloud/improve-finish-l10n 
Change language code from fi_FI to fi
 2017-03-02 12:44:10 +01:00
Joas Schilling
2eb27c636d
Make sure shares use read-write when available 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-02 12:28:57 +01:00
Joas Schilling
6dbdca0721
Don't waste energy unless necessary 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-02 12:28:56 +01:00
Joas Schilling
d8b769bd85
Add a unit test for the broken case 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-02 12:28:56 +01:00
Joas Schilling
2da490bf25
Unit test cleanup 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-02 12:28:56 +01:00
Joas Schilling
5d4cc4a17b Merge pull request #3676 from individual-it/trash_problem 
fix for #3201
 2017-03-02 09:47:52 +01:00
Joas Schilling
a7da76ea8a Merge pull request #3674 from nextcloud/transifex-for-theming 
Transifex config for theming app
 2017-03-02 09:33:57 +01:00
Joas Schilling
ba472f7ce0
Fix table name and add a test for more than 1 entries 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-02 09:11:47 +01:00
Artur Neumann
b0980ee2b8 fix for #3201 2017-03-02 13:16:28 +05:45
Artur Neumann
4f071f61c6 Revert "fix mouse pointer" 
This reverts commit a4e2dc3033.
 2017-03-02 12:55:16 +05:45
Morris Jobke
1bcd396679
Change language code for languages with only one translation 
* then the language is not that specific and get also matched for fi
* fallback from fi_FI to fi is supported - the other way around not
* contains repair script
* contains tests for repair script
* fixes #869

Order results to make postgres happy

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-01 22:35:28 -06:00
Morris Jobke
9b95ecb6a1
Transifex config for theming app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-01 22:05:25 -06:00
Morris Jobke
4a4067a378 Merge pull request #3666 from nextcloud/fix-return-type 
Fix return type of share provider
 2017-03-01 19:38:40 -06:00
Nextcloud bot
a64c8637d9
[tx-robot] updated from transifex 2017-03-02 01:07:31 +00:00
Morris Jobke
766fa87cf8 Merge pull request #3370 from Flole998/Flole998-patch-1 
Fix for Win Clients sometimes not connecting
 2017-03-01 13:07:06 -06:00
Joas Schilling
7f54013fdb
Fix return type of share provider 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-01 13:45:04 +01:00
Nextcloud bot
aecec74a04
[tx-robot] updated from transifex 2017-03-01 01:07:42 +00:00
Morris Jobke
552921d429
Fix injection of defaults 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-28 16:30:34 -06:00
Morris Jobke
50f3efad6f
OCS API endpoint to resend welcome message 
* send a POST request to ocs/v1.php/cloud/users/USERNAME/resendWelcomeMessage to trigger
  the welcome message to be send
* fixes #3367

example curl statement:

  curl -i https://example.org/ocs/v1.php/cloud/users/USERNAME/welcome -H  "OCS-APIRequest: true" -u admin:password -X POST

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-28 16:30:33 -06:00
Roeland Jago Douma
5fc924f6c9 Merge pull request #3649 from nextcloud/bugfix/saving-backup-codes-data-uri 
Fix saving backup codes by using a correct data uri
 2017-02-28 22:03:38 +01:00
Roeland Jago Douma
383e30e57e Merge pull request #3650 from nextcloud/bugfix/tokenprovider-asserted-method-name 
DefaultTokenProviderTest mocked/asserted the wrong method
 2017-02-28 20:24:11 +01:00
Morris Jobke
aa4d9a0e43 Merge pull request #3651 from nextcloud/refactor/provisioning-usercontroller-test 
Refactor provision api app's UserControllerTest
 2017-02-28 13:12:41 -06:00
Lukas Reschke
b5a6f03362 Merge pull request #3643 from nextcloud/replace-deprecated-tipsy 
Replace deprecated $.tipsy(...) by $.tooltip(...)
 2017-02-28 10:49:14 +01:00
Christoph Wurst
8e370bbf28
Refactor provision api app's UserControllerTest 
* Replace deprecated getMock with createMock
* Use createMock consistently
* Use php's ::class references

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-28 10:40:49 +01:00
Christoph Wurst
e782f90d98
DefaultTokenProviderTest mocked/asserted the wrong method 
It's 'getRemember' instead of 'getRememberMe', hence some warnings
were generated by phpunit.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-28 10:26:19 +01:00
Christoph Wurst
2f980ca76c
Fix saving backup codes by using a correct data uri 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-28 10:20:30 +01:00