Commit graph

2501 commits

Author SHA1 Message Date
Stan
d7ab24a8ce
Merge pull request #2 from pterodactyl/develop
Keep up to date
2018-06-01 15:58:03 +02:00
stanjg
28e34f77b6 Merge branch 'master' of https://github.com/stanjg/panel into feature/user-specific-language 2018-06-01 15:55:08 +02:00
Dane Everitt
e0d67ff857
Merge branch 'feature/vuejs' into feature/vue-serverview 2018-05-31 23:01:24 -07:00
Dane Everitt
316bb9c11e
Merge branch 'feature/vuejs' into feature/dusk-vuejs 2018-05-31 23:00:08 -07:00
Dane Everitt
6c598f9100
Merge branch 'feature/vuejs' into feature/vuejs-serverlist 2018-05-31 22:59:39 -07:00
Dane Everitt
5f70502f20
Merge branch 'develop' into feature/vuejs 2018-05-31 22:59:16 -07:00
Dane Everitt
3078b61ac6
Update changelog 2018-05-31 22:58:28 -07:00
Dane Everitt
fd8d7c3571
Merge pull request #1130 from stanjg/feature/stats-page
Added a statistics page to monitor the panel usage
2018-05-31 22:56:58 -07:00
Dane Everitt
5be4520d37
Merge pull request #1129 from stanjg/feature/node-maintenance
Added a maintenance mode for nodes
2018-05-31 22:49:47 -07:00
Dane Everitt
8aadc62882
Merge branch 'develop' into feature/node-maintenance 2018-05-31 22:49:07 -07:00
Lance Pioch
357c9e1aed Enable undo history after loading initial file and fix #1159 (#1180) 2018-05-31 22:43:18 -07:00
Dane Everitt
f8fa62e3d6
First round of authentication tests 2018-05-31 22:42:52 -07:00
Dane Everitt
b50f314eda
💯 Lets not accidentally drop the entire database again. 2018-05-31 22:30:05 -07:00
Dane Everitt
c86690a695
Get base code for dusk tests 2018-05-31 21:45:49 -07:00
Lance Pioch
b7eed67f2f Warn users about uploading folders not working and resolve #599 (#1181) 2018-05-31 20:36:00 -07:00
Matthew Penner
6e6ce652b2 Fix logo-mini image (#1183) 2018-05-31 20:35:24 -07:00
Jakob Schrettenbrunner
e808919c5c fix gulp scripts pipeline failing on second run because of how sourcemaps are cleared 2018-05-31 18:26:34 +02:00
Jakob Schrettenbrunner
c58ef1f8a8 Merge branch 'feature/vuejs-serverlist' into feature/vue-serverview 2018-05-31 18:26:07 +02:00
Jakob Schrettenbrunner
a1558fa00f add sourcemaps to gulp pipelines 2018-05-31 17:59:18 +02:00
stanjg
ccf3e3511f
Renamed middleware, and fixed the test 2018-05-31 16:40:18 +02:00
stanjg
013dde75ae
Renamed the field and made some improvements 2018-05-31 16:34:35 +02:00
Dane Everitt
9831adb91c
Cleanup dashboard, make flash more customizable for pages 2018-05-28 16:28:36 -07:00
Dane Everitt
caa0d21ac9
Handle state mutations for users better in Vuex 2018-05-28 15:37:09 -07:00
Jakob Schrettenbrunner
11d96c44d1 Merge branch 'feature/vuejs-serverlist' into feature/vue-serverview 2018-05-29 00:04:51 +02:00
Jakob Schrettenbrunner
378a1859cf Merge branch 'feature/vuejs-serverlist' into feature/vue-serverview 2018-05-29 00:04:41 +02:00
Dane Everitt
a1444b047e
Fix JWT handling for API access when logging in 2018-05-28 14:59:48 -07:00
Jakob Schrettenbrunner
5dd9ed20aa add sourcemaps to gulp and pug support to vue 2018-05-28 23:16:03 +02:00
Dane Everitt
aa61afb58f
Add proper server models 2018-05-28 14:11:23 -07:00
Dane Everitt
6e5c365018
Use the client API to load servers on the listing page 2018-05-28 13:23:40 -07:00
Dane Everitt
ad69193ac0
Add JWT to login forms 2018-05-28 12:48:42 -07:00
Dane Everitt
47c1ecc9bc
Make server blocks clickable, break out routes into their own file 2018-05-28 11:34:24 -07:00
Jakob Schrettenbrunner
89f47c6dbb mocked server page and better navigation and overall layout 2018-05-28 00:37:03 +02:00
Jakob Schrettenbrunner
d2c770d218 add new favicon 2018-05-28 00:35:54 +02:00
Dane Everitt
6f2fcabf22
Add very basic server search and dynamic rendering functionality 2018-05-26 23:17:02 -07:00
Dane Everitt
f337a89320
Add search bar to dash 2018-05-26 22:19:33 -07:00
Dane Everitt
d78189df23
Improve dash design 2018-05-26 22:09:29 -07:00
Dane Everitt
9d8830a2d7
Get initial mockup of new server list up 2018-05-26 17:20:36 -07:00
Dane Everitt
64175ce35a
Tweak colors 2018-05-26 16:11:44 -07:00
Dane Everitt
f5ffa121b0
Introduce pterodactyl official blue 2018-05-26 16:05:30 -07:00
stanjg
60e1ffa564
Added a test for the controller and cleaned up the controller 2018-05-27 00:16:13 +02:00
Dane Everitt
0b7dbd65ff
Final cleanup 2018-05-26 15:00:41 -07:00
Dane Everitt
7a077f3281
Remove the flash plugin store correctly 2018-05-26 14:59:58 -07:00
Dane Everitt
0a706d1b45
Add custom flash library that works as expected 2018-05-26 14:50:38 -07:00
Dane Everitt
bab20812a0
More UI fixes for consistency 2018-05-26 13:06:41 -07:00
Dane Everitt
b35eb77a70
Remove the pterodactyl directory when handling assets
This supports moving away from multiple-theme support in the Panel since that is no longer going to be offered.
2018-05-26 12:33:27 -07:00
Dane Everitt
f09eb8eec9
Double encoding happens by default now 2018-05-26 12:22:02 -07:00
Dane Everitt
caf784722c
Update lock file 2018-05-26 12:20:23 -07:00
Dane Everitt
cf90f56777
Merge branch 'develop' into feature/vuejs-auth 2018-05-26 12:17:14 -07:00
stanjg
7a81c61ad8
Wording changes and fix of major fail last commit 2018-05-26 21:02:47 +02:00
stanjg
86e7085396
Cleaned up the controller and prepared for tests 2018-05-26 20:58:49 +02:00