MISP
/
misp-bump
mirror of https://github.com/MISP/misp-bump
2
0
Fork 0
Code Issues Releases Wiki Activity
146 Commits
3 Branches
0 Tags
51 MiB
Commit Graph

146 Commits (fad2d282216928e1cd1da17dfb7a08d282c6893c)

Author SHA1 Message Date
Felix Prahl-Kamps eb74090fd8 renamed to MISPBump 2018-08-10 15:15:09 +02:00
Felix Prahl-Kamps 49b5af5a05 Merge branch 'develope' into 'master' 
Merge to master

See merge request its-wg/overview/overview-ubo/misp-auth!2
 2018-07-22 20:27:31 +02:00
Felix Prahl-Kamps 927f1776d9 resolved conflict 2018-07-22 20:25:47 +02:00
Felix Prahl-Kamps f5ea6fecc4 update readme 2018-07-22 20:24:31 +02:00
Felix Prahl-Kamps bcdb8db4a8 Update README.md 2018-07-22 20:21:22 +02:00
Felix Prahl-Kamps fce9e33011 restructure 2018-07-22 20:18:25 +02:00
Felix Prahl-Kamps 796c9a2478 RecyclerView for sync profile, new launcher icon 2018-07-22 20:10:32 +02:00
Felix Prahl-Kamps 93f4c5b1a9 fixed security issue where auth key was accidentaly on disk, fixed download info bug 2018-07-19 20:54:36 +02:00
Felix Prahl-Kamps c488106230 Merge branch 'master' of git.cs.uni-bonn.de:its-wg/overview/overview-ubo/misp-auth 2018-07-19 20:23:01 +02:00
Felix Prahl-Kamps 07654028a2 resolved most warnings 2018-07-19 20:20:15 +02:00
Felix Prahl-Kamps f7714539e8 Update README.md 2018-07-19 14:10:58 +02:00
Felix Prahl-Kamps bafb540de3 Update README.md 2018-07-19 11:04:36 +02:00
Felix Prahl-Kamps d37db64573 Update README.md 2018-07-19 11:04:16 +02:00
Felix Prahl-Kamps ac4475a646 Update README.md 2018-07-19 11:03:38 +02:00
Felix Prahl-Kamps 974f3a6e5d added screenshots 2018-07-19 11:01:38 +02:00
Felix Prahl-Kamps 503d5e0bd5 readme 2018-07-19 10:25:45 +02:00
Felix Prahl-Kamps cde59784b1 Renamed to MISPBump 2018-07-19 10:12:04 +02:00
Felix Prahl-Kamps 617a0a6c61 changed MispAuth.pdf 2018-06-24 22:07:59 +02:00
Felix Prahl-Kamps 98f3a8751a added MISPauth.pdf 2018-06-23 16:16:31 +02:00
Felix Prahl-Kamps d9ecd7e7a3 quick syncProcess fix 2018-06-17 14:19:48 +02:00
Felix Prahl-Kamps 995e1070f5 fixed thread problem; added QrReviewFragment; added more strings for multilanguage support 2018-06-17 14:00:27 +02:00
Felix Prahl-Kamps 70dbbeb479 implemented sync process 2018-06-16 17:38:59 +02:00
Felix Prahl-Kamps b49cc7a66f started sync activity, cleanup 2018-06-12 20:33:27 +02:00
Felix Prahl-Kamps b7111a47d8 improved error handling, added server model, added server request 2018-06-10 23:34:21 +02:00
Felix Prahl-Kamps 3ee88a028e resolved merge conflicts 2018-06-10 19:01:01 +02:00
Felix Prahl-Kamps aaa62bca1c removed button in orgDialog 2018-06-10 18:50:39 +02:00
Felix Prahl-Kamps b87fb9a4c5 rest api improvement 2018-06-10 18:46:23 +02:00
Felix Prahl-Kamps 436c5bafac improved rest api 2018-06-10 18:40:41 +02:00
Felix Prahl-Kamps d3c25b8be9 ported to IntelliJ Idea 2018-06-10 16:28:28 +02:00
Felix Prahl-Kamps c11d12932c Completely ported to IntelliJ Idea 2018-06-10 16:23:33 +02:00
Felix Prahl-Kamps 3eb0d68750 new screen 2018-06-05 18:30:05 +02:00
Felix Prahl-Kamps e4330f7100 new screens 2018-06-05 17:57:56 +02:00
Felix Prahl-Kamps 40632cef5f changed gitignore, removed changelog 2018-06-05 14:49:04 +02:00
Felix Prahl-Kamps 497d9fb02f added screenshots, new myOrgActivity 2018-06-05 14:43:24 +02:00
Felix Prahl-Kamps bfd853814c ~ExternalOrgViewHolder, back to android studio 2018-06-05 13:32:14 +02:00
Felix Prahl-Kamps 621dfec332 Add CHANGELOG 2018-05-29 13:34:50 +02:00
Felix Prahl-Kamps 98661c6913 Reinitialize 2018-05-29 13:24:01 +02:00
Felix Prahl-Kamps 3b343e3cd9 Merge branch '1-patch-master' into 'master' 
Resolve "Connect with MISP"

Closes #1

See merge request its-wg/overview/overview-ubo/misp-auth!1
 2018-04-22 02:01:21 +02:00
Felix Prahl-Kamps 80b58bc77f Merge branch 'master' into '1-patch-master' 
# Conflicts:
#   .idea/assetWizardSettings.xml
#   .idea/modules.xml
#   app/build.gradle
#   app/src/main/AndroidManifest.xml
#   app/src/main/res/layout/activity_main.xml
#   app/src/main/res/values/colors.xml
#   app/src/main/res/values/strings.xml
#   app/src/main/res/values/styles.xml
#   build.gradle
#   gradle.properties
#   gradle/wrapper/gradle-wrapper.properties
 2018-04-22 02:00:45 +02:00
Felix Prahl-Kamps babaf2cd81 Initial commit 2018-04-22 01:50:05 +02:00
Felix Prahl-Kamps d85f0a61dd material design guidline is a JOKE 2018-04-04 03:13:46 +02:00
Felix Prahl-Kamps df4d2ab153 .gitignore is now working 2018-04-03 20:00:45 +02:00
Felix Prahl-Kamps 41243e08db gitignore 2018-04-03 19:57:23 +02:00
Felix Prahl-Kamps 5ddb12b416 added gitignore 2018-04-03 18:53:32 +02:00
Felix Prahl-Kamps d8536da51b added readme 2018-04-03 18:37:17 +02:00
Felix Prahl-Kamps 613cbf9f72 Initial commit 2018-04-03 18:17:38 +02:00