Skip to content
This repository was archived by the owner on Aug 13, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
b0c1218
switching base linux flavour
Apr 13, 2023
fe33444
switch db from mysql to mariadb. change to modern docker compose command
Apr 13, 2023
fddc9ee
updated nodejs. updated elasticsearch
Apr 13, 2023
275b30a
Pulled down update to client submodules / updated client to tag 6.0.20
Apr 13, 2023
76cb689
- Moved tinymceclean server to separate container
uniuuu Apr 24, 2023
8f79915
pre-alpha
uniuuu Apr 24, 2023
85f61a5
split dataserver into separate directory
uniuuu Apr 24, 2023
e431598
edit readme
uniuuu Apr 24, 2023
4efcfdd
added custom submodule repositories with dockerfiles
uniuuu Apr 24, 2023
f08c5ac
Moved Zend from dataserver directory and attached it as a volume in d…
uniuuu Apr 24, 2023
6345f4e
Moved modified files out from dataserver
uniuuu Apr 25, 2023
703869a
Added LICENSE
uniuuu Apr 25, 2023
74cd548
Added dataserver as the submodule to the project.
uniuuu Apr 25, 2023
f7699ce
Removed unused pacakges from Dockerfile.
uniuuu Apr 25, 2023
9330643
Install only required dependencies and no recommended dependencies in…
uniuuu Apr 25, 2023
635f427
Added debug to Dockerfile. Print Apache2 log to docker log.
uniuuu Apr 25, 2023
e3abb88
Removed unused packages.
uniuuu Apr 25, 2023
6b7b8b7
Updated README.
uniuuu Apr 25, 2023
027c1d4
Renamed docker compose services and docker images. Adding docker imag…
uniuuu Apr 26, 2023
bae7306
Moved docker-compose.yml to root folder. Fix CI.
uniuuu Apr 26, 2023
f8cb583
Added dataserver PHP composer CI, streamserver CI. Fix dataserver ima…
uniuuu Apr 26, 2023
f753bfd
reorganizing folder structure
uniuuu Apr 26, 2023
20f9b9f
fix CI
uniuuu Apr 26, 2023
7af807a
updated modules with forked synced repos
uniuuu Apr 27, 2023
5da9200
switch to the lastest version of dataserver
uniuuu Apr 27, 2023
42a63d4
updated license to AGPL-3.0-only
uniuuu Apr 27, 2023
811097c
Enable headers mod. Fix.
uniuuu Apr 28, 2023
599caa0
Fix dbinit errors
uniuuu Apr 28, 2023
dbbfb0d
Fix config error
uniuuu Apr 28, 2023
afe1080
Draft: Added script to apply db_updates
uniuuu Apr 28, 2023
e45a354
fix client config
uniuuu Apr 28, 2023
84a58e6
Draft: Adding clinet build in docker
uniuuu Apr 28, 2023
5969ba5
Clinet building in docker. Minio stick to self built. Stream-server u…
uniuuu Apr 28, 2023
1816820
Pulled down update to submodules
uniuuu Apr 29, 2023
eaf78e3
Added Clinet Build Test CI
uniuuu Apr 29, 2023
6a7e1cb
Converted dataserver image to alpine
uniuuu Apr 29, 2023
7bd3c55
Pulled down update to client submodules
uniuuu Apr 29, 2023
d31cdcf
Fix client build throught docker
uniuuu Apr 29, 2023
daa5dbd
Add kubernetes and Helm Charts
uniuuu Apr 29, 2023
e0e52f9
Fixed dataserver issue.
uniuuu Apr 29, 2023
bdfda5d
Update README
uniuuu Apr 29, 2023
bb9300b
udpated branch for submodules
uniuuu May 1, 2023
fe58f19
Added CI readme
uniuuu May 1, 2023
cb3caab
Update README.md
uniuuu May 2, 2023
59d889b
Update README.md
uniuuu May 2, 2023
41db1bf
fix k8sbuildimage
uniuuu May 5, 2023
6365a6f
k8s progress
uniuuu May 5, 2023
6378dde
k8s progress
uniuuu May 5, 2023
12dffbd
change name convention for containers
uniuuu May 5, 2023
2ec77e9
change name convention for containers
uniuuu May 5, 2023
b020387
Fix dataserver
uniuuu May 5, 2023
ca595ea
Updated minio to the latest. Added minio/mc container
uniuuu May 7, 2023
c2607bf
Fix PHP dataserver CI
uniuuu May 7, 2023
a58235c
fix: [JavaScript Error: "Unexpected file registration status 400 (1/ …
uniuuu May 8, 2023
e2fb22f
feat: added logs folder to gitignore dockerignore
uniuuu May 8, 2023
3e2be68
fix: Rework on dataserver Dockerfile. All php extensions from zotprim…
uniuuu May 10, 2023
35efbb2
MySQL version
uniuuu May 10, 2023
94264a1
feat: Switch back to Mariadb. Rearrange folders
uniuuu May 10, 2023
b0f598e
fix: Added way to build specific version of client
uniuuu May 10, 2023
54ec532
Fix bug.
uniuuu May 10, 2023
43b9ace
Prepare file for cherry-pick
uniuuu May 10, 2023
b71dcb1
- Added "filename" field when uploading data with POST. This forces
fversaci Jan 29, 2019
d04ee9d
fix: [JavaScript Error: "Unexpected file upload status 400 (1/ )"] E…
uniuuu May 10, 2023
2ef8f2d
fix: Added possibility to interactively enter server ip/hostname for …
uniuuu May 10, 2023
d562bd8
remove debug
uniuuu May 10, 2023
8a8ad67
PROD
uniuuu May 10, 2023
2adbe4e
master branch
uniuuu May 10, 2023
858b7dc
moved workflows readme into subfolder
uniuuu May 10, 2023
7384736
fix: reverted dataserver submodule to master
uniuuu May 10, 2023
9406a2c
Merge branch 'development' into production
uniuuu May 10, 2023
346a5aa
fix: updated CI workflows
uniuuu May 10, 2023
2463034
fix: updated clientbuildtest.Dockerfile
uniuuu May 10, 2023
296a245
fix: clientbuildtest.Dockerfile
uniuuu May 10, 2023
7b7dec8
Merge branch 'development' into production
uniuuu May 10, 2023
6bae761
fix: Added elasticsearch RAM limit
uniuuu May 16, 2023
9e29d9a
Merge branch 'production'
uniuuu May 16, 2023
ee087ad
Squashed commit of the following:
uniuuu May 23, 2023
380ed6c
Merge branch 'production'
uniuuu May 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
15 changes: 15 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
**/secret.json
**/secret.txt
**/secret.yaml
.git
.github
.env
.vscode/
bin
build
doc
docker-compose.yml
logs
#Zend
zotprime-k8s

20 changes: 20 additions & 0 deletions .env_example
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Ip/host of the Dataserver.
DSHOST=http://localhost:8080/

#Version
VER=2.6.1-rc

# Ip/host of the Minio.
S3HOST=10.5.5.1:9000

## SECRETS
#DB
MYSQLROOTPASSWORD=zotero
MYSQLDATABASE=zotprimeprod
MYSQLUSER=zotprimeprod
MYSQLPASSWORD=zotprimeprod

#MINIO
MINIOROOTUSER=zotero
MINIOROOTPASSWORD=zoterodocker

10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.env
build
logs
**/secret*.json
**/secret*.txt
**/secret*.yaml
**/zotprime*secret.yaml
docker-compose.yml
**/cred.json
.vscode/
20 changes: 12 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
[submodule "include/Elastica"]
path = include/Elastica
url = https://github.com/ruflin/Elastica.git
[submodule "tinymce-clean-server"]
path = tinymce-clean-server
url = https://github.com/zotero/tinymce-clean-server
url = https://github.com/uniuuu/tinymce-clean-server
branch = stage
[submodule "stream-server"]
path = stream-server
url = https://github.com/zotero/stream-server
url = https://github.com/uniuuu/stream-server
branch = stage
[submodule "client/zotero-client"]
path = client/zotero-client
url = https://github.com/zotero/zotero
url = https://github.com/uniuuu/zotero
[submodule "client/zotero-standalone-build"]
path = client/zotero-standalone-build
url = https://github.com/zotero/zotero-standalone-build
url = https://github.com/uniuuu/zotero-standalone-build
[submodule "client/zotero-build"]
path = client/zotero-build
url = https://github.com/zotero/zotero-build
url = https://github.com/uniuuu/zotero-build
branch = master
[submodule "dataserver"]
path = dataserver
url = https://github.com/uniuuu/dataserver.git
branch = stage
169 changes: 83 additions & 86 deletions COPYING → LICENSE
Original file line number Diff line number Diff line change
@@ -1,37 +1,23 @@
The Zotero Data Server is Copyright © 2010 Center for History and New Media,
George Mason University, Fairfax, Virginia, USA http://zotero.org
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

The Center for History and New Media distributes the Zotero Data Server
source code under the GNU Affero General Public License, version 3 (AGPLv3).
The full text of this license is given below.

The Zotero name is a registered trademark of George Mason University.
See http://zotero.org/trademark for more information.

Third-party copyright in this distribution is noted where applicable.

All rights not expressly granted are reserved.

=========================================================================

GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Preamble

The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The GNU General Public License is a free, copyleft license for
software and other kinds of works.

The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.

When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
Expand All @@ -40,34 +26,44 @@ them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.

Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.

A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.

The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.

An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.

For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.

Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.

For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.

Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.

Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.

The precise terms and conditions for copying, distribution and
modification follow.
Expand All @@ -76,7 +72,7 @@ modification follow.

0. Definitions.

"This License" refers to version 3 of the GNU Affero General Public License.
"This License" refers to version 3 of the GNU General Public License.

"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
Expand Down Expand Up @@ -553,45 +549,35 @@ to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.

13. Remote Network Interaction; Use with the GNU General Public License.

Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
13. Use with the GNU Affero General Public License.

Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.

14. Revised Versions of this License.

The Free Software Foundation may publish revised and/or new versions of
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU Affero General
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever published
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.

If the Program specifies that a proxy can decide which future
versions of the GNU Affero General Public License can be used, that proxy's
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.

Expand Down Expand Up @@ -649,29 +635,40 @@ the "copyright" line and a pointer to where the full notice is found.
Copyright (C) <year> <name of author>

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

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

You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".

You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.
Loading