MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
4,169 Commits
34 Branches
365 Tags
189 MiB
Commit Graph

199 Commits (77ca0f8dd46222c2a0c7bc38608e0215988f33f3)

Author SHA1 Message Date
Andreas Ziegler 77ca0f8dd4 chg: remove obsolete uuid() wrapper 2016-07-07 15:13:16 +02:00
Andreas Ziegler 958aa7c414 use consistent spacing around else if 2016-06-04 15:49:54 +02:00
Andreas Ziegler 985451642e add space after keywords if/for/foreach/while/switch/catch 2016-06-04 15:45:39 +02:00
Andreas Ziegler 0fe692c56a remove whitespace at end of line 2016-06-04 01:10:45 +02:00
Andreas Ziegler 898ea1d97c remove whitespace (space/tab) from empty lines 2016-06-04 01:08:16 +02:00
Iglocska 6e9a448cbd fix: Cannot delete users, fixes #1200 2016-06-03 17:43:27 +02:00
Andras Iklody ac4afa35c2 Merge pull request #1193 from rotanid/defaults 
add some defaults
 2016-06-03 02:10:00 +02:00
Andreas Ziegler 8c21fa27d0 add some variable defaults 2016-06-03 01:44:07 +02:00
Andreas Ziegler 0fcf9a02f7 remove/update obsolete code 2016-06-03 01:42:27 +02:00
Andreas Ziegler bdf21b782b remove unused functions 2016-06-03 01:42:27 +02:00
Andras Iklody 5a137fcc95 Merge pull request #1165 from rotanid/misc2 
misc cleanup round 2
 2016-06-03 01:38:36 +02:00
Andreas Ziegler 790d3b5ac0 UsersController.php: remove duplicate array key 2016-05-31 18:27:56 +02:00
Andreas Ziegler 898f795271 fix upper/lowercase issues 2016-05-31 18:01:59 +02:00
Andreas Ziegler a9d7175d8d remove commented out codelines 2016-05-31 18:01:54 +02:00
Andreas Ziegler b746763dfe reformatting, indention, comment fixes 2016-05-31 17:34:46 +02:00
Iglocska becb42d860 fix: removed duplicate array keys, fixes #1162 2016-05-23 21:50:53 +02:00
Iglocska 6b6877099a fix: Added the option for users to see and undelete attributes if an event was created by their org, fixes #1144 
- Also some minor fixes to the ACL
 2016-05-20 11:20:03 +02:00
Iglocska 467abda0d6 Merge branch 'feature/news' into 2.4 2016-05-20 10:20:12 +02:00
Iglocska e16371e255 chg: Some cleanup of old unused stuff 2016-05-20 09:07:51 +02:00
Iglocska d02adf2085 new: Added the news functionality back 
- admins can add/edit/delete news items
- users get redirected if there is a newsitem that they haven't seen yet
 2016-05-20 01:17:26 +02:00
Iglocska 69811db568 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-05-18 11:15:59 +02:00
Iglocska 4e94913504 fix: Contact Users Form Email Issue fixed, fixes #1130 2016-05-18 11:15:11 +02:00
iglocska 73375042e6 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-05-13 20:47:10 +02:00
iglocska 9434a2364f fix: Fixes to issues with MYSQL >= 5.7 2016-05-13 20:44:16 +02:00
Iglocska d26bb9d927 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-05-09 08:55:46 +02:00
Iglocska 151c782d23 chg: Further work on the attribute soft delete 2016-05-06 23:34:26 +02:00
I-am-Sherlocked 3640379272 Update UsersController.php 
Grouping by Organization.name will throw a MySQL error 
"Syntax error or access violation: 1055 Expression #3 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'misp.Organisation.id' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by" 
in "Request URL: /users/memberslist" , since Organization.name is not a unique field. Grouping by Organization.id instead will fix the issue.
 2016-05-05 12:36:30 -07:00
Iglocska 267caa3315 Merge branch '2.4' into smime 
Conflicts:
	app/Controller/AppController.php
 2016-04-25 23:12:57 +02:00
Iglocska 24c7fa61fe Merge branch 'permissionfix' into 2.4 2016-04-18 17:41:59 +02:00
Iglocska 1ecc4c2f37 Fixed a capitalisation fail 2016-04-18 14:06:17 +02:00
devnull- 4e02c8464a Add function verifyCertificate & update of fields 2016-04-04 19:19:58 +02:00
Iglocska b342a071b8 Added the authkey to the admin user index, including filtering / searching for them 2016-03-28 09:02:15 +02:00
Iglocska afaa537b82 First implementation of the new auth mechanism 2016-03-15 23:04:20 +01:00
Iglocska f5d2887195 List Organisation in alphabetical order for new users, fixes #989 
- Fixes an issue where organisations in both the admin add and admin edit user views were not sorted alphabetically
- delays Przemek enrage timer
 2016-03-09 17:16:10 +01:00
Iglocska 95ac7ad294 If a user is disabled then he should not receive mass admin e-mails 
- however, if an admin specifically chooses to e-mail him/her it will still work
 2016-03-02 10:39:49 +01:00
Iglocska 150f5284ca Fix to an invalid org lookup when regenerating a user's authkey as an org admin 2016-02-17 16:16:02 +01:00
Iglocska 419bf41d82 Fixed the reset button on the dashboard 2016-02-16 14:46:50 +01:00
Iglocska 51621335c0 Show last login for each user on the admin index 2016-02-16 01:18:39 +01:00
Iglocska 08df3082e6 Forgot to add save... 2016-02-16 01:11:25 +01:00
Iglocska 8f90ab85cf Some tuning to the previous commit 2016-02-16 01:10:03 +01:00
Iglocska 5cc9655f11 Refresh auth on dashboard 2016-02-16 01:04:43 +01:00
Iglocska 4c14d3a859 Merge branch '2.4' into features/delegation 
Conflicts:
	app/Controller/AppController.php
	app/Model/AppModel.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/View/Elements/footer.ctp
	app/webroot/css/main.css
 2016-02-12 05:56:32 +01:00
Iglocska a1ffdc7790 First finished version 2016-02-12 05:47:06 +01:00
William Robinet 4fea371c4b Fix permissions 2016-02-11 17:03:51 +01:00
Iglocska 430f8ea479 URL fallback when adding users fails for the sync user dropdown 2016-01-26 10:03:46 +01:00
Iglocska be62a6b053 Entering a valid controller/action and an invalid one produced a different result pre-auth 
- not authenticated users now automatically get redirected to the login page, no matter what action they requested
- This as a nice side effect also removed the bug that was caused by a site admin looking at an admin function before logging out / timing out and being incorrectly redirected to /admin/users/login
 2016-01-21 14:52:06 +01:00
Iglocska b92c1c8db4 Added full text search to organisation index, fixes #803 
- also some fixes and enhancements in general for this
 2016-01-19 16:25:54 +01:00
Iglocska aab2752cbe Sort orgs alphabetically in user index filters 2016-01-13 15:56:59 +01:00
Iglocska f9d60d1b2c Small fix to the contact users form for org admins 2016-01-12 15:36:58 +01:00
Iglocska c834715aae First steps 2016-01-10 19:47:21 +01:00