Christophe Vandeplas
daf97343da
Merge branch 'hotfix/2.1.18'
2013-09-02 16:04:55 +02:00
Christophe Vandeplas
23223155c7
fix bug in pull updated events, improved performance
2013-09-02 15:26:31 +02:00
iglocska
1e136e23af
Merge branch 'hotfix-2.1.17' into develop
2013-09-02 11:47:00 +02:00
iglocska
110bd5d3b8
Merge branch 'hotfix-2.1.17'
2013-09-02 11:46:50 +02:00
iglocska
28901cc682
Left-over line removed
2013-09-02 11:46:22 +02:00
iglocska
2db7d4360b
Merge branch 'hotfix-2.1.17' into develop
2013-09-02 11:44:19 +02:00
iglocska
64eca2b38e
Merge branch 'hotfix-2.1.17'
2013-09-02 11:43:45 +02:00
iglocska
a6a6c6bd35
Small cleanup
2013-09-02 11:36:27 +02:00
iglocska
e10d6a0afd
Attachments correctly exported with events/view/1.xml now
...
- bug that broke transfer of attachments on pull fixed
- data only exported on view() not mass xml exports
2013-09-02 11:31:34 +02:00
iglocska
b1ecb41968
Merge branch 'hotfix-2.1.15' into develop
2013-08-29 15:36:51 +02:00
iglocska
cac0520536
Merge branch 'hotfix-2.1.15'
2013-08-29 14:51:28 +02:00
iglocska
a98d94469a
Export fixes
...
- conversion of the array in the XML export to be compatible with the XML parser (some invalid characters could break it)
- New separate CSV export that includes all visible unpublished and non IDS signature attributes on request
2013-08-29 14:49:42 +02:00
iglocska
7dbd968581
Merge branch 'hotfix-2.1.15'
2013-08-29 13:56:38 +02:00
iglocska
b0f91729aa
A fix to the csv export
2013-08-29 13:56:19 +02:00
iglocska
4f6a153435
Merge branch 'hotfix-2.1.15' into develop
2013-08-29 12:43:49 +02:00
iglocska
ec55596ba7
Merge branch 'hotfix-2.1.15'
2013-08-29 12:43:39 +02:00
iglocska
40886018da
Fix to a typo causing exports to fail
2013-08-29 12:43:08 +02:00
iglocska
01546b3658
Merge branch 'hotfix-2.1.14' into develop
2013-08-28 14:58:16 +02:00
iglocska
309630499f
Merge branch 'hotfix-2.1.14'
2013-08-28 14:57:48 +02:00
iglocska
ebcbcdc6bf
Removed a left-over junk line from the shadow attribute controller
2013-08-28 14:56:40 +02:00
iglocska
af8b2af5af
Merge branch 'master' of https://github.com/MISP/MISP
2013-08-23 15:38:18 +02:00
iglocska
dbbfa947e2
Merge branch 'hotfix-2.1.14' into develop
2013-08-23 15:35:12 +02:00
iglocska
138aaf7a3f
Merge branch 'hotfix-2.1.14'
2013-08-23 15:35:07 +02:00
iglocska
dc8ed81448
Fix to sync users being able to edit events that don't belong to them interactively
2013-08-23 15:34:03 +02:00
Christophe Vandeplas
660132816b
fix version number master
2013-08-23 12:46:25 +02:00
iglocska
5f9bf7e8d2
Merge branch 'hotfix-2.1.13' into develop
2013-08-23 10:48:14 +02:00
iglocska
bfd5c97078
Merge branch 'hotfix-2.1.13'
2013-08-23 10:48:08 +02:00
iglocska
29afb82f4d
Removed vulnerability and comment from correlation
2013-08-23 10:47:46 +02:00
iglocska
5056744029
Merge branch 'hotfix-2.1.12'
2013-08-23 10:20:54 +02:00
iglocska
5a7558d700
Merge branch 'hotfix-2.1.12' into develop
2013-08-23 10:20:48 +02:00
iglocska
b150e3cb2c
Final change to the placement of the logos on the login page
2013-08-23 10:20:24 +02:00
iglocska
52c585336f
Merge branch 'hotfix-2.1.12' into develop
2013-08-22 18:03:58 +02:00
iglocska
9806c210cb
Merge branch 'hotfix-2.1.12'
2013-08-22 18:03:51 +02:00
iglocska
c21d664757
Small alignment fix again
2013-08-22 18:03:34 +02:00
iglocska
21f9528837
Merge branch 'hotfix-2.1.12' into develop
2013-08-22 18:01:15 +02:00
iglocska
5f2b344515
Merge branch 'hotfix-2.1.12'
2013-08-22 18:01:10 +02:00
iglocska
0181901159
Small alignment change
2013-08-22 18:00:51 +02:00
iglocska
1495da1367
Merge branch 'hotfix-2.1.12' into develop
2013-08-22 17:25:44 +02:00
iglocska
f66bcb2f03
Merge branch 'hotfix-2.1.12'
2013-08-22 17:25:33 +02:00
iglocska
fb3c796f2e
Added second logo to the left of the login screen
2013-08-22 17:24:22 +02:00
iglocska
c352149714
Merge branch 'hotfix-2.1.8'
2013-08-21 13:09:26 +02:00
iglocska
690e6abbf5
Merge branch 'hotfix-2.1.8' into develop
2013-08-21 13:09:16 +02:00
iglocska
20efca4d79
A previous change reverted by accident in the previous commit
2013-08-21 13:08:28 +02:00
iglocska
bbb4d3066f
Merge branch 'hotfix-2.1.8' into develop
2013-08-21 11:40:50 +02:00
iglocska
b7d95ed743
Upgrade script for 2.1.8
...
- we have introduced the "locked" flag for events to protect events of the original creator from being edited by a sync user
- IMPORTANT: before running the script below, make sure to create the locked field for the event table (see INSTALL/LOCKED.sql)
- This script (generateLocked found in the Administrative tools menu) will attempt to set the locked value for existing events to ease the transition
- The default value for locked is 0, and all events created on the instance should be set to this value
- events that were synced from another instance should have their locked value set to 1
- this script checks for local organisations and sets the locked field to 1 for all events not created by them
- a local organisation, as defined for the scope of this scrips is: an organisation with at least 2 members or an organisation with a single member that is not a sync user.
- The script is only accessible by site admins and will return a notification about the number of events altered.
2013-08-21 11:33:30 +02:00
iglocska
994b701fe0
Merge branch 'hotfix-2.1.11' into hotfix-2.1.8
2013-08-21 08:48:39 +02:00
iglocska
3e798fa186
Merge branch 'hotfix-2.1.11'
2013-08-20 17:52:47 +02:00
iglocska
c43df3a2a2
Merge branch 'hotfix-2.1.11' into develop
2013-08-20 17:52:41 +02:00
iglocska
dde8c8d43c
Fix to the e-mailing
2013-08-20 17:52:12 +02:00
iglocska
fb5fb26adc
Merge branch 'hotfix-2.1.11' into develop
2013-08-20 17:21:05 +02:00