MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
1,017 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

1017 Commits (4242108b3e4a32c3681162056ed84186fceacc8d)

Author SHA1 Message Date
Iglocska 4242108b3e Merge branch 'feature/sync/timestamp' of https://github.com/MISP/MISP into feature/sync/timestamp 2013-06-10 23:01:08 +02:00
Iglocska f8f290375e Further changes to the degradation of the distribution 2013-06-10 23:00:45 +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
Iglocska b74179bc84 Further work on the distribution 2013-06-10 21:38:04 +02:00
Iglocska 06ca5ba0cd Further changes to the distribution 
- changed to use the new int field
 2013-06-10 20:49:31 +02:00
Iglocska 638a99e0e7 Few changes 2013-06-10 20:34:05 +02:00
Christophe Vandeplas 128725cb36 Merge branch 'feature/gui' into develop 
Conflicts:
	app/View/Users/memberslist.ctp
 2013-06-10 20:23:29 +02:00
Christophe Vandeplas de8793fbfc Performance - caching of CakeRouting and url generation 2013-06-10 18:01:04 +02:00
Christophe Vandeplas 722107195d UI filter of event view (forgot this file) 2013-06-10 17:58:08 +02:00
Christophe Vandeplas e0c0e7ccf5 unified links 2013-06-10 17:57:20 +02:00
iglocska 96234bbbcc new sql changes 2013-06-10 17:40:12 +02:00
iglocska 3c23ac3a86 Change to new distribution 
- first stage
 2013-06-10 17:33:03 +02:00
Christophe Vandeplas 3ed50e2aef improve UI of event index filtering 2013-06-10 17:24:41 +02:00
Christophe Vandeplas 0cafc7ec6b fix documentation link 2013-06-10 12:26:32 +02:00
Christophe Vandeplas d81ffe56b7 Performance improvement with static urls 2013-06-10 11:31:46 +02:00
Christophe Vandeplas c348c62a0e fix bug no tooltip with Chrome/IE on attributes 2013-06-10 10:46:03 +02:00
Christophe Vandeplas 482fd8b8b0 fix no tooltip bug on Chrome and probably IE. 2013-06-10 10:41:29 +02:00
iglocska 7871336164 Removed incorrect validation 2013-06-10 09:02:20 +02:00
Christophe Vandeplas bd88c10bf1 removed not necessary sort results in huge performance improvement 2013-06-08 16:55:04 +02:00
Christophe Vandeplas d4d24a3aea peformance 2013-06-08 11:31:22 +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
iglocska 7059eac08c Small change to the timestamp 
- Moved the timestamp generation for attributes and events that are
being saved and don't have one to Model->beforeValidate()
 2013-06-07 10:24:03 +02:00
iglocska 58c00150ba First cleanup of AttributesController and EventsController after the 
move to timestamps
 2013-06-07 09:45:26 +02:00
Iglocska 4f249d21d6 Small mistake in the previous commit 2013-06-07 02:49:08 +02:00
Iglocska 22284d04d1 Update to the sync 
- timestamp now correctly compared, events that have an older timestamp
  will be discarded, same with attributes

- right now the response is the same as a successful edit though, should
  be handled more gracefully

- pull is not yet tested

- attachments and shadow attributes not yet implemented

- backflow is nicely blocked by the timestamp as intended

- needs cleanup (from, dist_change)
 2013-06-07 02:44:03 +02:00
iglocska 1e7665cd6d Saving over night, something still blocks the timestamp from being saved 
after a push...
 2013-06-06 18:43:26 +02:00
Christophe Vandeplas 0d66ef931a UI tooltip love 2013-06-06 18:06:22 +02:00
iglocska 4e2685e0c6 More work on the timestamps 
- Event correctly changes timestamp when attribute edited in the UI
- Attribute correctly changes timestamp when edited in the UI

- Still very much work in progress, several parts are not supposed to
work yet
 2013-06-06 16:03:28 +02:00
iglocska d52b0a6e70 First (still non-working) version of the timestamp + uuid sync 
- timestamp field added to events and attributes (int length 11 called
timestamp, default value 0)
- timestamps created on add / edit when apprioriate
- during an add, if an event/attribute is not being pushed through a
sync with an existing timestamp, create a timestamp
- on edit, check whether the timestamp is newer than the old one and
only add the attribute or event then
 2013-06-06 14:55:13 +02:00
iglocska 90dd14808d Bug with adding an event and the org being set incorrectly 2013-06-06 11:01:10 +02:00
iglocska cb3ac8be15 Changes to the event filtering 
- there was a bug that pushed the data entered into the "published"
filter field to the date fields -> fixed

- Also a bug in the serverscontroller, pulling threw an undefined
warning from the log controller because a single saveField was used and
the logController couldn't save the url data for the action
 2013-06-06 10:24:27 +02:00
iglocska 361fb238e0 Merge branch 'feature/gui' of https://github.com/MISP/MISP into feature/gui 
Conflicts:
	app/Controller/EventsController.php
 2013-06-05 17:46:35 +02:00
iglocska bc42dbd78c Filters updated and some changes for the sync 
- visual changes
- date from/until fields
- published field
- a reset form button

- the org of an event added by a sync user will be that of the host
instance's own organisation identifier
 2013-06-05 17:45:01 +02:00
Christophe Vandeplas e21acac23e fix incorrect location of loadModel for Attribute 2013-06-05 13:50:33 +02:00
iglocska 2543916944 Merge branch 'feature/gui' of https://github.com/MISP/MISP into feature/gui 2013-06-04 17:41:53 +02:00
iglocska 0410c1465e First version of the new filters on event index 2013-06-04 17:41:27 +02:00
Christophe Vandeplas 213290961b force passwd change for admin user on creation 2013-06-04 13:22:05 +02:00
Christophe Vandeplas 38897d9af3 create default admin user automatically 2013-06-04 13:06:57 +02:00
iglocska d51e7a002b Small UI change to the exports screen 2013-06-04 11:01:53 +02:00
iglocska 5b6544e580 Small fix to event view attribute access permissions 
- Server only attributes not visible to members of another organisation
- fixed
 2013-06-04 09:03:12 +02:00
iglocska 21a9bc2820 Tiny cosmetic change 2013-06-04 08:51:50 +02:00
iglocska c09097705a Merge branch 'feature/gui' of https://github.com/MISP/MISP into feature/gui 2013-06-03 17:24:12 +02:00
iglocska 0b834464ac Changes to the event view 
- reworked the way events are loaded and reloaded to check for
privileges
 2013-06-03 17:23:34 +02:00
Christophe Vandeplas a4d4964630 UI hide top links when not logged in 2013-06-03 16:37:13 +02:00
iglocska f545511a76 Slight change to the event xml output 
- now includes both shadowattributes related to attributes and events
 2013-06-03 16:32:45 +02:00
iglocska 1d8003f4f5 Merge branch 'feature/gui' of https://github.com/MISP/MISP into feature/gui 
Conflicts:
	app/View/Events/view.ctp
 2013-06-03 16:30:32 +02:00
iglocska 5522578f68 Update to the shadow attributes 
- UI changes
- changed the relationship between shadowattributes and events to be
hasMany
 2013-06-03 16:25:43 +02:00
Christophe Vandeplas 8414264c3c UI fix login screen 2013-06-03 15:59:22 +02:00
Christophe Vandeplas a1fae67177 Merge branch 'feature/gui' of https://github.com/MISP/MISP into 
feature/gui
 2013-06-03 14:45:53 +02:00