ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,853 Commits 4 Branches 0 Tags
b5e09ba343dbf264ba995d5ca9f66068ccdd164d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ntr f9ccfb1fc2 Merge tag '1.2.0' into develop 
1.2.0
 2019-09-04 17:02:54 +10:00
ntr 9c395bf825 Merge branch 'release/1.2.0' 2019-09-04 17:02:49 +10:00
ntr 70eb982aca Merge branch 'develop' into release/1.2.0 2019-09-04 16:45:37 +10:00
ntr 23b4fd7f76 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-04 16:45:31 +10:00
ntr 0ca193421e version bump 2019-09-04 16:39:07 +10:00
ntr d643884b2c Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-04 16:38:14 +10:00
ntr b910f99f89 improve pvp queue 2019-09-04 16:38:03 +10:00
ntr a16369085c do not kill listener threads on error 2019-09-04 15:23:35 +10:00
ntr 7a7b75a698 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-04 15:15:23 +10:00
ntr 31f353153b worklog dones 2019-09-03 17:01:59 +10:00
ntr c83172ca3d pvp queue join messages 2019-09-03 16:15:40 +10:00
ntr e4a952ecbb Merge tag '1.1.0' into develop 
1.1.0
 2019-09-03 16:15:03 +10:00
ntr c25cdbe9e4 Merge branch 'release/1.1.0' 2019-09-03 16:14:50 +10:00
ntr 3056d08e71 version bump and version bin 2019-09-03 12:51:00 +10:00
ntr 7603497372 dev stripe checks 2019-09-03 11:29:05 +10:00
ntr fbb7e58f3c make socket url dynamic 2019-09-03 10:57:57 +10:00
ntr 2728be796e fix pvp instance state push notification 2019-09-03 10:02:32 +10:00
ntr 3a382eb97d Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-02 19:09:23 +10:00
ntr ff2830fea3 Merge tag '1.0.1' into develop 
1.0.1
 2019-09-02 19:09:15 +10:00
ntr 5d4d78c390 Merge branch 'release/1.0.1' 2019-09-02 19:09:11 +10:00
ntr f3237ffe51 fix plan id 2019-09-02 19:09:04 +10:00
ntr bb5e4d5728 fixed key" 2019-09-02 18:57:46 +10:00
ntr 7f882d58e3 production key 2019-09-02 18:21:24 +10:00
ntr 55aba18c93 version bump 2019-09-02 18:13:29 +10:00
ntr 3e286757f1 production stripe btns 2019-09-02 18:12:58 +10:00
ntr 0e2667a32f Merge tag '1.0.0' into develop 
1.0.0
 2019-09-02 17:09:37 +10:00
ntr 829939537b Merge branch 'release/1.0.0' 2019-09-02 17:09:33 +10:00
ntr af5adf1e08 Pog 2019-09-02 17:09:17 +10:00
ntr 1531a8b2f8 only prompt on unsub 2019-08-29 13:44:03 +10:00
ntr fec338e256 friendly msg 2019-08-29 12:56:55 +10:00
ntr a5199b7d4b resubscribe button 2019-08-29 12:54:36 +10:00
ntr ffc070ed51 email and sub status 2019-08-29 12:43:06 +10:00
ntr d7b887e1ad stripe verify 2019-08-28 19:21:29 +10:00
ntr d726aa8d33 stripe sub cancellations 2019-08-28 18:57:23 +10:00
ntr 54a65fc160 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-08-28 14:17:14 +10:00
ntr a733cf77c9 events 2019-08-27 11:03:38 +10:00
ntr 0e9aea7e7c Merge tag '0.3.0' into develop 
0.3.0
 2019-08-26 19:44:36 +10:00
ntr e57f72940d don't bail the tx when looking for a mail account 2019-08-26 19:30:38 +10:00
ntr 3bca63ed7e inventory disable 2019-08-26 19:15:10 +10:00
ntr 2da5684156 email state 2019-08-26 19:09:49 +10:00
ntr 1e96a8ee5a Merge branch 'develop' into release/0.3.0 2019-08-26 18:43:41 +10:00
ntr 65514f576a welcome to mnml 2019-08-26 18:43:05 +10:00
ntr 6ff292ff3c email recovery 2019-08-26 14:28:46 +10:00
ntr b75edcda66 send emails and confirm 2019-08-26 00:40:33 +10:00
ntr df1ccdb8cd email http functions 2019-08-25 18:47:40 +10:00
ntr b9f4a67e0c telegraf 2019-08-22 22:35:18 +10:00
ntr 682be021b7 escape msg 2019-08-20 14:08:06 +10:00
ntr 796e5835e9 sweet beautiful fern 2019-08-20 13:35:05 +10:00
ntr 23b622ca8d socket url 2019-08-19 16:40:23 +10:00
ntr 1b16c6062a knexfile 2019-08-18 17:58:58 +10:00
ntr 69cfd60646 services and etc 2019-08-18 13:48:56 +10:00
ntr 3231ef428a version bump to 0.3.0 2019-08-17 17:59:33 +10:00
ntr ee60167d1e Merge branch 'account' into develop 2019-08-17 17:52:12 +10:00
ntr f664dc6ebc nginx stuff 2019-08-17 17:51:55 +10:00
ntr 16322fdaa1 comment for 2moz 2019-08-14 18:40:46 +10:00
ntr bd467f6c14 axios rm 2019-08-14 18:40:21 +10:00
ntr c11dac617d Revert "nginx stuff for acp" 
This reverts commit f84f458ebe.
 2019-08-14 18:39:58 +10:00
ntr bd51820279 client data toast 2019-08-14 18:39:38 +10:00
ntr f84f458ebe nginx stuff for acp 2019-08-14 18:29:52 +10:00
ntr 8684f32db2 nginx acp stuff 2019-08-14 17:40:01 +10:00
ntr 6fe9b52d00 fk axios 2019-08-14 15:23:15 +10:00
ntr f68a12eab8 acp routing 2019-08-14 11:31:12 +10:00
ntr 99c575ac69 acp init 2019-08-13 15:44:17 +10:00
ntr 143b0e92cb support email 2019-08-13 14:44:44 +10:00
ntr f0166a1779 password change 2019-08-13 12:26:32 +10:00
ntr 0507381e20 chrome table height in controls 2019-08-12 18:15:39 +10:00
ntr 500b5a89a4 . 2019-08-12 14:35:34 +10:00
ntr b4dccf9f1c login pimpout 2019-08-12 14:11:53 +10:00
ntr b15a494a4b styles clean 2019-08-10 15:53:15 +10:00
ntr 89d2b39823 account wip 2019-08-09 22:48:58 +10:00
ntr fe56528b3f controls and alignment 2019-08-09 18:11:34 +10:00
ntr 832442a1e4 team ctrl 2019-08-09 17:35:47 +10:00
ntr 1dbf55991c account ctrl 2019-08-09 17:25:43 +10:00
ntr 437eaf8039 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-08-09 15:40:15 +10:00
ntr 490cc358c0 margins 2019-08-09 15:39:48 +10:00
ntr b8d1c78f61 remove resolution 2019-08-09 15:38:09 +10:00
ntr ee032696da transition 2019-08-09 14:47:12 +10:00
ntr 64101786cf fix info 2019-08-09 14:34:54 +10:00
ntr 11ac600300 names' 2019-08-08 21:07:02 +10:00
ntr 65503c6800 few styles 2019-08-08 20:43:41 +10:00
ntr 4b5aa62140 game controls 2019-08-08 20:20:11 +10:00
ntr d74ca61d57 vbox bottom 2019-08-08 18:05:08 +10:00
ntr 4906eb3e39 init 2019-08-08 16:27:23 +10:00
ntr 0e23c890ef Merge tag '0.2.0' into develop 
0.2.0
 2019-07-30 15:57:39 +10:00
ntr 33c04d9d29 Merge branch 'release/0.2.0' 2019-07-30 15:56:54 +10:00
ntr 69c95c27ac fix cookies on ws auth 2019-07-30 15:43:01 +10:00
ntr a960c71e76 version 2019-07-30 15:05:25 +10:00
ntr 491c6b143f worklog 2019-07-30 14:20:46 +10:00
ntr 17c2c9708c team update 2019-07-30 13:25:06 +10:00
ntr 3fcbedb5e3 join play and account team change' 2019-07-30 13:18:47 +10:00
ntr 97b3943d18 join buttons 2019-07-30 13:17:31 +10:00
ntr 8a24019ff6 blue 2019-07-30 01:08:44 +10:00
ntr c94b6f134c sheeeeeeeeeeeeeeeeeeeeeeeeeeit 2019-07-30 00:48:40 +10:00
ntr fd518ba4e2 breakage inc 2019-07-29 18:08:24 +10:00
ntr 1940c437b0 names and hiero 2019-07-29 12:20:56 +10:00
ntr e5c8b78ec1 names 2019-07-29 00:24:10 +10:00
ntr 8cd0f1af36 team setting and postgres constraint 2019-07-29 00:11:46 +10:00
ntr 9fdda7c52c remove instance list 2019-07-27 21:01:58 +10:00
ntr 66223033b0 practice rpc 2019-07-27 19:24:52 +10:00
ntr d87bc44990 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-07-26 17:28:33 +10:00