Skip to content

Commit 0a2c9ae

Browse files
authored
Merge pull request #233 from RoboSparrow/g3i
Rename org: Brightcookie to G3i
2 parents c9a1a76 + e41c243 commit 0a2c9ae

File tree

150 files changed

+174
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+174
-165
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ cache/*
1515
sami.phar
1616
docs/*
1717

18+
# composer
19+
composer.phar
20+
1821
# phpBench
1922
phpbench.phar
2023
phpbench.phar.pubkey

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
3434

3535
## Enforcement
3636

37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at enquiries@brightcookie.com.au. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at support@g3i.com.au. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
3838

3939
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
4040

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Lastly, visit the links listed in the *Additional Resources* section, below.
1414

1515
## Getting Started
1616

17-
* [Create a new issue](https://github.com/Brightcookie/lxHive/issues/new) for your issue. If a ticket
17+
* [Create a new issue](https://github.com/g3i/lxHive/issues/new) for your issue. If a ticket
1818
already exists for the issue, participate via the existing ticket.
1919
* Describe the issue clearly. If it is a bug, include steps to reproduce it.
2020
* Select an appropriate label for the issue.
@@ -42,7 +42,7 @@ For example:
4242
## Submitting Changes
4343

4444
* Push changes in your branch to your fork.
45-
* [Create a pull request](https://github.com/Brightcookie/lxHive/compare) and mention the issue it fixes [as described here](https://github.com/blog/1506-closing-issues-via-pull-requests).
45+
* [Create a pull request](https://github.com/g3i/lxHive/compare) and mention the issue it fixes [as described here](https://github.com/blog/1506-closing-issues-via-pull-requests).
4646
* You're done! Your changes will be reviewed. Please respond to comments and questions to your pull request until it is closed.
4747

4848
## Additional Resources

README.md

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
1-
21
# ![lxHive](./public/assets/images/lxHive.logo.png)
32

4-
* Current release: **0.10.0**
3+
* Current release: **0.10.1**
54
* Supports xAPI spec <= 1.0.3
65

7-
[![CircleCI branch](https://img.shields.io/circleci/project/github/Brightcookie/lxHive/master.svg)](https://circleci.com/gh/Brightcookie/lxHive/tree/master)
8-
[![lx-Test-Suite](https://img.shields.io/badge/lx--Test--Suite-82.75%25-yellowgreen.svg)](https://github.com/Brightcookie/lx-Test-Suite)
6+
[![CircleCI branch](https://img.shields.io/circleci/project/github/g3i/lxHive/master.svg)](https://circleci.com/gh/g3i/lxHive/tree/master)
7+
[![lx-Test-Suite](https://img.shields.io/badge/lx--Test--Suite-82.75%25-yellowgreen.svg)](https://github.com/g3i/lx-Test-Suite)
98
[![lrs-conformance-test-suite](https://img.shields.io/badge/lrs--conformance--test--suite-86.02%25-yellowgreen.svg)](https://github.com/adlnet/lrs-conformance-test-suite)
109
[![SensioLabs Insight](https://img.shields.io/sensiolabs/i/9e0e6f28-b099-4c84-ad85-ccf4de70d6a6.svg)](https://insight.sensiolabs.com/projects/9e0e6f28-b099-4c84-ad85-ccf4de70d6a6)
11-
[![GitHub issues](https://img.shields.io/github/issues/Brightcookie/lxHive.svg)](https://github.com/Brightcookie/lxHive/issues)
12-
[![GitHub forks](https://img.shields.io/github/forks/Brightcookie/lxHive.svg)](https://github.com/Brightcookie/lxHive/network)
13-
[![GitHub stars](https://img.shields.io/github/stars/Brightcookie/lxHive.svg)](https://github.com/Brightcookie/lxHive/stargazers)
14-
[![GitHub license](https://img.shields.io/badge/license-AGPL-blue.svg)](https://raw.githubusercontent.com/Brightcookie/lxHive/master/LICENSE.md)
10+
[![GitHub issues](https://img.shields.io/github/issues/g3i/lxHive.svg)](https://github.com/g3i/lxHive/issues)
11+
[![GitHub forks](https://img.shields.io/github/forks/g3i/lxHive.svg)](https://github.com/g3i/lxHive/network)
12+
[![GitHub stars](https://img.shields.io/github/stars/g3i/lxHive.svg)](https://github.com/g3i/lxHive/stargazers)
13+
[![GitHub license](https://img.shields.io/badge/license-AGPL-blue.svg)](https://raw.githubusercontent.com/g3i/lxHive/master/LICENSE.md)
14+
15+
> **Important note:** lxHive changes ownership. Our organisation name changes from *Brightcookie* to *G3 International*. Please update your remotes in your fork.
16+
17+
```bash
18+
# given your linked remote's name is "upstream"
19+
git remote set-url upstream <TODO>
20+
```
1521

1622
> **Important note:** Current version (0.10.0) is **not compatible** with older lxHive versions. It is not possible to upgrade a legacy lxHive instance.
1723
> This incompatibility is due to :
@@ -20,7 +26,7 @@
2026
> * a changed database model
2127
> * behavioural changes (permissions)
2228
>
23-
> See the [changelog](changelog.md) for more details. At the moment there are no plans to release an open source database migration script. Please [get in touch](https://www.brightcookie.com/contact-us/) with us should you need to migrate data.
29+
> See the [changelog](changelog.md) for more details. At the moment there are no plans to release an open source database migration script. Please [get in touch](https://g3i.com.au/contact-us/) with us should you need to migrate data.
2430
2531
## 1. <a name="introduction" />Introduction
2632

@@ -54,7 +60,7 @@ The application uses [MongoDB](https://www.mongodb.org/) and [PHP](http://php.ne
5460
| /agents | 1.0.2 | - | - | x | - | (JSON) retrieve a single agent | [xAPI, section 7.6](https://github.com/adlnet/xAPI-Spec/blob/1.0.2/xAPI.md#76-agent-profile-api)
5561
| /agents/profile | 1.0.2 | x | x | x | x | (JSON) CRUD - profile(s) of an actor | [xAPI, section 7.6](https://github.com/adlnet/xAPI-Spec/blob/1.0.2/xAPI.md#76-agent-profile-api)
5662

57-
* see our [wiki](https://github.com/Brightcookie/lxHive/wiki/List-of-xAPI-and-lxHive-Endpoints) for a complete list of lxHive endpoints
63+
* see our [wiki](https://github.com/g3i/lxHive/wiki/List-of-xAPI-and-lxHive-Endpoints) for a complete list of lxHive endpoints
5864

5965
## 4. <a name="installation" />Installation
6066

@@ -75,7 +81,7 @@ The application uses [MongoDB](https://www.mongodb.org/) and [PHP](http://php.ne
7581

7682
### Setup
7783

78-
* *Note: Check out our Wiki for a more comprehensive [step-by-step guide].(https://github.com/Brightcookie/lxHive/wiki/Step-by-step:-Install-lxHive-and-setup-authentication-for-your-app)*
84+
* *Note: Check out our Wiki for a more comprehensive [step-by-step guide].(https://github.com/g3i/lxHive/wiki/Step-by-step:-Install-lxHive-and-setup-authentication-for-your-app)*
7985

8086
#### 1. Application install and set-up
8187

@@ -135,7 +141,7 @@ Default file storage structure:
135141
### Documentation
136142

137143
* [Contributing guidelines](CONTRIBUTING.md)
138-
* [lxHive Wiki](https://github.com/Brightcookie/lxHive-Internal/wiki)
144+
* [lxHive Wiki](https://github.com/g3i/lxHive/wiki)
139145
* Compile code documentation: run `sh generate-docs.sh` from project root (file must be executable)
140146

141147
### Unit testing
@@ -148,9 +154,9 @@ Default file storage structure:
148154

149155
## 4. Contributors
150156

151-
The [Brightcookie](https://www.brightcookie.com/) team
157+
The [G3 International](https://g3i.com.au/) team
152158

153159
* Jakob Murko - systems architect, lead developer
154160
* Leo Gaggl - creator, mentor, conformance
155-
* Joerg Boeselt - development, tests, conformance, project management
161+
* Joerg Boeselt - lead developer, project and community manager, tests, conformance
156162
* Matthew Smith - alpha prototype

X

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
* This file is part of lxHive LRS - http://lxhive.org/
55
*
6-
* Copyright (C) 2017 Brightcookie Pty Ltd
6+
* Copyright (C) 2017 G3 International
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU General Public License as published by

benchmarks/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
* This file is part of lxHive LRS - http://lxhive.org/
44
*
5-
* Copyright (C) 2017 Brightcookie Pty Ltd
5+
* Copyright (C) 2017 G3 International
66
*
77
* This program is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License as published by

changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
>This version is **NOT COMPATIBLE** with older lxHive versions. (server requirements, codebase, database model).
44
5-
Currently there are no plans to release database migration functionality. Please launch a request to `support@brightcookie.com.au` if you need help with migrating records from older lxHive versions.
5+
Currently there are no plans to release database migration functionality. Please launch a request to `support@g3i.com.au` if you need help with migrating records from older lxHive versions.
66

77
#### Summary
88
Extensive changes in regards to stability, testability, reporting administration and configurability.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "brightcookie/lxhive",
3-
"description": "An open-source LRS from Brightcookie",
2+
"name": "g3i/lxhive",
3+
"description": "An open-source LRS from G3 International Pty Ltd",
44
"license": "GPL-3.0",
55
"keywords": ["experience api", "xapi", "lrs"],
66
"type": "project",

public/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
* This file is part of lxHive LRS - http://lxhive.org/
55
*
6-
* Copyright (C) 2017 Brightcookie Pty Ltd
6+
* Copyright (C) 2017 G3 International
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU General Public License as published by

src/xAPI/Admin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
* This file is part of lxHive LRS - http://lxhive.org/
55
*
6-
* Copyright (C) 2017 Brightcookie Pty Ltd
6+
* Copyright (C) 2017 G3 International
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)