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

385 commits

Author SHA1 Message Date
Nextcloud bot
35358bdde0
[tx-robot] updated from transifex 2016-08-12 00:10:18 +00:00
Lukas Reschke
8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Arthur Schiwon
3f9e1b3b45
adjust federation app 2016-08-11 18:53:45 +02:00
Nextcloud bot
56bf0a8399
[tx-robot] updated from transifex 2016-08-11 00:14:12 +00:00
Nextcloud bot
d6bee61131
[tx-robot] updated from transifex 2016-08-10 00:09:59 +00:00
Marius Blüm
352ec077a2 Merge pull request #789 from nextcloud/padding_federation 
Padding of federated servers
 2016-08-09 16:02:48 +02:00
Roeland Jago Douma
59a073c185
Padding of federated server 2016-08-09 14:42:01 +02:00
Marius Blüm
ba15687cc9 Merge pull request #767 from nextcloud/federation-error-messages 
improve federation error messages
 2016-08-09 14:28:11 +02:00
Bjoern Schiessle
50044fb792
improve federation error messages 2016-08-09 10:24:45 +02:00
Joas Schilling
dae6432ae7
Increment the versions and adjust the capitilization 2016-08-08 16:45:40 +02:00
Nextcloud bot
c44c9a55f4
[tx-robot] updated from transifex 2016-08-05 00:10:09 +00:00
Nextcloud bot
50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
Nextcloud bot
2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Nextcloud bot
937577f7bc
[tx-robot] updated from transifex 2016-07-29 00:09:49 +00:00
Nextcloud bot
95a0714973
[tx-robot] updated from transifex 2016-07-27 00:09:48 +00:00
Nextcloud bot
7d969962db
[tx-robot] updated from transifex 2016-07-25 00:09:09 +00:00
Nextcloud bot
a20f4c432b
[tx-robot] updated from transifex 2016-07-24 00:09:10 +00:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex 2016-07-23 00:09:06 +00:00
Joas Schilling
7400ff05ac
Also increase the min version 2016-07-22 14:46:52 +02:00
Robin Appelman
6062b6365b bumb compatible app versions for core apps 2016-07-22 13:04:23 +02:00
Joas Schilling
03cb588ea9 Merge pull request #500 from nextcloud/bump_version 
Bump version
 2016-07-22 10:03:42 +02:00
Nextcloud bot
4b4990c48f
[tx-robot] updated from transifex 2016-07-22 00:10:05 +00:00
Joas Schilling
0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +02:00
Joas Schilling
86129a8b88
Increase app versions 2016-07-21 15:50:30 +02:00
Lukas Reschke
e55c1542fa
Use proper branding 
Stable9 has this already
 2016-07-21 02:24:36 +02:00
Nextcloud bot
b23d3c6418
[tx-robot] updated from transifex 2016-07-18 14:08:51 +00:00
Joas Schilling
2c988ecbf4
Use the themed Defaults everywhere 2016-07-15 09:17:30 +02:00
Nextcloud bot
4aae157087
[tx-robot] updated from transifex 2016-07-10 00:09:23 +00:00
Nextcloud bot
c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00:00
Robin Appelman
4de7476f58
Allow null 2016-07-08 12:35:58 +02:00
Robin Appelman
8f84c99e3f
Fix undefined properties 2016-07-08 12:35:16 +02:00
Nextcloud bot
4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Nextcloud bot
da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Lukas Reschke
179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Jenkins for ownCloud
894b7d93f6 [tx-robot] updated from transifex 2016-06-28 01:57:10 -04:00
Morris Jobke
5961d5aae4 Add app:check-code for already compatible apps 
* admin_audit, comments, federation
* removed not needed call to OC_Util::checkAdminUser() (is already
  done by the request handler before)
 2016-06-27 16:50:10 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Morris Jobke
9107fd6cd6
fix federation strings 2016-06-20 13:13:37 +02:00
Sergio Bertolín
2fe67ecc3c Changed global variable to local 2016-06-17 07:35:23 +00:00
Jenkins for ownCloud
3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Vincent Petry
67c3a97401 Merge pull request #25046 from owncloud/fix-the-realm 
Use the correct realm for basic authentication
 2016-06-10 10:41:46 +02:00
Jenkins for ownCloud
e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Thomas Müller
cf06b17df1
Use the correct realm for basic authentication - fixes #23427 2016-06-09 13:53:32 +02:00
Sergio Bertolín
6bc7e3f92f Removed old html 2016-06-08 11:11:30 +00:00
Sergio Bertolín
b8493629ae Improve readability 2016-06-08 10:19:18 +00:00
Sergio Bertolín
e0aaa21bd8 Fixed problem about removing trusted servers accidentally 2016-06-08 09:02:05 +00:00
Lukas Reschke
aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Jenkins for ownCloud
f1f7511c61 [tx-robot] updated from transifex 2016-05-24 15:24:38 -04:00
Joas Schilling
a6b4ba9ba1
Fix errors in the tests 2016-05-19 09:48:00 +02:00
Joas Schilling
da332c134e
Move federation tests to PSR-4 2016-05-19 09:48:00 +02:00
Joas Schilling
0c727f1755
Move federation code to PSR-4 2016-05-19 09:48:00 +02:00
Jenkins for ownCloud
bafa02d312 [tx-robot] updated from transifex 2016-05-16 01:54:58 -04:00
Jenkins for ownCloud
7c28f62e20 [tx-robot] updated from transifex 2016-05-15 01:55:34 -04:00
Joas Schilling
eea98f1d74 Background jobs from info.xml (#24582) 
* Move background job registration of Federation to info.xml

* Move background registration of Files app to info.xml

* Move background job registration of files_sharing to info.xml

* Move background job registration of files_trashbin to info.xml

* Move background job registration of files_versions to info.xml

* Move background job registration from user_ldap to info.xml
 2016-05-12 10:43:43 +02:00
Jenkins for ownCloud
5d35844aff [tx-robot] updated from transifex 2016-05-08 01:54:53 -04:00
Jenkins for ownCloud
023c8b0eac [tx-robot] updated from transifex 2016-04-30 01:55:54 -04:00
Jenkins for ownCloud
14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Jenkins for ownCloud
4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Jenkins for ownCloud
82da373ee7 [tx-robot] updated from transifex 2016-03-31 01:55:24 -04:00
Jenkins for ownCloud
dd5bbc31f2 [tx-robot] updated from transifex 2016-03-29 01:55:16 -04:00
Jenkins for ownCloud
a092fe3bf8 [tx-robot] updated from transifex 2016-03-28 01:55:08 -04:00
Jenkins for ownCloud
3e33b686b1 [tx-robot] updated from transifex 2016-03-26 01:55:15 -04:00
Jenkins for ownCloud
4b3af9dfe7 [tx-robot] updated from transifex 2016-03-24 01:57:28 -04:00
Jenkins for ownCloud
e6fb139eb9 [tx-robot] updated from transifex 2016-03-23 01:57:22 -04:00
Thomas Müller
36e1476270 Merge pull request #23388 from owncloud/issue-22887-infinite-background-job-loop-for-old-versions 
Do not create a new job when federation failed to connect but use existing job
 2016-03-21 18:04:02 +01:00
Joas Schilling
b7f7fc7241 Do not create a new job when it failed to connect atm 2016-03-21 10:29:53 +01:00
Jenkins for ownCloud
35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Jenkins for ownCloud
1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Jenkins for ownCloud
9c053ed465 [tx-robot] updated from transifex 2016-03-19 01:55:39 -04:00
Jenkins for ownCloud
2c6617da60 [tx-robot] updated from transifex 2016-03-15 01:55:47 -04:00
Jenkins for ownCloud
1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00
Jenkins for ownCloud
afe3fdbf49 [tx-robot] updated from transifex 2016-03-09 01:55:42 -05:00
Jenkins for ownCloud
a8bafb9bf3 [tx-robot] updated from transifex 2016-03-08 01:55:39 -05:00
Jenkins for ownCloud
c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Jenkins for ownCloud
a98f5c03dc [tx-robot] updated from transifex 2016-03-05 01:56:08 -05:00
Lukas Reschke
1b64982e27 Automatically enable "federation" app 2016-03-04 17:38:51 +01:00
Jenkins for ownCloud
bcc200cf9b [tx-robot] updated from transifex 2016-03-04 01:55:53 -05:00
Jenkins for ownCloud
8b76e8c57b [tx-robot] updated from transifex 2016-03-03 01:56:04 -05:00
Joas Schilling
1b3e7ae82b Translate strings of federation admin section 2016-03-02 12:54:53 +01:00
Joas Schilling
8885cb1eb9 Increase all versions on master which is now 9.1 2016-03-02 08:53:42 +01:00
Lukas Reschke
c430f5ba53 Map Maci 2016-03-01 17:45:05 +01:00
Lukas Reschke
933f60e314 Update author information 
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
 2016-03-01 17:25:15 +01:00
Thomas Müller
a83af96dd3 Merge pull request #22686 from owncloud/cleanup_remote_address_books 
remove remote address book if access was revoked
 2016-03-01 14:46:51 +01:00
Bjoern Schiessle
1832bd0fa1 increase version number 2016-03-01 11:21:24 +01:00
Jenkins for ownCloud
a06f59c580 [tx-robot] updated from transifex 2016-03-01 01:55:33 -05:00
Bjoern Schiessle
9e9cb73987 fix doc-block 2016-02-29 16:50:34 +01:00
Bjoern Schiessle
87e47afed8 remove synced remote address book if the remote server revoked access to his system address book 2016-02-29 16:50:34 +01:00
Bjoern Schiessle
7189c72c33 remove remote address book if the admin removes the server from the trusted servers list 2016-02-29 16:50:33 +01:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Bjoern Schiessle
eccd7cf654 reuse the url_hash instead of calculating a new hash for the address book 2016-02-26 20:00:13 +01:00
Jenkins for ownCloud
5718402277 [tx-robot] updated from transifex 2016-02-26 01:55:44 -05:00
Jenkins for ownCloud
32f4bea0ae [tx-robot] updated from transifex 2016-02-25 01:58:06 -05:00
Jenkins for ownCloud
fe29feae9a [tx-robot] updated from transifex 2016-02-17 01:56:11 -05:00
Thomas Müller
3503eb69f2 Adding transifex to new core apps 2016-02-16 14:40:10 +01:00
Bjoern Schiessle
9d1d08bf9b forbidden (403) is a valid return status, don't log the whole exception in this case 2016-02-15 18:03:10 +01:00
Bjoern Schiessle
835e70dbe2 throw exception if we don't find a token for a given server 2016-02-15 18:03:10 +01:00
Bjoern Schiessle
cc397da1be Remove background job if the server accepted to ask for the shared secret 
If we don't remove it the server will later ask the remote server to ask for
the shared secret which will result in a error log message on the remote server
and in some circumstances maybe even to a failure
 2016-02-15 18:03:10 +01:00
Thomas Müller
bc8632856a Forward exception message to the admin in case of errors and in case the remote server version is to low and appropriate message is displayed as well 2016-02-09 14:41:26 +01:00
Thomas Müller
333bb5a227 Merge pull request #22050 from owncloud/fix_sync_addressbook 
pass parameter in the right order to syncRemoteAddressBook()
 2016-02-01 23:20:42 +01:00
Björn Schießle
2f739a89f5 pass parameter in the right order to syncRemoteAddressBook() 2016-02-01 16:30:05 +01:00
Björn Schießle
2d469e39af catch all exceptions 2016-02-01 13:39:13 +01:00
Björn Schießle
8e3fcb120f add context to the error messages 2016-02-01 13:38:46 +01:00
Lukas Reschke
a0cb52c90e Fix PHPDoc and signature 2016-01-26 17:27:58 +01:00
Thomas Müller
2d7528bc64 Adding unit tests 2016-01-25 11:39:57 +01:00
Thomas Müller
7909c47b7c Sync federated clouds using a cron job 2016-01-22 14:58:49 +01:00
Thomas Müller
c5a200c419 Merge pull request #21653 from owncloud/update-license-headers-2016 
Update license headers 2016
 2016-01-13 08:29:42 +01:00
Thomas Müller
682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Björn Schießle
e7a8be2588 fix doc-block 2016-01-12 14:24:47 +01:00
Thomas Müller
94856cb892 Catch exceptions during sync 2016-01-12 14:24:47 +01:00
Thomas Müller
ca8c9f6ad5 federation has to be of type filesystem so that we load this app for webdav requests 2016-01-12 14:24:47 +01:00
Thomas Müller
693617d8a5 Inject DbHandler .... 2016-01-12 14:24:47 +01:00
Thomas Müller
6d223df2f4 md5 -> sha1 2016-01-12 14:24:47 +01:00
Thomas Müller
1a20af253b Adding tests and adjust PHPDoc 2016-01-12 14:24:47 +01:00
Thomas Müller
0bf026ccea Fix registration of sync command 2016-01-12 14:24:47 +01:00
Thomas Müller
90d9834c8c Decouple federation and dav app 2016-01-12 14:24:47 +01:00
Thomas Müller
dbddbb634b Use EventDispatcher to allow additional setup of auth backends - move federation auth to federation app 2016-01-12 14:24:01 +01:00
Thomas Müller
cdc536c423 Allow trusted servers to authenticate 2016-01-12 14:24:01 +01:00
Roeland Jago Douma
07fd3889b1 Fix unit tests 2016-01-11 20:29:48 +01:00
Roeland Jago Douma
876fb83ddc getMediumStrengthGenerator is deprecated and does not do anything anymore 2016-01-11 20:06:30 +01:00
Joas Schilling
40f786060e Add ownCloud min and max version for shipped apps 2016-01-07 15:11:49 +01:00
Robin Appelman
ef9a231f6c Add error logging to federated sharing handshake 2015-12-21 16:37:54 +01:00
Lukas Reschke
f3360d51c6 Use PHP polyfills 2015-12-11 08:47:36 +01:00
Thomas Müller
f9fc254672 Add DB group to some files_external tests 
Adding group Db to federation tests and ldap tests

Add group DB to Test_UrlGenerator

Adding group DB to trashbin and versions tests

Adding group DB to Test_Util_CheckServer for pg
 2015-11-30 10:55:10 +01:00
Jan-Christoph Borchardt
38abdc1007 add icon for Federation app 2015-11-25 16:06:36 +01:00
Thomas Müller
9a8bdeb7fb Remove invalid use statement 2015-11-24 16:19:25 +01:00
Björn Schießle
9546b21d7e always store server url without a trailing slash 2015-11-24 13:15:55 +01:00
Björn Schießle
964fa1fce3 use hooks to auto add server to the list of trusted servers once a federated share was created 2015-11-24 11:34:38 +01:00
Björn Schießle
a63a1043b6 unit tests 2015-11-20 15:48:20 +01:00
Thomas Müller
f6446a64b6 fixing OCI and others 2015-11-19 18:07:39 +01:00
Björn Schießle
6f7aa3392f make sure that both server don't try to exchange the shared secret in parallel 2015-11-19 18:07:33 +01:00
Björn Schießle
2754afc074 add option to auto add servers to the list of trusted servers once a federated share was created and accepted successfully 2015-11-19 18:07:25 +01:00
Björn Schießle
8f55b1a27d add status to server list 2015-11-19 18:07:17 +01:00
Björn Schießle
698100d279 exchange shared secret 2015-11-19 18:06:51 +01:00
Björn Schießle
ed039ee5eb added app "federation", allows you to connect ownClouds and exchange user lists 2015-11-19 18:06:38 +01:00