Commit graph

124 commits

Author SHA1 Message Date
Christian d3be29535a Small changes 2019-04-07 03:30:10 +02:00
Whizel 02d306f1c5 Is working kinda 2019-04-07 02:24:18 +02:00
Christian 9fa81de6a2 merge 2019-04-07 02:17:31 +02:00
Whizel b5a3943863 This is gonna be a merge hell 2019-04-07 01:55:40 +02:00
Whizel 6d3afabb1a This is gonna be a merge hell 2019-04-07 01:53:22 +02:00
Christian a7a9bd1952 Formatting 2019-04-07 01:43:45 +02:00
Whizel 635b50ed27 Changed when we post 2019-04-07 01:38:29 +02:00
Casper V. Kristensen a1eac10beb
Merge remote-tracking branch 'origin/master' 2019-04-07 01:29:22 +02:00
Casper V. Kristensen 561b022121
Update names, update ISS. 2019-04-07 01:29:09 +02:00
Christian 69416067d8 Added resultpage 2019-04-07 01:27:48 +02:00
Alexander Munch-Hansen 7b2ea7ea8d Merge remote-tracking branch 'origin/master' 2019-04-07 01:23:53 +02:00
Alexander Munch-Hansen 58221e304a More descriptions 2019-04-07 01:23:43 +02:00
Milo b026b9e7fa Merge remote-tracking branch 'origin/master' 2019-04-07 00:56:27 +02:00
Milo ccdf9d3d13 icons and stuff 2019-04-07 00:56:14 +02:00
Alexander Munch-Hansen 1c9cdf497b Merge remote-tracking branch 'origin/master' 2019-04-07 00:06:15 +02:00
Alexander Munch-Hansen f126291e02 pls 2019-04-07 00:06:07 +02:00
Milo 30ed7e47f6 Merge remote-tracking branch 'origin/master' 2019-04-07 00:04:13 +02:00
Milo b6c414f556 fixed more strats 2019-04-07 00:04:06 +02:00
Alexander Munch-Hansen fa63cb9e06 pls 2019-04-07 00:03:50 +02:00
Alexander Munch-Hansen 65a49dfb95 pls 2019-04-07 00:01:06 +02:00
Whizel 4634409738 Merged changed to routing 2019-04-06 23:31:43 +02:00
Whizel 9392ab2f9c commit before pull 2019-04-06 23:29:38 +02:00
Whizel 43f117e518 commit before pull 2019-04-06 23:29:16 +02:00
Christian c461a2352e Merge branch 'master' of https://gitfub.space/caspervk/nightr 2019-04-06 23:11:41 +02:00
Christian e1ae6d2d54 Added routing through Angular 2019-04-06 23:11:23 +02:00
Casper V. Kristensen 319c03067f
Reasons and battery. 2019-04-06 23:00:08 +02:00
Milo 64108f67f9 Merge remote-tracking branch 'origin/master' 2019-04-06 22:45:14 +02:00
Milo 8dc3c9ac2c fixed cam img strat again 2019-04-06 22:45:01 +02:00
Alexander Munch-Hansen 98c154771a Worst svm ever 2019-04-06 22:39:19 +02:00
Alexander Munch-Hansen 8cf08d6719 fixed messages 2019-04-06 22:29:09 +02:00
Casper V. Kristensen 0113869d68
Revert "Lol"
This reverts commit 64c22b3f
2019-04-06 21:22:22 +02:00
Casper V. Kristensen 64c22b3f08
Lol 2019-04-06 21:18:40 +02:00
Whizel f47982f094 Camera is now working 2019-04-06 21:17:46 +02:00
Casper V. Kristensen 63775b7887
Fix bug increase caching. 2019-04-06 21:12:16 +02:00
Alexander Munch-Hansen 53e5b99ca2 Merge branch 'master' of https://gitfub.space/caspervk/nightr 2019-04-06 21:05:57 +02:00
Alexander Munch-Hansen 27935feeba merged 2019-04-06 21:05:47 +02:00
Casper V. Kristensen a984a2f961
Fix. 2019-04-06 21:05:17 +02:00
Alexander Munch-Hansen 396c8480ac bug fixing 2019-04-06 21:02:54 +02:00
Casper V. Kristensen 66c24a172d
Negative contributions. 2019-04-06 20:48:13 +02:00
Whizel e63fce456f Finished merging 2019-04-06 20:41:21 +02:00
Whizel 55dfa63f1a Comitting before pulling Picture service 2019-04-06 20:40:36 +02:00
Whizel 024ffe2a7f Comitting before pulling Picture service 2019-04-06 20:40:11 +02:00
Whizel 57352c3763 Comitting before pulling Picture service 2019-04-06 20:39:28 +02:00
Christian 8826d77647 Added camera service and button 2019-04-06 20:26:10 +02:00
Casper V. Kristensen de299f61ea
Bing 2019-04-06 20:21:52 +02:00
Casper V. Kristensen c3d98f15ed
Battery is int. 2019-04-06 19:55:49 +02:00
Milo 43e2c9628f Merge remote-tracking branch 'origin/master' 2019-04-06 19:54:04 +02:00
Alexander Munch-Hansen d60f74e496 Merge branch 'master' of https://gitfub.space/caspervk/nightr 2019-04-06 19:53:31 +02:00
Alexander Munch-Hansen 565e83d92f Just eat strat 2019-04-06 19:53:26 +02:00
Milo 7a317ad6b3 fixed cam img strat 2019-04-06 19:51:57 +02:00