Skip to content

Dev merge to main #1

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
Merged
sisitrs2 merged 152 commits into from
Jun 26, 2022
Merged

Dev merge to main #1

sisitrs2 merged 152 commits into from
Jun 26, 2022

Conversation

@sisitrs2
Copy link
Collaborator

@sisitrs2 sisitrs2 commented Jun 26, 2022

Update main to 1.3

sisitrs2 and others added 30 commits March 20, 2022 11:03
@sisitrs2
Added requirements.txt
d01c99f
@Sh3lldor
Pics For README.
b1f7ae3
@Sh3lldor
Merge branch 'dev' of https://github.com/redeye-framework/Redeye into…
3d5db1b 
… dev
@Sh3lldor
Update README.
d5ffb01
@sisitrs2
Added new fixed version requirements file == req_new.txt
1fe82ca
@sisitrs2
Added pointer to files in server.
7b51d4c
@sisitrs2
Merge branch 'dev' of github.com:redeye-framework/Redeye into dev
4815cf3
@sisitrs2
Added credits.txt
a11eb1d
@sisitrs2
Added credits.txt tasks.
715b190
@Sh3lldor
Updated.
a0575c4
@Sh3lldor
Merge branch 'dev' of https://github.com/redeye-framework/Redeye into…
fa5a534 
… dev
@sisitrs2
Style fixes to serverusers.
325f22c
@sisitrs2
Merge branch 'dev' of github.com:redeye-framework/Redeye into dev
bc51058
@sisitrs2
Moved non relevant files.
ac07570
@sisitrs2
Fixed user edit removes from server bug.
43db05e
@Sh3lldor
Removed js files.
bf674f8
@Sh3lldor
Merge branch 'dev' of https://github.com/redeye-framework/Redeye into…
828836a 
… dev
@sisitrs2
Added sections fold.
4bb1422
@Sh3lldor
Changed README and added default attack vector.
e572979
@sisitrs2
Fixed redeye icon.
7a1d159
@Sh3lldor
Changed Dockerfile.
aca4fab 
Added build DB command line.
@Sh3lldor
Fixed users management and Updated Dockerfile.
ea63b06
@Sh3lldor
Redeye management passwords are now stored in SHA256.
f3e8689
@sisitrs2
Server is more editable.
1243963
@sisitrs2
Merge branch 'dev' of github.com:redeye-framework/Redeye into dev
405ccb4
@sisitrs2
Fixed focus bug in server.
cc02073
@Sh3lldor
Update.
e0c3d4b 
1) Added arguments for debug, reset and port.
2) Added date to comments, @sisitrs2 fix the trashcan position.
3) Removed extra code.
@Sh3lldor
Merge branch 'dev' of https://github.com/redeye-framework/Redeye into…
b37f88f 
… dev
@sisitrs2
Fixed conflict.
37dc4e1
@Sh3lldor
Update
55c2e9e 
1) Added import/export functions
2) Deny to user to delete himself
3) change user profile picture
sisitrs2 and others added 29 commits May 29, 2022 08:20
@sisitrs2
Fix conflict.
318254c
@Sh3lldor
Little changes.
eab331a
@Sh3lldor
Merge branch 'dev' of https://github.com/redeye-framework/Redeye into…
6cc1751 
… dev
@Sh3lldor
Fixed wrapper.
f609384
@Sh3lldor
Deleted extra code.
2fb309b
@Sh3lldor
Changed graph style.
13c069d
@sisitrs2
Fixed graph style.
4413929
@sisitrs2
Added animations on graph.
2f4ba5b
@sisitrs2
Changed ip style.
d36b629
@sisitrs2
Removed socketio.
4acf05f
@sisitrs2
Fixed socketio.
1bbb49d
@sisitrs2
Fixed server head style.
f8aa0ba
@sisitrs2
Added export button.
19058c9
@sisitrs2
Added import.
3130f5f
@sisitrs2
Fixed sections.
6ceae03
@Sh3lldor
Import/Export now works !
e6aabde
@Sh3lldor
Import/Export little change.
d2f5398
@Sh3lldor
Fixed users bug in import project.
3e7a6a3
@Sh3lldor
Added initialization after import.
f7c5d4f
@Sh3lldor
Graph is now available only from docker, Added pictures.
6c6e952
@Sh3lldor
Fixed Import/Export buttons.
1390753
@Sh3lldor
Updated style and graph update server.
3740968
@Sh3lldor @sisitrs2
Fixed users bug.
ef6d358 
Co-Authored-By: Daniel Arad <sisitrs2@gmail.com>
@Sh3lldor
Fixed dup.
d2286a8
@Sh3lldor
Fixed change color bug.
320e162
@Sh3lldor
Change some pictures.
260ca90
@sisitrs2
Fixed sidebar prefix on files.
a7ada95
@Sh3lldor
Added backend for delete section.
f52d8e3 
Delete server now deletes the server from graph.
@Sh3lldor
Merge branch 'dev' of https://github.com/redeye-framework/Redeye into…
9e6dc09 
… dev
@sisitrs2 sisitrs2 merged commit de1ab9b into main Jun 26, 2022
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.

3 participants

@sisitrs2 @Sh3lldor