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

1187 Commits (de6fc6f6ae123cce77f1d864a0c93bfcef14b49a)

Author SHA1 Message Date
iglocska 5d8e0c6f22 Protection against lost attributes with saveAssociated 
- attributes that are added have to have their id unset before being
added in order to avoid overwriting existing attributes
 2013-06-11 14:42:35 +02:00
iglocska 5e3976b7bc Merge branch 'feature/sync/timestamp' of https://github.com/MISP/MISP into feature/sync/timestamp 2013-06-11 14:06:35 +02:00
iglocska 6a30abfdd1 Change to the routes 
- disabling the routes to indeces with pagination throws an error when
switching to another page
 2013-06-11 14:05:40 +02:00
Christophe Vandeplas fa3c473f7f Merge branch 'feature/sync/timestamp' of https://github.com/MISP/MISP into feature/sync/timestamp 2013-06-11 13:56:51 +02:00
iglocska fd077e7bd4 Shadow attribute change 
- fixed incorrect link to edit shadow attributes and the distribution
checks
 2013-06-11 13:51:11 +02:00
iglocska be950da012 Update to the publish 
- _publish doesn't attempt to upload events that have a distribution of
0 or 1 (private and community) but instead just set to published and
return true
 2013-06-11 11:05:30 +02:00
iglocska db24e8c1f4 Update to the IOCImprt/Export 
- bringing the two components up to date with the distribution changes
 2013-06-11 10:50:16 +02:00
iglocska 17b570ec1f Typo in UsersController fixed 2013-06-11 10:37:56 +02:00
iglocska 78b3a1c0ed Routing and some UI changes to the users admin_index 2013-06-11 10:34:01 +02:00
Iglocska a3edc6a4ee UI changes and more work on the sync 
- updated the side menu
 2013-06-11 01:20:27 +02:00
Christophe Vandeplas fdfd3ba486 micro improvement 2013-06-11 00:44:04 +02:00
Iglocska 60f6b7b133 Merge branch 'feature/sync/timestamp' of https://github.com/MISP/MISP into feature/sync/timestamp 2013-06-11 00:42:32 +02:00
Iglocska 1635d99d8f Pull can not edit events / attributes 
- added the _edit method in EventsController
 2013-06-11 00:41:43 +02:00
Christophe Vandeplas b7a60d6b71 minor improvements in documentation 2013-06-11 00:23:01 +02:00
Christophe Vandeplas 0dc596fcac Merge branch 'feature/sync/timestamp' of https://github.com/MISP/MISP into feature/sync/timestamp 2013-06-10 23:57:58 +02:00
Christophe Vandeplas 675bd3c135 bugfix in UI 2013-06-10 23:56:35 +02:00
Iglocska ad7f24fd1d Merge branch 'feature/sync/timestamp' of https://github.com/MISP/MISP into feature/sync/timestamp 2013-06-10 23:35:48 +02:00
Iglocska 040227d66a Some more fixes to the sync 2013-06-10 23:34:47 +02:00
Iglocska 59acffecda Fix to the attribute list when not logged in 
- incorrect syntax fixed
 2013-06-10 23:30:20 +02:00
Iglocska 518ca14e18 Small bug with view() fixed 2013-06-10 23:13:13 +02:00
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