MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
3,368 Commits
63 Branches
383 Tags
216 MiB
Commit Graph

37 Commits (341d91f949b6174edf501e16ea39947dbb715326)

Author SHA1 Message Date
Iglocska 55e66d7d74 Correct conversion of the own server before sync 
- also a small fix to the event tags and unicode chars
 2015-12-11 14:08:45 +01:00
iglocska b3a2428345 Merge branch 'basedir' into hotfix-2.3.160 
Conflicts:
	app/Controller/AppController.php
	app/View/Pages/administration.ctp
 2015-11-17 00:33:34 +01:00
pugilist ec7d85332c modified many instances of html anchors and javascript document.location to use 2015-11-08 15:38:24 -05:00
Richard van den Berg c49c387337 Only truncate string if adding ... will make it shorter 2015-04-08 14:08:38 +02:00
iglocska f0aa849d04 Various improvements to the exports 
- Unified the way exports accept negated parameters
- Fixed the documentation
- Most exports are now restrictable by the event date (From/To parameters)
- none cached XML export now writes to file after converting each event, clearing the memory and resolving any potential memory issues
 2015-02-03 17:06:05 +01:00
iglocska 5a993dc120 Changes to the exports, fixes #285 
- XML export was slow, replaced SimpleXML with a simple script that outputs XML for massive performance gains
- New option in bootstrap to allow the cached XML export to also include the attachments
- CSV caching slightly rearranged, it's much more memory efficient now
- Some fixes to relatedevent orgs being shown even if showorg is disabled
- Added a new site admin action to generate several 3k events for load testing (slow)
 2014-09-02 15:56:28 +02:00
iglocska c5ed7531cd Truncated the event info fragment shown in the pivot bubbles by one extra character 2014-07-19 16:03:21 +02:00
iglocska bec1287968 Tagging system 
- new special role for tagging
- can create tags with a name + colour combination (using a colour picker plugin)
- users can assign tags to events
- can filter events by tags on the index
 2014-01-23 12:25:04 +01:00
iglocska 6e842da5bc Serious bug with the discussion boards 
- A malformed [Thread][/Thread] tag can lead to an infinite loop on the event / thread view. Fixed.
 2014-01-07 16:12:47 +01:00
iglocska 785f57143a Merge branch 'feature/CakeResque' into feature/test 2014-01-06 12:12:51 +01:00
iglocska 0e744871bd Further work on the scheduled tasks 
- Also some changes left off from the previous commit
 2013-12-17 11:38:06 +01:00
iglocska eab4923144 Merge branch 'hotfix-2.1.32' into develop 
- Also, added CIDR to rest searches. Make sure you use the following format:

a.b.c.d|e

Conflicts:
	app/Controller/AttributesController.php
 2013-12-16 15:54:14 +01:00
iglocska 1f1661e81f CIDR searches fixes #190 
- possible to use CIDR when searching attributes
 2013-12-16 14:11:30 +01:00
iglocska 1c3425fc91 Merge branch 'develop' into feature/CakeResque 
- develop and the first CakeResque implementation merged

Conflicts:
	app/View/Layouts/default.ctp
 2013-11-06 11:02:23 +01:00
iglocska 0f80145c6d :q 2013-11-06 10:52:18 +01:00
iglocska bbbc17a95b Merge remote-tracking branch 'origin/feature/XML_and_UI' into feature/discussion 
- Also some improvements to the shadow attributes

- some minor UI changes

Conflicts:
	app/Controller/EventsController.php
	app/View/Elements/global_menu.ctp
	app/View/Layouts/default.ctp
 2013-10-30 10:06:12 +01:00
iglocska b2b76779b9 More changes to the discussion boards 
- quote / event tags

- anonymised e-mail addresses
 2013-10-29 13:45:53 +01:00
iglocska 814fdba4ed Small cosmetic fix 
- fixed a cosmetic issue with 3+ digit ID numbers, an event info with wide characters can cause the pivot element to flow over into a second row.
 2013-10-18 10:58:40 +02:00
iglocska 6895548877 Merge branch 'develop' into feature/discussion 
- Pivots, attributes, discussions hideable

Conflicts:
	app/Controller/EventsController.php
	app/webroot/css/main.css
 2013-09-10 16:51:56 +02:00
iglocska 6d0c26b9d4 Delete button gone from pivot elements that should not be deleted 
- When looking at an event, a user should not be able to delete the pivot path that he/she took to get to that particular event.

- Deleting the root pivot item is an exception, this will simply reset the pivoting.
 2013-09-06 15:01:18 +02:00
iglocska 22593b2378 Finished the first version of the new pivoting 
- Users can go back to a previous event and branch the pivoting by choosing a new relation

- users can remove individual pivoted branches
 2013-09-06 09:51:46 +02:00
iglocska 1ad3a8ffd6 Discussion boards 
- First fully working version
- Create threads or create a thread attached to an event
- Add posts to threads / edit them / delete them
 2013-08-14 17:46:57 +02:00
Christophe Vandeplas 68c2fd09fe Merge branch 'develop' of https://github.com/MISP/MISP into feature/sync/timestamp 
Conflicts:
	app/View/Attributes/index.ctp
	app/View/Events/add.ctp
	app/View/Events/edit.ctp
 2013-06-10 23:00:37 +02:00
Christophe Vandeplas de8793fbfc Performance - caching of CakeRouting and url generation 2013-06-10 18:01:04 +02:00
iglocska fbf1700fc1 Accidental inclusion of some debug in the previous commit 
- removed
 2013-06-07 12:04:00 +02:00
iglocska beca1bb15e Small bug with the highlighthelper 
- ending the input with a break line will cause the highlter to fail
- fixed
 2013-06-07 12:03:28 +02:00
Christophe Vandeplas d3db196699 UI Logs, documentation, memberslist and fixed bug in highlight 2013-05-31 17:38:46 +02:00
iglocska eb4283ea9c Highlighting in log searches 
- new helper that can be used for highlighting

- highlighting of the search terms in the log search result - index view.
 2013-03-11 13:12:48 +01:00
noud 957b3e27b8 Merge branch 'master' into develop 
Conflicts:
	app/Controller/ServersController.php
 2012-11-20 11:01:18 +01:00
noud f62dbfd595 Code Standards 
Cleanup (again) the AppHelper.
 2012-09-25 16:14:20 +02:00
noud af6cb0e896 CakePHP 
Removed diffs that already are placed in build/patches.
 2012-09-25 15:46:50 +02:00
noud 18fb8a7a64 CakePHP 
Update from CakePHP to version 2.2.2
as well as needed patch files.
 2012-09-25 15:41:58 +02:00
noud c305af94e9 CakePHP 
To be able to update CakePHP (regularly),
we found the current differences and now
put these diffs to build/patches.

Patches are now relative to $CakePHP_HOME.
 2012-09-25 11:22:12 +02:00
noud 8179a1a691 Merge and code standards. 
Forgot to clean View/Helper/AppHelper.php.
Changed underscore method names to private and protected where
appropriate given phpcs code standards errors.
 2012-09-24 09:02:09 +02:00
noud 3e5ec0e801 CakePHP 
Located the patches done to CakePHP to be able to upgrade CakePHP.
 2012-09-20 15:59:01 +02:00
Andrzej Dereszowski 69fef3f6fa Fix for the routing problem on admin-privileged users. 
All links that need to be routed to admin-prefixed method have to have
'admin' => true in the parameters
 2012-04-02 22:26:36 +02:00
Christophe Vandeplas 865a24d0bd Migration to CakePHP 2.1. 
Most of the functionality migrated, Q&A review required.
 2012-03-15 15:06:45 +01:00