Commit graph

3912 commits

Author SHA1 Message Date
Lucas Nicodemus
7181757dd3
Changelog bot message is more prodding
If people keep ignoring the bot, I'm going to make it block merging too.
2017-12-10 12:26:54 -07:00
Chris
edc16f8816
Merge pull request #1537 from Pryaxis/fix-permdump
Fix permission dumping
2017-12-10 14:28:53 +10:30
Chris
ba31d1faab
Merge branch 'general-devel' into fix-permdump 2017-12-10 14:24:27 +10:30
Chris
f689d77a5b
Merge pull request #1532 from Pryaxis/cmdline-fix
Updates the commandline parser to not be broken.
2017-12-10 14:23:33 +10:30
Lucas Nicodemus
c7a04c8e1b Merge branch 'fix-permdump' of github.com:Pryaxis/TShock into fix-permdump 2017-12-09 20:43:09 -07:00
Chris
078bd15300
Merge branch 'general-devel' into cmdline-fix 2017-12-10 14:12:58 +10:30
Lucas Nicodemus
691a368425 Change permission node to tshock.cfg.createdumps 2017-12-09 20:42:47 -07:00
Lucas Nicodemus
434e817b68
Merge branch 'general-devel' into fix-permdump 2017-12-09 19:29:34 -07:00
Lucas Nicodemus
677d15efbb
Merge pull request #1539 from Zaicon/fix-itemdump
Fixed IndexOutOfRange exception
2017-12-09 19:28:38 -07:00
Zaicon
82f53addd7
Update CHANGELOG.md 2017-12-09 20:12:12 -06:00
Zaicon Kiroshu
4638b85adc Fixed IndexOutOfRange exception 2017-12-09 18:48:40 -06:00
Lucas Nicodemus
14c071350c Mark Utils.DumpPemrissionMatrix as internal 2017-12-09 17:15:21 -07:00
Lucas Nicodemus
985dcebda9 Comment what DumpPermissionMatrix does 2017-12-09 17:14:59 -07:00
Lucas Nicodemus
2e64d65910 Modify call to Utils.Dump() from the server context to not stop 2017-12-09 16:09:53 -07:00
Lucas Nicodemus
aa2f040787 Change command /datadump to /dump-reference-data 2017-12-09 16:03:12 -07:00
Lucas Nicodemus
bdabf020d2 tshock.admin.createdumps is now a default owner level permission 2017-12-09 15:58:42 -07:00
Lucas Nicodemus
419b5415da Updated the changelog 2017-12-09 15:57:57 -07:00
Lucas Nicodemus
63179deaa5 Adds /dumpdata which dumps the permission table & ref data. 2017-12-09 15:54:51 -07:00
Lucas Nicodemus
d937789c15
Merge pull request #1536 from Ryozuki/pr-update-otapi
Update Newtonsoft.Json Fixes #1526
2017-12-09 10:31:42 -07:00
Ryozuki
a146e9bc38 update changelog 2017-12-09 18:25:10 +01:00
Ryozuki
b794fae21d update release script 2017-12-09 18:13:47 +01:00
Ryozuki
6d0a729e5a checkout submodule 2017-12-09 18:09:20 +01:00
Ryozuki
055d25330c update otapi 2017-12-09 17:57:33 +01:00
Chris
40616115ac
Merge pull request #1530 from Ryozuki/user_rewrite
Rename TShock.DB.User to TShock.DB.UserAccount
2017-12-10 02:11:38 +10:30
Ryozuki
5770be0ac3
Update CHANGELOG.md 2017-12-09 16:20:52 +01:00
Chris
c1e72bbc25 Changelog update 2017-12-09 15:30:57 +10:30
Chris
c4129cf645 Updates the commandline parser to not be broken.
It should now correctly parse a commandline such as `["", "-flag", "-flag", "arg" ... "etc" ]`
2017-12-09 15:19:34 +10:30
Ryozuki
183c8a110e
Merge branch 'general-devel' into user_rewrite 2017-12-08 16:36:56 +01:00
Lucas Nicodemus
eda2870bb1 chore: Update Probot config to support @hakusaro's update docs 2017-12-08 07:50:40 -07:00
Edgar Luque
07da3d5f58 missed some more declarations 2017-12-08 01:48:08 +01:00
Edgar Luque
5c24ba6f8d missed UserAccount declarations 2017-12-08 01:43:13 +01:00
Edgar Luque
6589531868 Renamed TShockAPI.DB 'User' to 'UserAccount' 2017-12-08 01:38:15 +01:00
Lucas Nicodemus
27ac4c6318
Merge pull request #1528 from Pryaxis/rcs
Revert "Remove superadmin customization config options"
2017-12-06 22:51:30 -07:00
Lucas Nicodemus
8708d55d86 But still use discouragement colors 2017-12-06 17:39:09 -07:00
Lucas Nicodemus
e91968ca91 Revert "Remove superadmin customization config options"
This reverts commit 1e68ac22c7.
2017-12-06 17:35:51 -07:00
Lucas Nicodemus
18f0711278
Merge pull request #1522 from Pryaxis/ssc-force
Allow /savessc to work on players that bypass ssc
2017-12-06 13:14:03 -07:00
Lucas Nicodemus
746c5450cc
Merge branch 'general-devel' into ssc-force 2017-12-06 13:07:35 -07:00
Lucas Nicodemus
589c9dd546
Merge pull request #1520 from Pryaxis/rps
Implement revised default permission sets
2017-12-06 13:05:31 -07:00
Lucas Nicodemus
0902d6f3f8
Merge branch 'general-devel' into ssc-force 2017-12-06 13:01:28 -07:00
Lucas Nicodemus
215fc4a9b1
Merge branch 'general-devel' into rps 2017-12-06 13:00:36 -07:00
Lucas Nicodemus
9c52232bd8
Merge pull request #1512 from Pryaxis/newer-bans
Rewrote the /ban add sub command
2017-12-06 11:24:43 -07:00
Lucas Nicodemus
f319ec94b4 Updated changelog to reflect ssc changes 2017-12-03 16:26:41 -07:00
Lucas Nicodemus
cdbc37b024 Allow /savessc to work on players that bypass ssc
Fixes #1506
2017-12-03 16:22:46 -07:00
Lucas Nicodemus
ec59549f2f Update changelog to add note about account bans 2017-12-03 15:55:40 -07:00
Lucas Nicodemus
d1500d7841 Update changelog w/ permissions 2017-12-03 15:13:30 -07:00
Lucas Nicodemus
9aaf425330 Modify default permission sets to be more modern 2017-12-03 15:04:50 -07:00
Lucas Nicodemus
c869464d81 Add DumpPermissionMatrix() which dumps a markdown permission matrix
Note that -dump apparently isn't working lately. You probably want
to call Utils.Dump() manually and invoke it in a custom build.
2017-12-03 12:56:34 -07:00
Lucas Nicodemus
3204ef2a83 callerIsEffectiveRoot -> callerIsServerConsole in ban system
This code clarity improvement helps make the code base clearer.

Thanks @deadsurgeon42
2017-12-03 09:49:45 -07:00
Lucas Nicodemus
39733a116d Fix issue where temp bans were stored incorrectly
Bans were being stored as seconds, should be a DateTime in s format
with seconds added on to existing time.
2017-12-02 20:59:30 -07:00
Lucas Nicodemus
35c61e53f1 Remove some space left around 2017-12-02 20:45:55 -07:00