Skip to content
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

New record consoles and removal of old datacore, adds SSrecords #4878

Merged
merged 83 commits into from
Jul 27, 2019
Merged

New record consoles and removal of old datacore, adds SSrecords #4878

Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
7234257
New SSrecords
Karolis2011 Jun 11, 2018
c73f0b2
This is crazy
Karolis2011 Jun 27, 2018
a88fd9c
Puts warrants under SSrecords
Karolis2011 Jun 27, 2018
ec24a59
Brougth back some functions, and reduced error count
Karolis2011 Jun 27, 2018
e3a4116
Added back manifest
Karolis2011 Jun 27, 2018
417a971
Just a lot done
Karolis2011 Jun 27, 2018
8bf5b0d
Vueui is still not ready.
Karolis2011 Jun 27, 2018
21975c5
Oh, I missed the sopt
Karolis2011 Jun 27, 2018
2ec4a87
Fixes to PDA
Karolis2011 Jun 27, 2018
31d066e
Merge remote-tracking branch 'upstream/development' into datacore
Karolis2011 Aug 4, 2018
ebe5bc8
Fix things up after merge
Karolis2011 Aug 4, 2018
34c0700
Removes old consoles
Karolis2011 Aug 5, 2018
48d0e03
Start of console and stuff
Karolis2011 Aug 25, 2018
2f4361d
Delete of backups
Karolis2011 Aug 25, 2018
bce4b41
Start of things
Karolis2011 Aug 29, 2018
cbef86f
Important fixes to vueui
Karolis2011 Aug 29, 2018
bacfb1e
Merge branch 'development' into datacore
Karolis2011 Aug 29, 2018
a1d322b
More progress
Karolis2011 Aug 30, 2018
e481a64
Is travis now happy?
Karolis2011 Aug 30, 2018
52927b1
Again?
Karolis2011 Aug 30, 2018
b0a46ec
Mooooore progress on consoles
Karolis2011 Aug 30, 2018
9882a80
Let's send Params as JSON
Karolis2011 Aug 30, 2018
962a0a8
Lohikar suggested improvements
Karolis2011 Aug 31, 2018
7f8d8ff
Forgot again.
Karolis2011 Aug 31, 2018
c699277
Progress
Karolis2011 Sep 23, 2018
7b9006c
Merge remote-tracking branch 'upstream/development' into datacore
Karolis2011 Sep 23, 2018
9d5fc9d
Fixes
Karolis2011 Sep 23, 2018
085ecae
record.age.
Karolis2011 Sep 23, 2018
5fa67df
Merge remote-tracking branch 'upstream/development' into datacore
Karolis2011 Oct 19, 2018
1953958
Map refix
Karolis2011 Oct 19, 2018
199ccbc
Fix to make travis happy
Karolis2011 Oct 19, 2018
ab6d33e
WIP
Karolis2011 Dec 30, 2018
bfb2e50
UpdAate
Karolis2011 Dec 30, 2018
e319cba
Update stuff more
Karolis2011 Dec 30, 2018
f06c880
Fixed things
Karolis2011 Dec 30, 2018
0f9de38
Still working on it
Karolis2011 Dec 30, 2018
01197c2
Editing and more!
Karolis2011 Jan 1, 2019
77b8b31
Getting things rigth
Karolis2011 Jan 1, 2019
0107fce
Choice fields
Karolis2011 Jan 1, 2019
5e786f0
Fixes and authenthication
Karolis2011 Jan 2, 2019
5c362d3
Merged master
Karolis2011 Jan 2, 2019
3ce66a4
Github sucks
Karolis2011 Jan 2, 2019
86218d6
Lint fixes
Karolis2011 Jan 2, 2019
538dadb
Added virus note editing
Karolis2011 Jan 2, 2019
3baa7a0
Forgot to undefine
Karolis2011 Jan 2, 2019
c6863d1
Changelog
Karolis2011 Jan 3, 2019
c92c7b6
Updated with master
Karolis2011 Jan 5, 2019
16f52c0
Quick fix for new lines
Karolis2011 Jan 5, 2019
651fe65
Attempt to make images more reliable
Karolis2011 Jan 27, 2019
e4b7b9d
Fiexes for data sanitization and stuff
Karolis2011 Jan 27, 2019
7da0529
Better editing ui.
Karolis2011 Jan 27, 2019
0ccbcb3
Fixes and updates
Karolis2011 Jan 27, 2019
f197617
Merged master
Karolis2011 Jan 27, 2019
d0c01ca
Fixed map, again
Karolis2011 Jan 27, 2019
9d9171d
incidents to records
Karolis2011 Apr 14, 2019
2ef1aae
Merge remote-tracking branch 'upstream/master' into datacore
Karolis2011 Apr 14, 2019
c1c0636
Fixes
Karolis2011 Apr 14, 2019
7d610db
Fixed Map
Karolis2011 Apr 14, 2019
1f92a59
Merge remote-tracking branch 'upstream/master' into datacore
Karolis2011 May 9, 2019
57bae2f
Reworks manifest generation
Karolis2011 May 9, 2019
3fab806
Merges things
Karolis2011 Jun 1, 2019
59097cd
Merge with master
Karolis2011 Jul 14, 2019
6d35a83
Fixes map one again.
Karolis2011 Jul 14, 2019
eadea74
Add list utilities and generalizes few functions
Karolis2011 Jul 14, 2019
739ea00
Proper incident serialization
Karolis2011 Jul 14, 2019
28b34e2
New item element.
Karolis2011 Jul 14, 2019
53d2baa
Incidents ui and new ui element use.
Karolis2011 Jul 14, 2019
e449954
Search component add.
Karolis2011 Jul 15, 2019
9715023
Added search to record list
Karolis2011 Jul 15, 2019
1c938af
Lint fixes.
Karolis2011 Jul 15, 2019
0f14de9
Inconsistant indenetion :ree:
Karolis2011 Jul 15, 2019
3d61dea
Merge remote-tracking branch 'upstream/master' into datacore
Karolis2011 Jul 15, 2019
7e1f588
Fixes manifest not updating properly.
Karolis2011 Jul 16, 2019
f0b87f4
Skull made my life more miserable.
Karolis2011 Jul 16, 2019
6a2c884
Makes things properly update
Karolis2011 Jul 18, 2019
7fc1107
Apply suggestions from code review
Karolis2011 Jul 18, 2019
aa1496e
Apply suggestions from code review 2
Karolis2011 Jul 18, 2019
b915892
Acosiative lists.
Karolis2011 Jul 23, 2019
2dab8e6
Wipes Skull's tears.
Karolis2011 Jul 23, 2019
8230afb
Made CCIA thing open in probably new window
Karolis2011 Jul 23, 2019
9b808f5
Fixded merge conflic
Karolis2011 Jul 23, 2019
36285d7
Proper page opening.
Karolis2011 Jul 23, 2019
916f206
Merges with masters to solve conflicts
Karolis2011 Jul 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'development' into datacore
  • Loading branch information
@Karolis2011
Karolis2011 authored Aug 29, 2018
commit bacfb1ef6ad0bbdc6aa6a7ec65d10d4475750cb1

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.