Commit Graph

297 Commits (fd82ef8a2cafb70e6895feb8a15bb9339214477a)

Author SHA1 Message Date
Sami Mokaddem a5f4306489 Text label with correct format + Linked x overtime (linechart) 2017-11-16 16:57:48 +01:00
Sami Mokaddem 5779eb53c4 Merge branch 'users' into trendings 2017-11-16 15:11:04 +01:00
Sami Mokaddem 8daa9e4364 Fix: setupgrid forgotten + bad contition 2017-11-16 15:10:29 +01:00
Sami Mokaddem 8942a43c18 Added linked pie plot with server 2017-11-16 15:08:14 +01:00
Sami Mokaddem 71837d3308 Added trendings template 2017-11-16 12:23:02 +01:00
Sami Mokaddem 8de58f77f4 Added link in header 2017-11-16 12:01:43 +01:00
Sami Mokaddem fab250cae7 Renamed panel title 2017-11-15 16:00:08 +01:00
Sami Mokaddem 82346e8782 Split js and html 2017-11-15 15:58:16 +01:00
Sami Mokaddem e0d155564f Replaced loginOccurence by contribution/login 2017-11-15 15:40:28 +01:00
Sami Mokaddem 66fe81b064 Added no data display in contribution_after_login 2017-11-15 14:43:28 +01:00
Sami Mokaddem 05c7c7a453 Linked contribution_and_login to server 2017-11-15 14:34:37 +01:00
Sami Mokaddem b913f86e7b Linked MISP - Users with server (nto done for API usage yet) 2017-11-15 13:45:01 +01:00
Sami Mokaddem c1105aba73 Added login overtime + users_helper script 2017-11-15 09:36:44 +01:00
Sami Mokaddem 2f74406f64 Draft MISP-Users 2017-11-14 17:03:46 +01:00
Sami Mokaddem 3ec4bcb7a4 Fixed keyError new categ 2017-11-14 17:02:51 +01:00
Sami Mokaddem 2b3a5be907 Start of linking fame quality 2017-11-14 15:44:53 +01:00
Sami Mokaddem 8eae00f6b5 Fixed bug json parsing in server + continuation of trophy support in zmq 2017-11-14 14:56:15 +01:00
Sami Mokaddem f22aaee21d Draft support of trophies in ZMQ 2017-11-14 14:05:54 +01:00
Sami Mokaddem c13e39d5a6 added latestAwards + started trophy ranks 2017-11-14 09:50:20 +01:00
Sami Mokaddem 70561357c3 Draft eventSource lastAwards 2017-11-13 16:26:09 +01:00
Sami Mokaddem c35fbe969b Started new contrib layout (latest awards + 2 fames tabs) + fixed bug searching org (caused by the switch to link) 2017-11-13 16:02:09 +01:00
Sami Mokaddem f59aac98d7 Continuation of trophy intergration 2017-11-13 15:19:30 +01:00
Sami Mokaddem 0bc0683924 Started support of organisation trophies 2017-11-13 12:57:05 +01:00
Sami Mokaddem 1b9f9bd452 Merge branch 'master' of github.com:MISP/misp-dashboard 2017-11-13 09:15:32 +01:00
Sami Mokaddem 2b4cae69ad Styling overtake 2017-11-13 09:15:20 +01:00
mokaddem cd46dd3bcf
Update README.md 2017-11-10 16:45:47 +01:00
mokaddem 165b1b5f4f
Update README.md 2017-11-10 16:44:57 +01:00
mokaddem 577eca8819
Update README.md 2017-11-10 16:22:05 +01:00
Sami Mokaddem 2ec8ece70c Added screenshots geo and live 2017-11-10 16:16:38 +01:00
Sami Mokaddem 53f0de57ae Added screenshots contributors 2017-11-10 16:03:41 +01:00
Sami Mokaddem 7905c7ffc0 Merge branch 'contributors' 2017-11-10 15:53:21 +01:00
Sami Mokaddem 282bf4f353 Fixed UI button bug 2017-11-10 15:51:30 +01:00
Alexandre Dulaunoy 633fbba881
Merge pull request #3 from mokaddem/contributors
Contributor dashboard
2017-11-10 15:49:00 +01:00
Sami Mokaddem e071975eff Added count for proposal and sighting 2017-11-10 15:03:33 +01:00
Sami Mokaddem 9291c34699 Added support of Discusison 2017-11-10 14:33:10 +01:00
Sami Mokaddem 158532aa86 Prevent duplication of org in Lsat contributors 2017-11-10 14:10:48 +01:00
Sami Mokaddem 0e1291c813 Merged upstream 2017-11-10 13:57:00 +01:00
Sami Mokaddem 98e849f39e Added CP interactivity 2017-11-10 13:46:23 +01:00
Sami Mokaddem df53a51b66 removed initial config.cfg 2017-11-10 13:39:59 +01:00
Sami Mokaddem 254141ecb1 Updating install script 2017-11-10 13:25:38 +01:00
Sami Mokaddem f8e1725a22 Updated dependencies install script 2017-11-10 11:50:32 +01:00
Sami Mokaddem 6b85144164 Updated org contrib. overtime to display the date 2017-11-10 11:15:31 +01:00
Sami Mokaddem e554158467 Slight modification to point reward 2017-11-10 10:40:56 +01:00
Sami Mokaddem 0080de3d8e better display for badges and time 2017-11-10 10:32:51 +01:00
Sami Mokaddem 46d389c210 Added display of datetime in last contributors 2017-11-10 09:56:41 +01:00
Sami Mokaddem d8ad176b72 Added support of previous date in getLastContributors 2017-11-10 09:28:59 +01:00
Sami Mokaddem cb53be4253 Prevent double display of org in line chart 2017-11-10 09:22:46 +01:00
Sami Mokaddem b0a83a9ebd Added support of previous date from getCategPerContrib 2017-11-10 09:00:50 +01:00
Sami Mokaddem 1725f0b519 Added helper script to give ranks/badges 2017-11-09 16:31:34 +01:00
Sami Mokaddem a3c853e490 Updated ranking level decision + updated support of message for zmq + Updated badge acquisition display to match data in DB 2017-11-09 16:31:04 +01:00