lars
|
8b9823f48f
|
Merge remote-tracking branch 'origin/saving_data' into saving_data
|
2019-08-02 15:55:08 +02:00 |
|
lars
|
4fd2e1e278
|
open file
|
2019-08-02 15:54:59 +02:00 |
|
tstst334
|
97541f8cd3
|
break
|
2019-08-02 15:53:09 +02:00 |
|
tstst334
|
16cb42203d
|
break
|
2019-08-02 15:52:16 +02:00 |
|
tstst334
|
93c9c9d33c
|
password
|
2019-08-02 15:48:06 +02:00 |
|
tstst334
|
92d253680e
|
password
|
2019-08-02 15:47:17 +02:00 |
|
lars
|
9727e3381a
|
\n
|
2019-08-02 15:43:26 +02:00 |
|
lade043
|
277214e1c3
|
Merge pull request #18 from lade043/serialization
serializer
|
2019-08-02 15:39:25 +02:00 |
|
tstst334
|
2dbbf9596d
|
Merge pull request #17 from lade043/Encryption
encryption working
|
2019-08-02 15:36:09 +02:00 |
|
lars
|
44a392aca9
|
encryption
|
2019-08-02 15:33:11 +02:00 |
|
lade043
|
add0e80fc4
|
Merge pull request #14 from lade043/user_output
User output
|
2019-08-02 15:28:13 +02:00 |
|
lade043
|
02e42a9a0c
|
Merge branch 'master' into user_output
|
2019-08-02 15:27:36 +02:00 |
|
tstst334
|
8022eb8899
|
serializr
|
2019-08-02 15:15:41 +02:00 |
|
tstst334
|
5fe13cc752
|
user_outeput
|
2019-08-02 14:26:40 +02:00 |
|
tstst334
|
0bde875b3d
|
user_outeput
|
2019-08-02 14:24:10 +02:00 |
|
tstst334
|
80d34b8bcc
|
user_outeput
|
2019-08-02 14:23:02 +02:00 |
|
tstst334
|
74ed08e011
|
user_outeput
|
2019-08-02 14:19:41 +02:00 |
|
tstst334
|
614e24fad1
|
user outepu
|
2019-08-02 14:10:46 +02:00 |
|
lade043
|
73bdb74821
|
Merge pull request #13 from lade043/main_names (Resolves Issue #11)
Main names
|
2019-08-02 14:09:40 +02:00 |
|
lars
|
15295d92ad
|
main change names
|
2019-08-02 14:06:58 +02:00 |
|
lars
|
7297dcae59
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# main.py
|
2019-08-02 13:47:00 +02:00 |
|
tstst334
|
6577cfc6b8
|
newline
|
2019-08-02 13:41:10 +02:00 |
|
lade043
|
39d29f1e25
|
Merge pull request #12 from lade043/main
Main
|
2019-08-02 13:36:25 +02:00 |
|
lars
|
e4d4acb345
|
main complete
|
2019-07-31 20:03:22 +02:00 |
|
lars
|
3f0b087100
|
main
|
2019-07-31 20:02:15 +02:00 |
|
lars
|
06b364eb4a
|
Merge remote-tracking branch 'origin/master'
|
2019-07-31 19:59:13 +02:00 |
|
lars
|
b8aef9ed66
|
Merge branch 'master' of /home/lars/PycharmProjects/grade-program with conflicts.
|
2019-07-31 19:59:11 +02:00 |
|
lade043
|
f0dc6b508b
|
Update issue templates
|
2019-07-31 19:46:17 +02:00 |
|
lars
|
ad2fad6b29
|
error handling (issue n#9)
|
2019-07-31 19:36:22 +02:00 |
|
lars
|
44a5fbc4b7
|
started main and fixed issue #7
|
2019-07-31 16:38:47 +02:00 |
|
tstst334
|
d91bc8f608
|
Merge pull request #5 from lade043/subject
edited class subject and grade
|
2019-07-30 08:04:42 -07:00 |
|
lars
|
4ae91748d1
|
edited class subject and grade
|
2019-07-30 17:01:40 +02:00 |
|
tstst334
|
55a1e7c9b9
|
add main
|
2019-07-30 07:56:44 -07:00 |
|
lade043
|
8d561422ae
|
Merge pull request #3 from lade043/user_IO
edit user IO
|
2019-07-30 16:56:01 +02:00 |
|
lade043
|
93cf2ecfdc
|
Update user_IO.py
|
2019-07-30 16:55:26 +02:00 |
|
tstst334
|
a9882dbd77
|
edit user IO
|
2019-07-30 07:43:42 -07:00 |
|
tstst334
|
f5259dfe8e
|
edit user IO
|
2019-07-30 07:40:22 -07:00 |
|
tstst334
|
97c70c6457
|
Merge remote-tracking branch 'origin/master'
|
2019-07-30 07:24:18 -07:00 |
|
tstst334
|
1d8cc36b0a
|
edit user IO
|
2019-07-30 07:23:58 -07:00 |
|
lars
|
5f4b4c491e
|
edited class subject and grade
|
2019-07-30 16:18:20 +02:00 |
|
lars
|
660bf14cad
|
added class subject and grade
|
2019-07-30 16:07:54 +02:00 |
|
lade043
|
eb03c9965e
|
Update issue templates
|
2019-07-30 15:29:39 +02:00 |
|
lade043
|
6233f37869
|
Create License
|
2019-07-30 15:18:21 +02:00 |
|
lade043
|
3d657e6d75
|
Initial commit
|
2019-07-30 15:10:52 +02:00 |
|