Lucas Nicodemus
e16b7bea36
Merge branch 'general-devel' into better-fts
2017-12-14 00:19:49 -07:00
Lucas Nicodemus
fddc31cd6f
Update submodule to latest TSAPI rev
2017-12-14 00:18:50 -07:00
Lucas Nicodemus
ffdcd34c91
Fix issue where setup system could re-enable itself
...
The current initial setup system would re-enable if setup.lock
was removed even if an account was in the database. This is
because when we switched to "owner" being the primary target
of the setup system, we failed to anticipate that an account with
superadmin would never exist in the database in an ideal
condition.
2017-12-13 22:45:41 -07:00
Lucas Nicodemus
0826a37fe8
Update changelog
2017-12-13 22:41:00 -07:00
Lucas Nicodemus
8451ef9fb7
Switch the "auth system" to "initial system" everywhere.
...
This is better verbiage. If you think about it, you never really
want the "authentication system" to shut off. Doesn't that mean
that the server doesn't authenticate people anymore?
2017-12-13 22:38:44 -07:00
Lucas Nicodemus
74eb680bff
Really update the changelog properly this time
2017-12-12 03:31:05 -07:00
Lucas Nicodemus
270cc4c481
Update changelog for critical crash fix
2017-12-12 03:18:44 -07:00
Lucas Nicodemus
65fd892091
Merge branch 'master' into general-devel
2017-12-12 03:02:00 -07:00
Lucas Nicodemus
9441f1882b
Verison Tick: 4.3.25
2017-12-12 02:57:41 -07:00
Lucas Nicodemus
84a0f1f29e
Update submodule for critical exploit fix in TSAPI
2017-12-12 02:56:10 -07:00
Chris
e92c8403f3
Merge pull request #1555 from Pryaxis/no-permissions
...
Remove /restart & Permissions.updateplugins
2017-12-12 09:44:02 +10:30
Lucas Nicodemus
69eda3d38e
Remove server restart rest routes
2017-12-11 16:09:03 -07:00
Lucas Nicodemus
3bed40ec65
Remove Utils.RestartServer (thanks @QuiCM!)
2017-12-11 16:01:09 -07:00
Lucas Nicodemus
9cf949cc60
Update changelog
2017-12-11 15:47:05 -07:00
Lucas Nicodemus
611fb6b418
Remove /restart command. Fixes #1454 .
2017-12-11 15:45:42 -07:00
Lucas Nicodemus
4ea7d10482
Remove stupid updates permission. Fixes #1540 .
2017-12-11 15:45:23 -07:00
Chris
361a10e884
Merge pull request #1553 from Ryozuki/update-company
...
Update Assembly company to Pryaxis
2017-12-12 09:11:38 +10:30
Lucas Nicodemus
7ef0b581eb
Merge branch 'general-devel' into update-company
2017-12-11 15:33:51 -07:00
Ryozuki
b392890551
update copyright notice
2017-12-11 23:09:07 +01:00
Chris
fac846ce02
Merge pull request #1552 from bartico6/general-devel
...
Update submodule TerrariaAPI-Server
2017-12-12 08:33:48 +10:30
Ryozuki
bbabec6003
update changelog
2017-12-11 16:29:37 +01:00
Ryozuki
c1c5716006
update assembly company to Pryaxis
2017-12-11 16:26:19 +01:00
quake1337
1e233d15e7
Update submodule
2017-12-11 15:33:53 +01:00
Chris
7349d0e877
Merge pull request #1547 from bartico6/general-devel
...
Make TShock pull OTAPI from the correct folder on build
2017-12-11 10:57:16 +10:30
quake1337
a5e196178e
Add credit
2017-12-11 01:16:10 +01:00
quake1337
1f79e14bd7
Make TShock pull OTAPI from the correct folder on build
2017-12-11 01:12:27 +01:00
Lucas Nicodemus
135826f15d
Merge pull request #1544 from Patrikkk/general-devel
...
Add missing "if handled - return" code to OnNameCollision.
2017-12-10 12:41:52 -07:00
Lucas Nicodemus
abaeef5f7e
Merge branch 'general-devel' into general-devel
2017-12-10 12:41:44 -07:00
Patrikk
6f044b2123
Adding missing Changelog.
2017-12-10 20:37:59 +01:00
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
Patrikk
740ad4d6c3
Add missing "if handled - return" code.
2017-12-10 20:14:54 +01: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
