Merge branch 'staging' into extends-config-json

README.md

@@ -47,7 +47,7 @@ Current Sib App capabilities:
 | Base | `djangoldp_account`, `djangoldp_profile`, `djangoldp_notification`, `oidc_provider` | `users` |
 | Circles | `djangoldp_circle` | `circles` |
 | Projects | `djangoldp_project` | `projects`, `customers` |
-| Events | `djangoldp_event` | `events` |
+| Events | `djangoldp_event` | `events`, `typeevents`, `uploads` |
 
 Federated Sib App needs to use `config.sample.federated.json` example.
 

config.sample.federated.json

@@ -12,14 +12,18 @@
       "projects": "http://localhost:8000/projects/",
       "customers": "http://localhost:8000/customers/",
       "events": "http://localhost:8000/events/",
-      "users": "http://localhost:8000/users/"
+      "typeevents": "http://localhost:8000/typeevents/",
+      "users": "http://localhost:8000/users/",
+      "uploads": "http://localhost:8000/upload/"
     },
     "post": {
       "circles": "http://localhost:8000/circles/",
       "projects": "http://localhost:8000/projects/",
       "customers": "http://localhost:8000/customers/",
       "events": "http://localhost:8000/events/",
-      "users": "http://localhost:8000/users/"
+      "typeevents": "http://localhost:8000/typeevents/",
+      "users": "http://localhost:8000/users/",
+      "uploads": "http://localhost:8000/upload/"
     }
   }
 }

config.sample.json

@@ -11,6 +11,8 @@
     "projects": "http://localhost:8000/projects/",
     "customers": "http://localhost:8000/customers/",
     "events": "http://localhost:8000/events/",
-    "users": "http://localhost:8000/users/"
+    "typeevents": "http://localhost:8000/typeevents/",
+    "users": "http://localhost:8000/users/",
+    "uploads": "http://localhost:8000/upload/"
   }
 }