Commit Graph

404 Commits (4242108b3e4a32c3681162056ed84186fceacc8d)

Author SHA1 Message Date
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 de8793fbfc Performance - caching of CakeRouting and url generation 2013-06-10 18:01:04 +02:00
Christophe Vandeplas e0c0e7ccf5 unified links 2013-06-10 17:57:20 +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 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 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
Christophe Vandeplas 0d66ef931a UI tooltip love 2013-06-06 18:06:22 +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 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
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 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 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
Christophe Vandeplas bdc973f9ed alignment of action buttons 2013-06-03 14:44:31 +02:00
iglocska 70e5875516 Small mistake in the previous commit 2013-06-03 14:31:08 +02:00
iglocska 3b52bd2643 Attribute edit US change 2013-06-03 14:30:35 +02:00
Christophe Vandeplas d5c5134691 Display related events in multiple columns. fixes #113 2013-06-03 14:23:15 +02:00
iglocska 3549e0c49d More UI changes 2013-06-03 12:29:07 +02:00
iglocska 7eec9c01db Update to the import IOC ui
- new css class for the graph
2013-06-03 11:01:14 +02:00
iglocska 7691476fae More UI changes 2013-06-03 10:48:38 +02:00
iglocska 9a8f090b79 Update to the event index view 2013-06-03 08:58:57 +02:00
Iglocska 92416cdea5 Slight changes to the role creation and edit views 2013-06-02 14:41:41 +02:00
Andras b4846370c6 UI changes 2013-06-02 13:57:51 +02:00
Andras a27b3d7208 More UI changes 2013-06-02 13:51:41 +02:00
Andras 3d7355cf14 UI changes to event add/edit and change to events controller
- updated the UI for the event add and edit views

- change to the privileges when editing events - siteadmins could not edit
  events of other orgs.
2013-06-02 12:44:11 +02:00
Andras b68994d11f New forminfo tooltip and update to search attribute
- added tooltip to css

- small update to search attribute
2013-06-01 20:21:10 +02:00
Christophe Vandeplas 03a9b2bcc2 UI event fixes 2013-06-01 11:05:15 +02:00
Christophe Vandeplas bd50135fe6 UI events partial improvements 2013-06-01 08:46:21 +02:00
Christophe Vandeplas 9a256e04a5 UI rules and users improvements 2013-06-01 08:13:18 +02:00
Christophe Vandeplas 69251490ef Merge branch 'feature/gui' of https://github.com/MISP/MISP into
feature/gui

Conflicts:
	app/View/Logs/admin_index.ctp
	app/View/Logs/admin_search.ctp
	app/View/Users/memberslist.ctp
2013-05-31 17:50:00 +02:00
Christophe Vandeplas d3db196699 UI Logs, documentation, memberslist and fixed bug in highlight 2013-05-31 17:38:46 +02:00
iglocska d768d30e79 GUI changes for the user views 2013-05-31 15:42:53 +02:00