Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
260 commits
Select commit Hold shift + click to select a range
1dd6eb6
fixes of homework 2
Oct 6, 2017
099743f
task description fixes
Oct 6, 2017
64bcace
task description fixes
Oct 6, 2017
8a2d50b
test fix
Al-p-i Oct 8, 2017
e593eca
gradle build fix
rybalkinsd Oct 11, 2017
c176e7b
presentation fixes
rybalkinsd Oct 11, 2017
d4f0446
lecture04 practice fixes
Al-p-i Oct 11, 2017
0baa6c4
encoding and presentation fixes
Al-p-i Oct 11, 2017
42f7773
presentation and uro fixes
Al-p-i Oct 11, 2017
7a319f0
Lecture04 (#607)
rybalkinsd Oct 14, 2017
3f71780
Lecture05 (#642)
rybalkinsd Nov 1, 2017
66f9832
web_hackaton code
Al-p-i Nov 1, 2017
19092a1
web_hackaton presentation
Al-p-i Nov 1, 2017
4fb9d6b
web_hackaton presentation
Al-p-i Nov 1, 2017
02464ac
web_hackaton curl fix
Al-p-i Nov 1, 2017
5ccd075
web_hackaton minor fixes
Al-p-i Nov 1, 2017
200e253
settings.gradle update
Al-p-i Nov 8, 2017
b585045
merge lecture04, remove old jersey jetty server
Al-p-i Nov 8, 2017
9806caf
moved to sb
rybalkinsd Nov 8, 2017
e19eaf6
moved to sb
rybalkinsd Nov 8, 2017
cd2bcc6
moved to sb
rybalkinsd Nov 8, 2017
9e75f73
9 -> 8
Al-p-i Nov 8, 2017
c68ee0c
default db credentials changed
Al-p-i Nov 8, 2017
7a24815
db credentials fix
Al-p-i Nov 8, 2017
4003f5a
logger collision fix
Russiancold Nov 8, 2017
7d460f8
Merge pull request #672 from Russiancold/lecture06
Al-p-i Nov 9, 2017
d98c7b9
back to java 1.9
Al-p-i Nov 9, 2017
03be082
settings.gradle
Al-p-i Nov 10, 2017
aa49bcd
lecture07 practice
Al-p-i Nov 11, 2017
8141269
lecture07 practice fix
Al-p-i Nov 11, 2017
a27817b
lecture07 practice fix
Al-p-i Nov 11, 2017
32dc2d6
lecture07 practice fix
Al-p-i Nov 11, 2017
71d6f5d
lecture07 practice fix
Al-p-i Nov 11, 2017
fd6ed5f
lecture07 practice fix
Al-p-i Nov 11, 2017
8e8f639
lecture07 practice fix
Al-p-i Nov 11, 2017
10e3dcb
lecture07 presentation fix
Al-p-i Nov 11, 2017
897f104
fix
Al-p-i Nov 11, 2017
1fa1b9d
app properties fix
Al-p-i Nov 14, 2017
68e4122
settings.gradle
Al-p-i Nov 15, 2017
ed7be4a
issue #467 - gc improvement - fixed concurrent modification
rybalkinsd May 12, 2017
457f615
Optimized images
May 14, 2017
453cca9
issue #468 tmp fix --menu +gray background on loading
rybalkinsd May 16, 2017
f7a715a
Merge branch 'homework2'
Al-p-i Nov 15, 2017
9b15866
ignore hw2 tests
Al-p-i Nov 15, 2017
b96ae39
fixed container
rybalkinsd Nov 15, 2017
3cc881f
frontend in docker
rybalkinsd Nov 15, 2017
e856803
java 1.8 for docker
Al-p-i Nov 15, 2017
820fcd9
ServerProxy changed
rybalkinsd Nov 15, 2017
d47233e
fixed gradle.build
rybalkinsd Nov 15, 2017
cb8256c
front fixes
Al-p-i Nov 22, 2017
7297846
front fixes
Al-p-i Nov 22, 2017
ab33196
urls fix
Al-p-i Nov 22, 2017
71a0b2a
Game architecture slide
Al-p-i Nov 15, 2017
ddbe21e
Game architecture slide
Al-p-i Nov 15, 2017
92c1464
webservice migration jetty --> spring boot
rybalkinsd Nov 22, 2017
1cad2dc
stylefix
rybalkinsd Nov 22, 2017
b61c649
changed port 8080 --> 8090
rybalkinsd Nov 22, 2017
31a5ff3
presentation fixes
rybalkinsd Nov 22, 2017
958ab9e
settings.gradle
Al-p-i Dec 1, 2017
50cfdc5
lecture09
Al-p-i Dec 2, 2017
ae92372
lecture09
Al-p-i Dec 2, 2017
91d00a6
lecture09
Al-p-i Dec 2, 2017
28aaa5d
settings.gradle
Al-p-i Dec 6, 2017
855da3f
lecture10 presentation
Al-p-i Dec 6, 2017
1cb528b
lecture10 settings.gradle
Al-p-i Dec 6, 2017
34165df
lecture10 presentation
Al-p-i Dec 6, 2017
1957453
lecture10 presentation
Al-p-i Dec 6, 2017
e148a9b
lecture10 presentation
Al-p-i Dec 6, 2017
c927300
lecture10 presentation
Al-p-i Dec 6, 2017
b1b893e
lecture10 presentation
Al-p-i Dec 6, 2017
b3894bb
lecture10 presentaion
Al-p-i Dec 6, 2017
37179b3
lecture10 example
Al-p-i Dec 6, 2017
984cb7c
presentation l9 l10 fixes
Al-p-i Dec 7, 2017
c568eec
settings.gradle
Al-p-i Dec 7, 2017
dde4fa6
fixed `gradle :bomberman/frontend:build`
rybalkinsd Dec 9, 2017
002a1e8
lecture11 game example
Al-p-i Dec 9, 2017
5cc2461
fix frontend
dm1tryK Dec 10, 2017
07487c0
Merge pull request #696 from dm1tryK/master_fix
Al-p-i Dec 11, 2017
946e8fa
lecture12 presentation style upd
rybalkinsd Oct 28, 2017
643f26c
lecture12 presentation style upd #2
rybalkinsd Oct 28, 2017
69e9a75
lecture12 presentation style upd #3
rybalkinsd Oct 28, 2017
93afee3
Docker
Al-p-i Oct 28, 2017
6ddc55c
lecture12 update
Al-p-i Dec 13, 2017
1936ccb
Docker presentation fix
Al-p-i Oct 30, 2017
6ff5ba2
Merge branch 'lecture11'
Al-p-i Dec 19, 2017
5b1bf0f
lecture11 checkstyle fix
Al-p-i Dec 19, 2017
6a597dd
Merge branch 'lecture12'
Al-p-i Dec 19, 2017
553c5ae
jdk9
Al-p-i Feb 21, 2018
2a3cd25
my homework
Feb 21, 2018
eae0042
revert fixes
Al-p-i Feb 22, 2018
63e1c53
lecture fixes
Al-p-i Feb 22, 2018
ca53752
gradle version fix
Al-p-i Feb 22, 2018
8ca58eb
presentation fixed
fibersell Mar 4, 2018
ca877cb
Merge pull request #766 from fibersel/master
Al-p-i Mar 4, 2018
d00fcde
Добавил не учтенные тест-кейсы:
ivanmakarychev Mar 6, 2018
0b2da5a
logo
rybalkinsd Feb 25, 2018
5e8d13b
presentation fixes
rybalkinsd Feb 25, 2018
83f72f1
presentation + test improvements for lectures 01 & 02
rybalkinsd Feb 25, 2018
e8dd867
lecture01 new gradle structure
Al-p-i Feb 25, 2018
2b079fc
lecture02 new gradle structure
Al-p-i Feb 25, 2018
fccc0e2
changed .gitignores and travis
rybalkinsd Feb 25, 2018
dd96dab
gradlew for lecture 02
rybalkinsd Feb 25, 2018
dc8715f
presentation gradle part changed
rybalkinsd Feb 25, 2018
ed98235
props for new java version
rybalkinsd Feb 28, 2018
2f70261
merge
Al-p-i Mar 6, 2018
8205284
presentation
Al-p-i Feb 25, 2018
8943b99
presentation fix
Al-p-i Feb 28, 2018
7c184f1
README
Al-p-i Mar 7, 2018
c277d67
README
Al-p-i Mar 7, 2018
b939fdb
README
Al-p-i Mar 7, 2018
f7ce302
README
Al-p-i Mar 7, 2018
408872e
Merge pull request #770 from ivanmakarychev/master
Al-p-i Mar 11, 2018
404f811
gradlew update
Al-p-i Feb 25, 2018
9ab039a
Update PITCHME.md
rybalkinsd Mar 2, 2018
b5ffb5f
compilation fix
Al-p-i Mar 13, 2018
82e2a2d
presentation null fix
Al-p-i Mar 13, 2018
d9d7540
lecture03 fixes
Oct 4, 2017
f103ec6
merge
Al-p-i Mar 6, 2018
7968688
new project structure migration
Al-p-i Mar 6, 2018
122837e
remove old md
Al-p-i Mar 6, 2018
3f92aa6
logger dependencies fix
Al-p-i Mar 6, 2018
61580bf
presentation and practice fixes
Al-p-i Mar 7, 2018
b83a315
hw2
Al-p-i Mar 7, 2018
dfbcbd5
hw2
Al-p-i Mar 7, 2018
645848b
rm full dict
Al-p-i Mar 7, 2018
d00797b
practice fixes
Al-p-i Mar 7, 2018
9a82ecd
presentation fixes
Al-p-i Mar 7, 2018
e620030
presentation fixes
Al-p-i Mar 7, 2018
046a068
presentation fixes
Al-p-i Mar 7, 2018
a392c0d
checkstyle and presentation fix
Al-p-i Mar 13, 2018
7beadf0
updated presentation and practice for new style and gradle structure
Al-p-i Mar 13, 2018
f3683e3
presentation fix
Al-p-i Mar 13, 2018
909aa65
presentation fix
Al-p-i Mar 13, 2018
ba6156f
presentation fix
Al-p-i Mar 13, 2018
5ef8cf3
fix presentation images
Al-p-i Mar 13, 2018
e4db0c6
fix presentation images
Al-p-i Mar 13, 2018
3d3c096
fix presentation
Al-p-i Mar 14, 2018
e51788c
lecture04
Al-p-i Mar 14, 2018
dd86829
lecture04
Al-p-i Mar 14, 2018
944e12b
lecture04
Al-p-i Mar 14, 2018
41021a3
lecture04
Al-p-i Mar 14, 2018
f1050aa
lecture04
Al-p-i Mar 14, 2018
e95ee24
lecture04
Al-p-i Mar 14, 2018
d094d23
lecture04
Al-p-i Mar 14, 2018
b9a05cf
lecture04
Al-p-i Mar 14, 2018
0db6bbe
lecture04
Al-p-i Mar 14, 2018
a000033
lecture04
Al-p-i Mar 14, 2018
fbc8787
lecture04
Al-p-i Mar 14, 2018
e55e1b1
lecture04
Al-p-i Mar 14, 2018
fd6753e
lecture04
Al-p-i Mar 14, 2018
8d53960
lecture04
Al-p-i Mar 14, 2018
dbe4ce5
lecture04 presentation fixes
rybalkinsd Mar 14, 2018
7cf6cb8
lecture04 presentation fixes #2
rybalkinsd Mar 14, 2018
edbcc57
Bugfix. Lecture04 login test
minemile Mar 14, 2018
beecddd
Bugfix. Change values to default
minemile Mar 14, 2018
d13b9e7
Merge pull request #833 from minemile/lecture04_bugfix
Al-p-i Mar 17, 2018
fdd7c11
Lecture04 changes
DeviantBadge Mar 18, 2018
d75daab
Merge pull request #852 from DeviantBadge/lecture041
Al-p-i Mar 20, 2018
962012d
lecture05
rybalkinsd Oct 25, 2017
f592dc2
rm HelloWorld
Al-p-i Mar 20, 2018
5ebe2dd
tests fixes
Al-p-i Mar 20, 2018
884cde3
presentation
Al-p-i Mar 20, 2018
da84ba0
presentation
Al-p-i Mar 20, 2018
efdb6c6
presentation
Al-p-i Mar 20, 2018
25ee1b6
presentation
Al-p-i Mar 20, 2018
1641cd5
practice
Al-p-i Mar 21, 2018
9e1b4c8
presentation
Al-p-i Mar 21, 2018
46c6d95
presentatino and practice
Al-p-i Mar 21, 2018
7815ffa
logger fixes
Al-p-i Mar 21, 2018
6a69cf0
presentation fixes
Al-p-i Mar 21, 2018
ad221ed
presentation fixes
Al-p-i Mar 21, 2018
fa658c9
presentation fixes
Al-p-i Mar 21, 2018
0f0d797
presentation fixes
Al-p-i Mar 21, 2018
2efd58f
presentation fixes
Al-p-i Mar 21, 2018
17e0075
presentation fixes
Al-p-i Mar 21, 2018
a0aa95f
practice fixes
Al-p-i Mar 21, 2018
206110d
gradle
Al-p-i Mar 21, 2018
b1f3886
tests
rybalkinsd Mar 21, 2018
380678b
Feature/game task (#869)
rybalkinsd Mar 24, 2018
3acf8a9
Update README.md
rybalkinsd Mar 24, 2018
c81e407
Update README.md
rybalkinsd Mar 24, 2018
17d3336
thread interruption
Al-p-i Mar 24, 2018
bcecd07
Merge branch 'lecture05'
Al-p-i Mar 26, 2018
9d199e2
new gradle structure
Al-p-i Mar 26, 2018
302d785
presentation
Al-p-i Mar 26, 2018
c1fbed4
presentation
Al-p-i Mar 26, 2018
fd0eabd
presentation
Al-p-i Mar 26, 2018
65c6610
practice blob
Al-p-i Mar 26, 2018
931d8f4
practice
Al-p-i Mar 26, 2018
899a28f
presentation
Al-p-i Mar 26, 2018
b605f66
settings.gradle
Al-p-i Mar 26, 2018
b3a1b55
root build.gradle for travis
Al-p-i Mar 26, 2018
3ba5827
root build.gradle for travis
Al-p-i Mar 26, 2018
2af1d25
root build.gradle for travis
Al-p-i Mar 26, 2018
8b50331
root build.gradle for travis
Al-p-i Mar 26, 2018
537d9b8
root build.gradle for travis
Al-p-i Mar 26, 2018
d1d53ae
Merge branch 'web_hackaton'
Al-p-i Apr 3, 2018
d09d071
lecture06
Al-p-i Apr 3, 2018
26537cf
lecture06
Al-p-i Apr 3, 2018
4fffb55
lectures 6 7
Al-p-i Apr 4, 2018
35b3c42
lectures 6 7
Al-p-i Apr 4, 2018
bdcd51e
lectures 6 7
Al-p-i Apr 4, 2018
5f0d948
lectures 6 7
Al-p-i Apr 4, 2018
6f1f518
lectures 6 7
Al-p-i Apr 4, 2018
e1a4541
lectures 6,7
Al-p-i Apr 4, 2018
d495068
lectures 6,7
Al-p-i Apr 4, 2018
43ea689
lectures 6,7
Al-p-i Apr 4, 2018
5299b29
lectures 6,7
Al-p-i Apr 4, 2018
05f1522
Merge branch 'lecture05'
Al-p-i Apr 10, 2018
485506c
Merge branch 'lecture06'
Al-p-i Apr 10, 2018
51da4e3
lecture08
Al-p-i Apr 10, 2018
1d6008c
lecture08
Al-p-i Apr 10, 2018
e95ac11
sockJS front
rybalkinsd Apr 11, 2018
24f033e
changed index
rybalkinsd Apr 11, 2018
cfd36a5
Presentation
Al-p-i Apr 11, 2018
4c6d63c
Presentation
Al-p-i Apr 11, 2018
7448680
fix startup problem
Al-p-i Apr 11, 2018
0f59c43
presentation
Al-p-i Apr 11, 2018
336eff8
presentation
Al-p-i Apr 11, 2018
19da593
Lecture09 (#899)
rybalkinsd Apr 23, 2018
4d4eba6
lecture10 presentation
Al-p-i Apr 18, 2018
100203a
lecture10 presentation
Al-p-i Apr 18, 2018
c7d359b
lecture10 presentation
Al-p-i Apr 18, 2018
5dc7733
lecture10 presentation
Al-p-i Apr 18, 2018
f5ca7c4
lecture10 presentation
Al-p-i Apr 18, 2018
1782e92
lecture10 presentation
Al-p-i Apr 18, 2018
556bb43
lecture10 presentation
Al-p-i Apr 18, 2018
e848f9a
lecture10 presentation
Al-p-i Apr 18, 2018
b9cb409
new build gradle
rybalkinsd Apr 23, 2018
f6b700d
gradle stuff
rybalkinsd Apr 23, 2018
5b5582d
gradlew.bat
Al-p-i Apr 23, 2018
c83c96c
presentation new format
Al-p-i Apr 23, 2018
5981d84
presentation new format
Al-p-i Apr 23, 2018
bd8d042
fixed build
rybalkinsd Apr 23, 2018
17a7987
picture
Al-p-i Apr 23, 2018
b5001d9
accounting billing
rybalkinsd Apr 23, 2018
f357a45
Lecture11 (#905)
rybalkinsd Apr 28, 2018
367a696
Merge branch 'lecture11'
Al-p-i May 16, 2018
2b938b3
fixed ppt and examples
rybalkinsd Apr 28, 2018
32f5d45
lecture 12 changes
rybalkinsd Apr 28, 2018
e2136ed
presentation fix
rybalkinsd Apr 28, 2018
800c430
gradle wrapper
Al-p-i May 16, 2018
9d5a703
hope it will be less porn in group chat
rybalkinsd Jul 30, 2018
4ad24f2
Update README.md
rybalkinsd Aug 8, 2018
ece8870
Update README.md
rybalkinsd Aug 8, 2018
0b195e6
Update README.md
rybalkinsd Aug 8, 2018
2966657
Remove js from repo. Look here for game front-end. https://github.com…
Al-p-i Aug 21, 2018
b060748
Update LICENCE
rybalkinsd Oct 8, 2018
9aa56d1
Update README.md
rybalkinsd Feb 17, 2019
40f9459
Update README.md
rybalkinsd Sep 3, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
/out/
build/

/*/.gradle/
/*/gradle/
/*/out/
/*/build/

.idea/
/*/build/
/*/classes
/classes
/classes
/*/.idea/
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
language: java

jdk:
- oraclejdk8
- oraclejdk9

after_success:
- ./gradlew jacocoTestReport coveralls
env:
- $PROJECT_DIR=lecture02

script: cd $PROJECT_DIR && ./gradlew assemble && ./gradlew check
2 changes: 1 addition & 1 deletion LICENCE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016-2017 Sergey Rybalkin
Copyright (c) 2016-2018 Sergey Rybalkin

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
28 changes: 20 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
# Java Technoatom
# Java Technoatom/Technosphere

[![Build Status](https://travis-ci.org/rybalkinsd/atom.png?branch=master)](https://travis-ci.org/rybalkinsd/atom)
[![Coverage Status](https://coveralls.io/repos/github/rybalkinsd/atom/badge.png?branch=master)](https://coveralls.io/github/rybalkinsd/atom?branch=master)

[![](http://icons.iconarchive.com/icons/alecive/flatwoken/32/Apps-Telegram-icon.png) Join chat](https://t.me/joinchat/AAAAAEF63F9PvqE4JDzYdQ) - feel free to contact us

[![Build Status](https://travis-ci.org/rybalkinsd/atom.png?branch=master)](https://travis-ci.org/rybalkinsd/atom)

Course repository.
All course lectures/sources/tasks are available here.
[![](http://icons.iconarchive.com/icons/dakirby309/simply-styled/32/YouTube-icon.png) Youtube channel](https://www.youtube.com/playlist?list=PLrCZzMib1e9pnFbVV3u4s7ki5NTnm7WgT) - watch course videos

[![](http://icons.iconarchive.com/icons/alecive/flatwoken/32/Apps-Telegram-icon.png) Join chat](https://t.me/joinchat/AAISfEF63F-alTwJsD3sfQ) - feel free to contact us

Course repository. All course lectures/sources/homeworks are available here.

## Lectures list:
[Lecture 1. Basics, git](https://gitpitch.com/rybalkinsd/atom/lecture01?grs=github&t=white&p=lecture01%2Fpresentation#/)
[Lecture 2. Classes, gradle](https://gitpitch.com/rybalkinsd/atom/lecture02?grs=github&t=white&p=lecture02%2Fpresentation#/)
[Lecture 3. Collections, Exceptions, Generics](https://gitpitch.com/rybalkinsd/atom/lecture03?grs=github&t=white&p=lecture03%2Fpresentation#/)
[Lecture 4. Web client, HTTP, REST](https://gitpitch.com/rybalkinsd/atom/lecture04?grs=github&t=white&p=lecture04%2Fpresentation#/)
[Lecture 5. Web server, Spring, Annotations](https://gitpitch.com/rybalkinsd/atom/lecture05?grs=github&t=white&p=lecture05%2Fpresentation#/)
[Lecture 6. Databases, SQL, JDBC](https://gitpitch.com/rybalkinsd/atom/lecture06?grs=github&t=white&p=lecture06%2Fpresentation#/)
[Lecture 7. ORM, Hibernate](https://gitpitch.com/rybalkinsd/atom/lecture07?grs=github&t=white&p=lecture07%2Fpresentation#/)
[Lecture 8. WebSocket](https://gitpitch.com/rybalkinsd/atom/lecture08?grs=github&t=white&p=lecture08%2Fpresentation#/)
[Lecture 9. Game Server architecture](https://gitpitch.com/rybalkinsd/atom/lecture09?grs=github&t=white&p=lecture09%2Fpresentation#/)
[Lecture 10. Basic concurrency, Critical section](https://gitpitch.com/rybalkinsd/atom/lecture10?grs=github&t=white&p=lecture10%2Fpresentation#/)
[Lecture 11. Basic concurrency, Concurrent data structures](https://gitpitch.com/rybalkinsd/atom/lecture11?grs=github&t=white&p=lecture11%2Fpresentation#/)
[Lecture 12. GC, Heap](https://gitpitch.com/rybalkinsd/atom/lecture12?grs=github&t=white&p=lecture12%2Fpresentation#/)

[![Course announcement](https://img.youtube.com/vi/12Ur1brHHz8/0.jpg)](https://www.youtube.com/watch?v=12Ur1brHHz8&feature=youtu.be "Course announcement")
3 changes: 0 additions & 3 deletions bomberman/frontend/Dockerfile

This file was deleted.

2 changes: 0 additions & 2 deletions bomberman/frontend/build.gradle

This file was deleted.

5 changes: 0 additions & 5 deletions bomberman/frontend/src/main/webapp/README.md

This file was deleted.

Loading