Skip to content

Commit 131a658

Browse files
yomguyyomguy
committed
Merge branch 'feature/AGPL' into dev
2 parents 6604693 + a23a92c commit 131a658

65 files changed

Lines changed: 1061 additions & 738 deletions

Some content is hidden

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

‎LICENSE.txt‎

Lines changed: 640 additions & 318 deletions
Large diffs are not rendered by default.

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,13 @@ License
199199
=======
200200

201201
TimeSide is free software: you can redistribute it and/or modify
202-
it under the terms of the GNU General Public License as published by
202+
it under the terms of the GNU Affero General Public License as published by
203203
the Free Software Foundation, either version 2 of the License, or
204204
(at your option) any later version.
205205

206206
TimeSide is distributed in the hope that it will be useful,
207207
but WITHOUT ANY WARRANTY; without even the implied warranty of
208208
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
209-
GNU General Public License for more details.
209+
GNU Affero General Public License for more details.
210210

211211
See LICENSE for more details.

‎conf/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
# This file is part of TimeSide.
66

7-
# TimeSide is free software: you can redistribute it and/or modify
8-
# it under the terms of the GNU General Public License as published by
7+
# This program is free software: you can redistribute it and/or modify
8+
# it under the terms of the GNU Affero General Public License as published by
99
# the Free Software Foundation, either version 2 of the License, or
1010
# (at your option) any later version.
1111

1212
# TimeSide is distributed in the hope that it will be useful,
1313
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
# GNU General Public License for more details.
15+
# GNU Affero General Public License for more details.
1616

17-
# You should have received a copy of the GNU General Public License
17+
# You should have received a copy of the GNU Affero General Public License
1818
# along with TimeSide. If not, see <http://www.gnu.org/licenses/>.
1919

2020
# Authors:

‎conf/dev.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
# This file is part of TimeSide.
66

7-
# TimeSide is free software: you can redistribute it and/or modify
8-
# it under the terms of the GNU General Public License as published by
7+
# This program is free software: you can redistribute it and/or modify
8+
# it under the terms of the GNU Affero General Public License as published by
99
# the Free Software Foundation, either version 2 of the License, or
1010
# (at your option) any later version.
1111

1212
# TimeSide is distributed in the hope that it will be useful,
1313
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
# GNU General Public License for more details.
15+
# GNU Affero General Public License for more details.
1616

17-
# You should have received a copy of the GNU General Public License
17+
# You should have received a copy of the GNU Affero General Public License
1818
# along with TimeSide. If not, see <http://www.gnu.org/licenses/>.
1919

2020
# Authors:
@@ -26,6 +26,7 @@ app:
2626
volumes:
2727
- ./app/:/srv/app
2828
- ./:/srv/src/timeside/
29+
- ./doc/
2930
ports:
3031
- "9000:9000"
3132
env_file:
@@ -41,4 +42,4 @@ notebook:
4142
- "8888:8888"
4243
volumes_from:
4344
- app
44-
command: sh -c "cd /srv/src/timeside/doc/ipynb; jupyter notebook --no-browser --ip=0.0.0.0"
45+
command: sh -c "cd /srv/src/timeside/doc/ipynb; jupyter notebook --no-browser --ip=0.0.0.0"

‎conf/prod.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
# This file is part of TimeSide.
66

7-
# TimeSide is free software: you can redistribute it and/or modify
8-
# it under the terms of the GNU General Public License as published by
7+
# This program is free software: you can redistribute it and/or modify
8+
# it under the terms of the GNU Affero General Public License as published by
99
# the Free Software Foundation, either version 2 of the License, or
1010
# (at your option) any later version.
1111

1212
# TimeSide is distributed in the hope that it will be useful,
1313
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
# GNU General Public License for more details.
15+
# GNU Affero General Public License for more details.
1616

17-
# You should have received a copy of the GNU General Public License
17+
# You should have received a copy of the GNU Affero General Public License
1818
# along with TimeSide. If not, see <http://www.gnu.org/licenses/>.
1919

2020
# Authors:

‎conf/sqlite.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
# This file is part of TimeSide.
66

7-
# TimeSide is free software: you can redistribute it and/or modify
8-
# it under the terms of the GNU General Public License as published by
7+
# This program is free software: you can redistribute it and/or modify
8+
# it under the terms of the GNU Affero General Public License as published by
99
# the Free Software Foundation, either version 2 of the License, or
1010
# (at your option) any later version.
1111

1212
# TimeSide is distributed in the hope that it will be useful,
1313
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
# GNU General Public License for more details.
15+
# GNU Affero General Public License for more details.
1616

17-
# You should have received a copy of the GNU General Public License
17+
# You should have received a copy of the GNU Affero General Public License
1818
# along with TimeSide. If not, see <http://www.gnu.org/licenses/>.
1919

2020
# Authors:

‎doc/source/copyright.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ License
1515
=======
1616

1717
TimeSide is free software: you can redistribute it and/or modify
18-
it under the terms of the GNU General Public License as published by
19-
the Free Software Foundation, either version 2 of the License, or
18+
it under the terms of the GNU Affero General Public License as published by
19+
the Free Software Foundation, either version 3 of the License, or
2020
(at your option) any later version.
2121

2222
TimeSide is distributed in the hope that it will be useful,
2323
but WITHOUT ANY WARRANTY; without even the implied warranty of
2424
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25-
GNU General Public License for more details.
25+
GNU Affero General Public License for more details.
2626

27-
See LICENSE for more details.
27+
Read the LICENSE.txt file for more details.

‎docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
# This file is part of TimeSide.
66

7-
# TimeSide is free software: you can redistribute it and/or modify
8-
# it under the terms of the GNU General Public License as published by
7+
# This program is free software: you can redistribute it and/or modify
8+
# it under the terms of the GNU Affero General Public License as published by
99
# the Free Software Foundation, either version 2 of the License, or
1010
# (at your option) any later version.
1111

1212
# TimeSide is distributed in the hope that it will be useful,
1313
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
# GNU General Public License for more details.
15+
# GNU Affero General Public License for more details.
1616

17-
# You should have received a copy of the GNU General Public License
17+
# You should have received a copy of the GNU Affero General Public License
1818
# along with TimeSide. If not, see <http://www.gnu.org/licenses/>.
1919

2020
# Authors:

‎tests/test_run_all_doctests.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55

66
# This file is part of TimeSide.
77

8-
# TimeSide is free software: you can redistribute it and/or modify
9-
# it under the terms of the GNU General Public License as published by
10-
# the Free Software Foundation, either version 2 of the License, or
8+
# This program is free software: you can redistribute it and/or modify
9+
# it under the terms of the GNU Affero General Public License as published by
10+
# the Free Software Foundation, either version 3 of the License, or
1111
# (at your option) any later version.
1212

13-
# TimeSide is distributed in the hope that it will be useful,
13+
# This program is distributed in the hope that it will be useful,
1414
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1515
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
# GNU General Public License for more details.
16+
# GNU Affero General Public License for more details.
1717

18-
# You should have received a copy of the GNU General Public License
19-
# along with TimeSide. If not, see <http://www.gnu.org/licenses/>.
18+
# You should have received a copy of the GNU Affero General Public License
19+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
2020

2121
# Authors:
2222
# Thomas Fillon <thomas at parisson.com>

‎timeside/core/__init__.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44

55
# This file is part of TimeSide.
66

7-
# TimeSide is free software: you can redistribute it and/or modify
8-
# it under the terms of the GNU General Public License as published by
9-
# the Free Software Foundation, either version 2 of the License, or
7+
# This program is free software: you can redistribute it and/or modify
8+
# it under the terms of the GNU Affero General Public License as published by
9+
# the Free Software Foundation, either version 3 of the License, or
1010
# (at your option) any later version.
1111

12-
# TimeSide is distributed in the hope that it will be useful,
12+
# This program is distributed in the hope that it will be useful,
1313
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
# GNU General Public License for more details.
15+
# GNU Affero General Public License for more details.
1616

17-
# You should have received a copy of the GNU General Public License
18-
# along with TimeSide. If not, see <http://www.gnu.org/licenses/>.
17+
# You should have received a copy of the GNU Affero General Public License
18+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
#
2020
# Authors:
2121
# Thomas Fillon <thomas@parisson.com>

0 commit comments

Comments
 (0)