Commit Graph

1842 Commits

Author SHA1 Message Date
Alexei Stukov cb091b594d
Merge pull request #32 from JsSucks/css-editor
Merge
2018-01-21 11:28:27 +02:00
Jiiks 6f9f005ed9 added a missing return if editor is already open. 2018-01-21 11:27:44 +02:00
Alexei Stukov 7add5afc30
Merge pull request #31 from JsSucks/ui
Merge
2018-01-21 11:25:23 +02:00
Jiiks 3500b2890b CssEditor button functionality 2018-01-21 11:24:28 +02:00
Alexei Stukov d57b394768
Merge pull request #30 from JsSucks/csseditor
Merge current css editor
2018-01-21 11:18:29 +02:00
Jiiks e1e3e77e08 Resolve conflicts 2018-01-21 11:16:50 +02:00
Jiiks 6816a2938a Conflict resolve 2018-01-21 11:12:29 +02:00
Jiiks 0e70eea85c Merge master into csseditor 2018-01-21 11:11:46 +02:00
Jiiks 1f618684b8 Added gulp plumber, gulp watch, parent package with scripts and windows batch files for everything. 2018-01-21 10:38:49 +02:00
Alexei Stukov d1988f915f
Merge pull request #29 from samfun123/csseditor
Implement the main features of the CSS Editor
2018-01-21 10:14:46 +02:00
Alexei Stukov 623aaeb01a
Merge pull request #28 from JsSucks/webpack
WebpackModules rewrite + remove external moment.js dependency
2018-01-21 10:12:39 +02:00
samfun123 5251d42c2f Implement the main features of the CSS Editor 2018-01-20 22:48:48 -05:00
Zack Rauen 7b578dcc56 rewrite webpack with known modules 2018-01-20 20:10:24 -05:00
Zack Rauen 0cd70e5da3 Merge remote-tracking branch 'refs/remotes/origin/master' into webpack 2018-01-20 19:47:04 -05:00
Alexei Stukov 906bda3489
Merge pull request #27 from JsSucks/plugin-manager
Merge
2018-01-21 02:46:34 +02:00
Zack Rauen 10b843d53e Merge remote-tracking branch 'refs/remotes/BDBeta/master' into webpack 2018-01-20 19:34:37 -05:00
Jiiks 4362d39624 add some more trycatch for external code calls 2018-01-21 01:46:49 +02:00
Jiiks 6640fa1890 Cleanup manually deleted plugin 2018-01-21 01:43:17 +02:00
Jiiks fe29c78583 Refresh instead of reload and remove debug 2018-01-21 01:38:57 +02:00
Pierce de5fd43b84
Merge pull request #25 from samuelthomas2774/master
Fixed bug introduced in #24
2018-01-20 17:48:39 -05:00
Samuel Elliott 7d1416da67 Fixed bug with pressing B
JsSucks/BetterDiscordApp#22
2018-01-20 22:42:22 +00:00
Alexei Stukov 5aed82573f
Merge pull request #1 from JsSucks/master
Merge
2018-01-21 00:17:44 +02:00
Jiiks 8b9d923ae2 Temp refresh button 2018-01-20 21:07:04 +02:00
Jiiks 9f0eb844c2 Display local plugins in tab 2018-01-20 20:30:05 +02:00
Jiiks 1a9fbef1f5 Logger object handler and start using Logger in plugin manager 2018-01-20 20:16:01 +02:00
Jiiks 5c3e7e780e add log shortcuts and error object logger 2018-01-20 20:01:36 +02:00
Jiiks 497e989e76 add another dummy plugin for testing 2018-01-20 19:48:27 +02:00
Jiiks b3f5f46e74 add try catch to plugin loading 2018-01-20 19:47:00 +02:00
Jiiks 2bcde666d8 Preliminary method for loading all plugins in plugins directory 2018-01-20 19:46:04 +02:00
Jiiks 48e1fda6cf add readDir method for getting files in a directory 2018-01-20 19:41:20 +02:00
Alexei Stukov 1f46323dc9
Merge pull request #24 from samuelthomas2774/master
Add keyboard shortcut
2018-01-20 19:35:01 +02:00
Alexei Stukov abda678167
Update BdSettingsWrapper.vue
No need to check for platform and return instead of if else. We can also hide settings with Ctrl/Cmd+b
2018-01-20 19:33:53 +02:00
Samuel Elliott f21aec5226 Add keyboard shortcut
Also fixes bug where pressing escape with another dialog open closes both at once
2018-01-20 16:17:51 +00:00
Alexei Stukov f9cd4e1a8a
Merge pull request #23 from JsSucks/ui
Merge ui changes
2018-01-20 17:59:38 +02:00
Jiiks da20f417c3 More style fixes 2018-01-20 17:55:51 +02:00
Jiiks e19f2ad8d7 Style fixes and pluginview/plugincard bases 2018-01-20 17:31:17 +02:00
Jiiks 357706f4c5 Styling fixes 2018-01-20 17:05:09 +02:00
Jiiks 49bdd4b1fd Style changes and class prefix 2018-01-20 16:20:18 +02:00
Jiiks 461d3468a5 Reset state on close 2018-01-20 16:04:22 +02:00
Jiiks 4575c3428a Add missing styles and props 2018-01-20 16:02:12 +02:00
Jiiks 2d128eb0a4 Restructuring and added some components 2018-01-20 15:45:53 +02:00
Jiiks ac1b5ef38d Static dark scrollbars for SidebarView 2018-01-20 15:31:45 +02:00
Jiiks 5419484825 Close settings with escape key 2018-01-20 15:07:35 +02:00
Jiiks ff1510dbcc Style changes and scrollerwrap props 2018-01-20 14:51:30 +02:00
Jiiks 9492bb0bc2 Style restructuring 2018-01-20 14:19:54 +02:00
Jiiks b42f17437c Cleanup and template splitting 2018-01-20 12:52:00 +02:00
Alexei Stukov 992aa63cd8
Merge pull request #22 from samuelthomas2774/master
Add editor config and macOS tweaks
2018-01-20 03:00:12 +02:00
Samuel Elliott 4076da01c9 Add macOS tweaks 2018-01-20 00:35:27 +00:00
Samuel Elliott 708b4e5e63 Add editor config 2018-01-20 00:34:41 +00:00
Alexei Stukov 8b9ccf0e0d
Merge pull request #21 from JsSucks/ui
Merge
2018-01-20 01:08:27 +02:00