Skip to content

changes from techx -> treehacks #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 80 commits into
base: master
Choose a base branch
from
Draft

changes from techx -> treehacks #30

wants to merge 80 commits into from

Conversation

epicfaace
Copy link

@epicfaace epicfaace commented Mar 3, 2020 •
edited
Loading

don't merge -- just a way to see what all has changed

  • docker setup, python 3
  • frontend reload bugs
  • slack / email integration
  • easier to plugin external auth service
  • remove sockets?

kpsuperplane added 30 commits May 30, 2019 23:18
@kpsuperplane
Initial commit, use docker-compose + make, use hackerapi, rename to j…
23f2092 
…ust 'cog'
@kpsuperplane
forgot the source whoops
9aabcc4
@kpsuperplane
Update mds
039057d
@kpsuperplane
Fix rendering and counting bug, add returned status
b5fee05
@kpsuperplane
prep for deploy
9cfa631
@kpsuperplane
capital env vars
02bca4d
@kpsuperplane
Use templater
e349b87
@kpsuperplane
nope back to envsubst
0416a02
@kpsuperplane
Rename to template yaml
7bcc944
@kpsuperplane
Import os
b4254f1
@kpsuperplane
Make resource requests a suggestion
57a1764
@kpsuperplane
Correct redirect uri, error state for login
117ae14
@kpsuperplane
fix redirect uri
68a16c3
@kpsuperplane
Use correct token name
2173b61
@kpsuperplane
Remember to delete the cookie
c0ba034
@kpsuperplane
Add CSRF protection
3149a6b
@kpsuperplane
Fix csrf token
c0b7b0a
@kpsuperplane
fix csrf token typo
d9a3851
@kpsuperplane
Make csrf token lowercase
10f22e9
@kpsuperplane
Finally fix csrf token
34b5f58
@kpsuperplane
Basic theming
e9a5c5b
@kpsuperplane
Allow people to fix their emails/phones if not set
91604b1
@kpsuperplane
mobile-friendly everything
813d7d5
@kpsuperplane
Improve desktop positioning of requests
50d3ebd
@kpsuperplane
Improve inventory styling
41370aa
@kpsuperplane
top 40px
5247ddf
@kpsuperplane
revert temporary fake auth
eaecc90
@kpsuperplane
forgot to comment out token
9ac4c07
@kpsuperplane
Add support for MLH items
9bea67b
@kpsuperplane
Update deployment details
f64ef85
kpsuperplane and others added 30 commits September 14, 2019 01:34
@kpsuperplane
Remove socket entirely
ecfdf42
@epicfaace
change dockerfile to run on port 8000
4ab5cff
@epicfaace
run dev mode with right env vars
4c9d7b1
@epicfaace
redirect to login.treehacks.com on login
fa0e526
@epicfaace
finish login integration
9ca83ea
@epicfaace
fix cookie auth
ec8b5b0
@epicfaace
rename variables and things so it can be deployed on heroku
5c0069c
@epicfaace
remove python 2.7 runtime
1ef5dec
@epicfaace
remove cryptography and pycrypto requirements
743e909
@epicfaace
don't make SECRET env var required
3b8dcb9
@epicfaace
don't make ENV variable required
e304a65
@epicfaace
use PORT instead of FLASK_RUN_PORT so it works on Heroku
ec83369
@epicfaace
upgrade psycopg2 to fix https://github.com/taigaio/taiga-back/issues/…
fe14242 
…1122
@epicfaace
make SECRET required again (needed for sessions / csrf tokens)
f52de81
@epicfaace
fix typo
a5b7683
@epicfaace
wording changes
1ff2d61
@epicfaace
add slack and email methods
f0e07f4
@epicfaace
disable updating user, remove user phone and location
f27fd0c
@epicfaace
auto-reply to received slack messages
93d1a94
@epicfaace
add proper error handling for slack bot
b38d0c4
@epicfaace
remove slack rtm integration (not working)
f81a301
@epicfaace
save user first_name and last_name in db
7a6e988
@epicfaace
fix: properly reload page when buttons are clicked
9fedc40
@epicfaace
send email / slack upon approval
6ef35c1
@epicfaace
add "slack ..." button
cae9b9c
@epicfaace
add info about heroku deployment
c5cfe78
@epicfaace
add warning
5ef8d29
@epicfaace
update sample env to include DEBUG and FORCE_SSL
0cf1fa9
@epicfaace
update favicon and default image
45cb8a9
@epicfaace
add hardware_admin
e74e027
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@epicfaace @kpsuperplane