Commit graph

305 commits

Author SHA1 Message Date
Pengwius
5fdb7fdedc
Merge pull request #20 from wulkanowy/bugfix/keyerror_at_userid
Fix Keyerror: userid error
2021-01-25 10:59:58 +01:00
Tomasz
bd8b1b7d69 Deleting useless code 2021-01-25 10:49:45 +01:00
Tomasz
24acc1fbcf Fix KeyError: userid error 2021-01-25 10:47:42 +01:00
Pengwius
de7110267f
Update README.md 2021-01-23 22:34:59 +01:00
Pengwius
785f93597d
Merge pull request #19 from wulkanowy/Little-fix-in-README
Change npm install webpack to npm install
2021-01-23 22:29:16 +01:00
Marcin Kowalicki
ca39721f87
Merge pull request #18 from wulkanowy/bugfix/keyerror_at_userid
Fix KeyError: userid error
2021-01-23 22:20:08 +01:00
Marcin Kowalicki
1a58e57bd8
Change npm install webpack to npm install 2021-01-23 22:19:37 +01:00
Tomasz
1ed58d3174 Fix KeyError: userid error 2021-01-23 13:27:16 +01:00
Pengwius
a1695fbdd9
Merge pull request #17 from wulkanowy/react
Preparing for react
2021-01-23 13:07:13 +01:00
Pengwius
85a96305c3
Update README.md 2021-01-23 12:26:50 +01:00
Tomasz
67a2957d86 Adding files 2021-01-23 12:23:24 +01:00
Tomasz
13f59835f2 Deleting files 2021-01-23 12:20:13 +01:00
Tomasz
0b82272706 Editing .gitignore 2021-01-23 12:18:12 +01:00
Tomasz
c408c63096 Merge branch 'react' of https://github.com/wulkanowy/wulkanowy-web into react 2021-01-23 10:51:08 +01:00
Tomasz
d2ce204281 Fix tests 2021-01-23 10:50:15 +01:00
Pengwius
e01d78e37e
Delete db.sqlite3 2021-01-23 10:48:10 +01:00
Tomasz
45a6e2e58d Deleting files 2021-01-23 10:45:40 +01:00
Tomasz
7e629a702e Preparing for react 2021-01-23 10:38:30 +01:00
Pengwius
704dc35d79
Merge pull request #16 from wulkanowy/Zaptyp-patch-1
Added more start command into runserver.bat file.
2021-01-22 18:58:36 +01:00
Zaptyp
7c0cba84c4
Added more start command into runserver.bat file. 2021-01-22 18:52:26 +01:00
Pengwius
6e049559c8
Merge pull request #15 from wulkanowy/Zaptyp-patch-2
Update README.md
2021-01-22 18:39:33 +01:00
Zaptyp
4101f2330e
Update README.md
Added required items for download and server startup.
2021-01-22 18:38:28 +01:00
Pengwius
3b95099d31
Merge pull request #13 from wulkanowy/Zaptyp-patch-1-1
Update README.md
2021-01-22 07:38:32 +01:00
Zaptyp
b50146c384
Update README.md
Additional instructions have been added
2021-01-22 07:32:05 +01:00
Pengwius
cf7ef10e56
Update README.md 2021-01-21 21:04:26 +01:00
Pengwius
23cbd6ad90
Merge pull request #11 from wulkanowy/feature/get_message_content
Getting message content
2021-01-21 13:00:40 +01:00
Pengwius
1f5fc29dfa Getting message content 2021-01-21 12:53:51 +01:00
Pengwius
218b0faf59
Merge pull request #10 from wulkanowy/feature/security
Data encryption and security
2021-01-21 12:49:06 +01:00
Pengwius
80fe582ee5
Update README.md 2021-01-20 09:35:26 +01:00
Pengwius
c2e052b70d
Update README.md 2021-01-20 09:35:01 +01:00
Pengwius
0bcff51043 Encrypting and decrypting cookies from Vulcan 2021-01-20 09:27:26 +01:00
Pengwius
8d7fa9eeab Generating and saveing key 2021-01-19 12:38:11 +01:00
Marcin Kowalicki
3b964815d6
Merge pull request #9 from wulkanowy/feature/sending_messages
Sending messages
2021-01-18 23:12:56 +00:00
Pengwius
c654711b4a Sending message 2021-01-18 13:01:18 +01:00
Pengwius
fa08d6d8eb Getting recipients 2021-01-15 23:17:03 +01:00
Marcin Kowalicki
26ba0fee35
Merge pull request #8 from wulkanowy/feature/dashboard
Dashboard
2021-01-15 20:32:04 +00:00
Pengwius
bdeedecd4c Getting dashboard data 2021-01-14 22:13:06 +01:00
Pengwius
74d25f0ac3 Getting permissions value 2021-01-13 23:39:08 +01:00
Pengwius
d2c0a7edca webpack 2021-01-13 10:41:07 +01:00
Pengwius
daeae95a4f
Merge pull request #7 from wulkanowy/feature/notes
Add achievements and notes to UI
2021-01-13 09:34:33 +01:00
Marcin Kowalicki
97fa7f73af Add achievements and notes to UI 2021-01-12 23:43:09 +01:00
Pengwius
25af24a917
Merge pull request #5 from wulkanowy/feature/deleted_messages
Add deleted and sent messages to UI
2021-01-12 16:25:27 +01:00
Marcin Kowalicki
ca31a9508e
Fix sent messages 2021-01-12 16:12:47 +01:00
Marcin Kowalicki
5c7194ae07 Finish deleted messages and sent messages 2021-01-12 16:04:14 +01:00
Marcin Kowalicki
db4895cd9c Remove some console.log's() 2021-01-12 15:45:48 +01:00
Pengwius
409cf9564b
Merge pull request #4 from wulkanowy/Fix-grades
Fix grades
2021-01-12 15:45:13 +01:00
Marcin Kowalicki
54ed26972e
Fix grades 2021-01-12 15:34:59 +01:00
Pengwius
0df13214b3
Merge pull request #3 from wulkanowy/feature/finish_grades
Feature/finish grades
2021-01-12 15:06:53 +01:00
Marcin Kowalicki
004aff7a2a
Remove comment 2021-01-12 15:02:51 +01:00
Marcin Kowalicki
bc0a1f6500
Merge branch 'master' into feature/finish_grades 2021-01-12 14:00:21 +00:00