114 Commits (a66d8c13841e526ecd086572365adc7dc5048de9)

Author SHA1 Message Date
yflory 760f58b74c Merge branch 'staging' into oo2 6 years ago
ansuz 8960c8fcbd bump to latest version and codename 6 years ago
ansuz 44419fc929 bump version 6 years ago
ansuz 8bbd4e2086 bump version and release codename 6 years ago
yflory d8715754a3 Bump version 6 years ago
yflory 92e9540748 Update package.json 6 years ago
ansuz 67d1347bd8 bump version to 2.9.0 in footer and package.json 6 years ago
ansuz 43e194be7e bump footer and package.json version 6 years ago
ansuz 2bd02ca69e bump version to 2.7.0 6 years ago
yflory bf9cf95292 Merge branch 'staging' into oo2 6 years ago
ansuz 9fe78dcc5f bump version from 2.5.0 to 2.6.0 6 years ago
ansuz fcc54a3c34 Merge branch 'docker-fix-rename' into staging 7 years ago
ansuz a090dc52db flow compliance 7 years ago
ansuz 8e2ab0b74a bump version strings 7 years ago
ansuz 02169bfa83 Revert "Use socket.io instead of WebSocket"
In hindsight this may have been a terrible idea.

RIP uptime.

This reverts commit 9195c57445.
7 years ago
ansuz 9820ac278f address npm warnings 7 years ago
ansuz 4e9baff0b6 bump version 7 years ago
yflory ddcbd000dc Bump chainpad-server version 7 years ago
yflory ad0663c168 :q 7 years ago
yflory d9c186a3da Merge branch 'staging' into socketio 7 years ago
ansuz 5a549f75a6 increment version 7 years ago
yflory 9195c57445 Use socket.io instead of WebSocket 7 years ago
yflory 69c5eb0cd9 Bump version 7 years ago
ansuz 534d5ae006 bump version 7 years ago
ansuz 3eb199bca7 bump version to 2.0.0 7 years ago
ansuz 92fe555cb5 update footer and package.json 7 years ago
ansuz a794efe931 Merge branch 'staging' into oo 7 years ago
ansuz 8230c471cd add npm dependency for sortify 7 years ago
ansuz bc3fe4f32c update version in footer and package.json 7 years ago
ansuz b2df2ba341 prototype owned file upload 7 years ago
ansuz 7944bc1a82 merge staging branch 7 years ago
ansuz 0af90ef88d resolve merge conflict 7 years ago
ansuz fdf2899e88 @kpcyrd said I should update this 7 years ago
ansuz 118ceef2f2 formatting and lint compliance 7 years ago
ansuz 66d83dc045 update version 7 years ago
ansuz 7cc4cca846
Merge branch 'master' into patch-1 7 years ago
Sven Neuhaus d2b3e078d5
updated version to resolve conflict 7 years ago
Sven Neuhaus c409cac280
changed to AGPL-3.0-or-later 7 years ago
yflory 5c1e5a3f49 Merge branch 'staging' into oo 7 years ago
ansuz 11fabea327 update footer and package.json version 7 years ago
Sven Neuhaus be0842c66d
add license to package.json 7 years ago
Caleb James DeLisle cac5e75a99 Add a repl to improve debugging on the prod server 7 years ago
yflory 5827905dbd Import OnlyOffice code from the 'onlyoffice' branch and sframe it 7 years ago
yflory 166a9e71cf Add a features comparison page 7 years ago
Caleb James DeLisle 88f3e730b9 Update package.json and sync file.js 7 years ago
ansuz 4f42e8a282 bump to version 1.25.0 7 years ago
Caleb James DeLisle 137c6428e8 Introducing heapdump to allow collecting more data from the server 7 years ago
ansuz e06cb29c4f bump version 7 years ago
ansuz e460d9c36c bump version 7 years ago
ansuz d1d75f2f25 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago