Michael Schramm
9ff5b931bc
Merge pull request #9 from wodka/features/fix_crypto
...
fix crypto with email verification
2019-07-18 11:32:42 +02:00
wodka
3df55e01c7
fix crypto with email verification
2019-07-18 11:31:56 +02:00
Michael Schramm
2fbd7c51d6
Merge pull request #6 from wodka/features/internal_server_error_crash
...
fix error if subdomain cannot be located and disable subdomain per de…
2019-07-18 00:05:55 +02:00
wodka
d96308ddcc
fix error if subdomain cannot be located and disable subdomain per default
2019-07-18 00:04:00 +02:00
Leopere
ed72b85a23
Create SUBLICENSE.md AGPL 3.0
...
Applicable to code commits from within commits from the OhMyForm developers forward. Discluding any PR's that were submitted to TellForm that were merged, however any changes that were required in order to merge the code into OhMyForm are licensed under AGPL 3.0.
2019-07-15 16:38:25 -04:00
Michael Schramm
6d75c011a9
Merge pull request #4 from wodka/features/security_updates
...
improve security
2019-07-15 21:07:08 +02:00
wodka
dab7dd6ae6
upgrade all libraries
...
fix form editing
2019-07-15 21:04:39 +02:00
Michael Schramm
02fe527e52
Merge pull request #1 from wodka/features/missing
...
Combine unfinished work and fix it
2019-07-15 16:53:07 +02:00
wodka
990898d88e
remove logs and fixes for dockerfile
2019-07-15 16:30:35 +02:00
wodka
e175abb9e3
further update files
2019-07-15 15:02:21 +02:00
wodka
f7b1dd05e9
fix analytics
...
upgrade missing dependencies
upgrade libraries
change service naming
2019-07-15 10:15:06 +02:00
wodka
886c5dea65
remove tellform from locales
2019-07-15 00:48:39 +02:00
wodka
4997514f01
give visitor information only authenticated
2019-07-15 00:26:37 +02:00
Leopere
5d3c3ca851
More cleanup to README.md
...
Env vars moved to https://github.com/ohmyform/website/
Commented out Roadmap until further notice.
2019-07-14 10:54:18 -04:00
wodka
42c110beea
Merge remote-tracking branch 'upstream/master' into features/missing
...
# Conflicts:
# .travis.yml
2019-07-14 16:46:52 +02:00
Leopere
d59c3f5d18
Fixed discord links
...
Somewhere there existed a temporary membership invite link I've now revoked all links except this one.
2019-07-14 10:32:25 -04:00
Leopere
d4eae2fa9e
Removed superfluous "documentation"
2019-07-12 13:31:08 -04:00
wodka
b7ed287a83
update dockerfile and compose
2019-07-12 11:00:31 +02:00
Leopere
b9e2931a39
Updated installation instructions for Quickstart
2019-07-11 20:22:57 -04:00
Leopere
55be428669
Another TODO
2019-07-11 20:07:47 -04:00
Leopere
5f8ba015cc
Corrected Done list
2019-07-11 20:05:41 -04:00
Leopere
a652117e8a
Nginx container TODO
2019-07-11 20:03:43 -04:00
Leopere
30dc60670f
Created Docker directory and cleanup
...
Move container things to Docker subdir as it doesn't need to litter the root of the repo up.
2019-07-11 20:02:39 -04:00
Leopere
ab3fce3bbf
Linted the linters linting
2019-07-11 19:59:03 -04:00
Leopere
986db033c7
Pick a markdown style and stick with it please
2019-07-11 19:56:21 -04:00
Leopere
cebb3cb532
Cleanup of things that don't work anymore
...
TODO: Re-Add contributors section if we can.
2019-07-11 19:55:26 -04:00
Leopere
cd6f6f640d
Linted
2019-07-11 19:45:55 -04:00
Leopere
e0eb7f129f
Added todo for dns_masq_setup_osx.md
2019-07-11 19:45:46 -04:00
Leopere
2dab4f93dd
Removed unnecessary phrasing
...
phrasing that assumes responsibility for things or imposes morality.
Ideally we should take a stance of guiding people to take better paths
to communication but it's not our responsibility.
2019-07-11 19:45:09 -04:00
Leopere
d882c60d9b
Minor linting for CODE_OF_CONDUCT
2019-07-11 19:41:47 -04:00
Leopere
ba6407cd1b
TODO for dev_entrypoint.sh
2019-07-11 19:41:30 -04:00
Leopere
830cd00189
TODO for start.sh
2019-07-11 19:41:04 -04:00
Leopere
a35f6fd265
Added TODO for Vagrantfile
2019-07-11 19:40:55 -04:00
Leopere
29fed4d45a
Removed more files
...
There are too many locations where this app was poorly documented we're going to aim to have all documentation hosted on https://OhMyForm.com where it is hosted from GitHub Pages exclusively now with no coupling.
2019-07-11 19:25:16 -04:00
Leopere
0690dfb94a
TODO's for docker-compose.yml
2019-07-11 19:24:00 -04:00
Leopere
d086b2b659
TODO's for Dockerfile
2019-07-11 19:23:50 -04:00
Leopere
57fd9e2d48
Absolute base dev testing compose file
2019-07-11 19:17:21 -04:00
Leopere
218eb32de2
Repo Cleanup and Misc
...
Cleaned up github junk into .github directory.
Started to clean up CI/CD stuff that we're not using yet.
2019-07-11 19:13:16 -04:00
Leopere
18a1ee7e88
Added TODO for .env.example
2019-07-11 19:11:29 -04:00
Leopere
bc1f425bfe
Update Discord Server Address.
2019-07-11 18:21:24 -04:00
wodka
b83b431c95
Merge remote-tracking branch 'origin/fixedSignupErrors' into features/missing
...
# Conflicts:
# public/modules/users/config/users.client.routes.js
# public/modules/users/controllers/settings.client.controller.js
# public/modules/users/views/settings/change-password.client.view.html
2019-07-11 23:36:34 +02:00
wodka
1caf34c230
Merge remote-tracking branch 'origin/fixUXBugs' into features/missing
...
# Conflicts:
# .gitignore
# app/views/form.server.view.pug
# package-lock.json
# package.json
# public/form_modules/forms/base/config/i18n/french.js
# public/modules/core/config/core.client.routes.js
# public/modules/core/config/i18n/french.js
# public/modules/core/controllers/header.client.controller.js
# public/modules/forms/admin/css/admin-form.css
# public/modules/users/controllers/authentication.client.controller.js
# public/modules/users/services/auth.client.service.js
# scripts/create_admin.js
# server.js
2019-07-11 23:32:25 +02:00
wodka
423154790a
Merge branch '2.20' into features/missing
...
# Conflicts:
# app/models/form.server.model.js
# package-lock.json
# package.json
# public/modules/forms/admin/views/admin-form.client.view.html
# public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
2019-07-11 23:22:49 +02:00
wodka
2276ca100f
Merge branch 'master' into 2.20
...
# Conflicts:
# config/env/secure.js
# package-lock.json
# package.json
# public/form_modules/forms/base/css/form.css
# public/modules/forms/admin/config/i18n/french.js
2019-07-11 23:18:55 +02:00
wodka
6735cc84d7
update package json
2019-07-11 23:16:24 +02:00
David Baldwynn
80fdcb5d4f
added support for computing analytics on backend
2019-07-11 22:49:26 +02:00
David Baldwynn
b9428a5df5
fixed configure tab in form
2019-07-11 22:44:35 +02:00
David Baldwynn
b5702f72a5
fixed title overflow bug for list-forms and admin-form pages
2019-07-11 22:42:07 +02:00
Leopere
210c7544e7
Merge pull request #344 from wodka/simplify-docker
...
improve docker images, fix jsep and initial build
2019-07-03 16:43:59 -04:00
wodka
a9e04b4894
add missing bower install
2019-07-03 22:13:28 +02:00
