Skip to content
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

Dev #119

Merged
merged 64 commits into from
Dec 26, 2023
Merged

Dev #119

merged 64 commits into from
Dec 26, 2023

Conversation

Jamshidbek2000
Copy link
Collaborator

No description provided.

Jamshidbek2000 and others added 30 commits December 19, 2023 13:45
@Jamshidbek2000
User(AbstractUser) is implemented.
87c6305
@Jamshidbek2000
Login implemented. Temporary users_list was added for testing
92899d8
@Jamshidbek2000
User has new field: profile_picture. We can save pictures
900e62a
@Jamshidbek2000
User picture is implemented
4de4693
@zstenger93
login options auth/email
6ca256d
@zstenger93
translations for the login types
7254dd7
@zstenger93
disabled instant autocomplete for fields and addedd language button f…
f600974 
…or the welcome page
@zstenger93
Merge pull request #96 from zstenger93/frontend
7900536 
Frontend
@zstenger93
fixing ask for email via 42
3491efa
@zstenger93
login test fix
4906e60
@zstenger93
Merge pull request #97 from zstenger93/frontend
02ea5d1 
fixing ask for email via 42
@zstenger93
Merge pull request #98 from zstenger93/ci/cd_tests
bf2d925 
login test fix
@zstenger93
app layout change, 404 page
cf0ef87
@zstenger93
added translation for 404 tho it's ain't persisting if u just type wr…
96650b9 
…ong url after language change..
@zstenger93
wrapper change for different backgrounds
5c5cf45
@zstenger93
fix for wrapper
437ccfd
@zstenger93
wtb better background images
926a891
@zstenger93
need to try if async page data tests are working now or not
64259c9
@zstenger93
different button style \..O../
c7e981c
@zstenger93
Merge pull request #100 from zstenger93/frontend
54ab644 
Frontend
@zstenger93
Merge pull request #99 from zstenger93/ci/cd_tests
77c67b0 
need to try if async page data tests are working now or not
@Jamshidbek2000
picture extracted from 42API. Started working on FriendRequest
44bcb56
@zstenger93
Merge branch 'dev' into user_management
487dfd4
@zstenger93
Merge pull request #101 from zstenger93/user_management
1700f65 
User management
@zstenger93
3rd test fix try to init root at start
b0ecbca
@zstenger93
Merge pull request #102 from zstenger93/ci/cd_tests
ca65ebc 
3rd test fix try to init root at start
@zstenger93
testing is fun, sarcasm intended
9d1e29b
@zstenger93
Merge pull request #103 from zstenger93/ci/cd_tests
7ca679e 
testing is fun, sarcasm intended
@zstenger93
commented out crashing test
d157a66
@zstenger93
compose fix
1404c64
zstenger93 and others added 26 commits December 25, 2023 11:40
@zstenger93
ffffuuuuuu
df55756
@zstenger93
Merge pull request #107 from zstenger93/ci/cd_tests
3e9a3cc 
Ci/cd tests
@zstenger93
detailed logs
e752875
@zstenger93
Merge pull request #108 from zstenger93/ci/cd_tests
ee1f804 
detailed logs
@zstenger93
wtf
3dc51f4
@zstenger93
Merge pull request #109 from zstenger93/ci/cd_tests
e7026d4 
wtf
@zstenger93
fck json
8d2599d
@zstenger93
Merge pull request #110 from zstenger93/ci/cd_tests
5266898 
fck json
@zstenger93
another node reinstall
87529ab
@zstenger93
Merge pull request #111 from zstenger93/ci/cd_tests
d3ac527 
another node reinstall
@zstenger93
god sake u srs
5a0f7e9
@zstenger93
Merge pull request #112 from zstenger93/ci/cd_tests
b2d9beb 
god sake u srs
@zstenger93
..
412c8f6
@zstenger93
Merge pull request #113 from zstenger93/ci/cd_tests
8d2a8c1 
..
@zstenger93
.
b995132
@zstenger93
Merge pull request #114 from zstenger93/ci/cd_tests
b66e9ac 
.
@zstenger93
won't touch this shit anytime soon again
45aac8b
@zstenger93
Merge pull request #115 from zstenger93/ci/cd_tests
6cfbfa3 
won't touch this shit anytime soon again
@zstenger93
meaningful comment
6c3c52f
@zstenger93
Merge pull request #116 from zstenger93/frontend
2b6f8ba 
meaningful comment
@zstenger93
homepage property
0719abd
@zstenger93
Merge pull request #117 from zstenger93/frontend
440f4b2 
homepage property
@zstenger93
responsive welcome message
2321e3a
@zstenger93
hamburger menu on small screen
c9c5798
@zstenger93
hamburger menu icons
7721d5e
@zstenger93
Merge pull request #118 from zstenger93/frontend
a8e5461 
Frontend
zstenger93
zstenger93 approved these changes Dec 26, 2023
View reviewed changes
Copy link
Owner

@zstenger93 zstenger93 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! sus without conflicts tho

@zstenger93 zstenger93 merged commit 54d5903 into master Dec 26, 2023
3 checks passed
zstenger93 added a commit that referenced this pull request Feb 19, 2024
@zstenger93
Merge pull request #119 from zstenger93/dev
43a0ecf 
Dev
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zstenger93 zstenger93 zstenger93 approved these changes

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
@Jamshidbek2000 @zstenger93