2
2
mirror of https://github.com/Llewellynvdm/nativefier.git synced 2024-11-10 15:21:03 +00:00
Commit Graph

319 Commits

Author SHA1 Message Date
Jia Hao
ffc5450e00 Merge branch 'expose-main' of https://github.com/zweicoder/nativefier into zweicoder-expose-main
# Conflicts:
#	src/cli.js
2016-01-24 20:40:32 +08:00
Jia Hao
7d0b41ae1e Remove shorthand command for height and width to fix conflicts with -h. Closes #30, closes #64 and closes #67
Merge branch 'taiyoslime-master'
2016-01-24 15:34:13 +08:00
Jia Hao
303d439192 Merge branch 'master' of https://github.com/taiyoslime/nativefier into taiyoslime-master
# Conflicts:
#	src/cli.js
2016-01-24 15:33:57 +08:00
Jia Hao
ba1a270ee4 Update README so that Windows users know that they can press alt to show the application menu 2016-01-24 15:31:35 +08:00
Jia Hao
b83a34934f Merge branch 'fearenales-feature/show-menu-bar' 2016-01-24 15:24:48 +08:00
Jia Hao
e86119ba96 Merge branch 'feature/show-menu-bar' of https://github.com/fearenales/nativefier into fearenales-feature/show-menu-bar
# Conflicts:
#	app/nativefier.json
#	app/src/main.js
#	src/buildApp.js
2016-01-24 15:24:27 +08:00
Jia Hao
fbf956e7be Build files immediately after install so npm link does not cause problems 2016-01-24 15:19:48 +08:00
Jia Hao
231467c9f2 Add build status 2016-01-24 02:10:56 +08:00
Jia Hao
7c25e82c44 Add travis configuration 2016-01-24 02:05:03 +08:00
Jia Hao
82c29de231 Lint all files 2016-01-24 02:02:23 +08:00
zweicoder
9c19c144e7 Expose main instead of buildApp 2016-01-23 23:10:44 +08:00
taiyoslime
c85696f218 Fixed -h option's conflict on cli 2016-01-24 00:02:44 +09:00
Jia Hao
b7433dfc3b Close #62 Merge branch 'zweicoder-feature/window-state-manager' 2016-01-23 16:33:43 +08:00
Jia Hao
9b3fd029c1 Merge branch 'feature/window-state-manager' of https://github.com/zweicoder/nativefier into zweicoder-feature/window-state-manager
# Conflicts:
#	app/src/components/mainWindow/mainWindow.js
#	app/src/main.js
2016-01-23 16:29:36 +08:00
Jia Hao
312af963d9 Merge branch 'master' of github.com:jiahaog/nativefier 2016-01-23 16:21:41 +08:00
Jia Hao
fd8fe2df77 Merge pull request #63 from zweicoder/fix/win-linux-icon
Add icon hotfix
2016-01-23 15:21:05 +07:00
Jia Hao
74c8ffbea6 Add script for release to npm 2016-01-23 16:01:58 +08:00
zweicoder
f0d1adb6b0 Add icon hotfix 2016-01-23 15:37:45 +08:00
Jia Hao
01ae53c590 Remove prepublish script which messes up npm install locally 2016-01-23 15:27:42 +08:00
zweicoder
c77dfe5f27 Remove log 2016-01-23 15:22:25 +08:00
zweicoder
b6862d0c06 Merge branch 'upstream' into feature/window-state-manager 2016-01-23 15:20:21 +08:00
Jia Hao
c143b3b461 Fix error with badge on non-osx systems
- Instead of checking every instance we use the setBadge, we define an empty function and only override it if it is OSX
2016-01-23 15:12:53 +08:00
zweicoder
26ce134de8 Fix obsession with Mac 2016-01-23 15:10:02 +08:00
zweicoder
d818f6cfaa Remove prepublish from causing errors 2016-01-23 14:59:33 +08:00
zweicoder
1685407e7a Integrate window state manager with BrowserWindow 2016-01-23 14:52:13 +08:00
Jia Hao
5a04a9886e Fix error in gulpfile 2016-01-23 14:47:55 +08:00
Jia Hao
40da693cb5 Fix #59 Fullscreen goes to a black screen when clicking close 2016-01-23 14:47:32 +08:00
zweicoder
09777f38c8 Remove unused watchify import 2016-01-23 14:47:07 +08:00
zweicoder
9ac18e071e Implement Electron Window State Manager 2016-01-23 14:33:55 +08:00
Jia Hao
aa384dc317 Set window title immediately when the window is created, fixes #54 2016-01-23 14:22:03 +08:00
Jia Hao
c5a76ade59 Remove notes about back button 2016-01-23 14:16:01 +08:00
Jia Hao
e0de7bf463 Implement navigating backward and forward from the application menu 2016-01-23 14:15:25 +08:00
Jia Hao
eabe6de892 Update README for modified build 2016-01-23 14:04:52 +08:00
Jia Hao
264037a867 Merge branch 'refactor/splitcomponents'
- Merge in gulp dev envirnoment
- Zoom functionality
- Split app into multiple components
2016-01-23 13:43:33 +08:00
Jia Hao
07acbced3e Cleanup notification integration #360 2016-01-23 13:32:20 +08:00
Jia Hao
bed4260f55 Merge pull request #60 from contra/master
add notification monkey-patch, closes #38
2016-01-23 12:15:34 +07:00
Jia Hao
3347f30c7e Add es6 support for app, update npm scripts for gulp and cleanup
- Remove random console.log statements
- Remove unused dependencies
2016-01-23 12:42:09 +08:00
Jia Hao
0a42a830e2 Implement watching of src files 2016-01-23 12:29:40 +08:00
Jia Hao
ddd728bd81 Implement gulp webpack to build app 2016-01-23 11:47:28 +08:00
Jia Hao
9c0e65e89f Merge branch 'master' into refactor/splitcomponents 2016-01-23 10:22:22 +08:00
Jia Hao
91ea8c2a48 Update build script for static folder, will break windows 2016-01-23 10:10:35 +08:00
Jia Hao
90ee346914 Refactor main.js into separate files, and put static files such as preload and login.html into app/src/static 2016-01-23 10:09:47 +08:00
Jia Hao
0e68fd61dc Implement changing of zoom which fixes #17
- Take note that the keyboard shortcut for zoom in appears to be 'command + =', due to a bug in atom/electron#1507
2016-01-23 09:27:09 +08:00
Contra
9393f863e2 clean up 2016-01-22 10:48:04 -08:00
Contra
f75382d635 add monkeypatching notification support 2016-01-22 10:44:42 -08:00
Jia Hao
55157afe9a Hotfix for windows mkdir -p 2016-01-22 23:28:36 +08:00
Jia Hao
c4e8ab3086 Update changelog for v6.5.6 2016-01-22 23:28:18 +08:00
Jia Hao
bd6fedc0ef Workaround for windows mkdir -p, fixes #57
- Add a placeholder to keep the `app/lib` directory
- Remove `mkdir -p` postinstall script
2016-01-22 23:27:12 +08:00
Felipe Arenales
329d82a18c Hiding menu bar by default 2016-01-22 12:47:56 -02:00
Jia Hao
4089cd36cb Add changelog to readme 2016-01-22 21:16:45 +08:00