octoleo/nativefier
2
2
Fork 0
mirror of https://github.com/Llewellynvdm/nativefier.git synced 2024-12-23 02:28:55 +00:00
Code Issues Releases Activity
440 Commits 3 Branches 107 Tags 6.4 MiB
7bfa42ef71
Commit Graph

98 Commits

Author SHA1 Message Date
Jia Hao
7bfa42ef71 Merge branch 'development' into feature/flash 
# Conflicts:
#	README.md
#	src/build/buildApp.js
#	src/cli.js
#	src/options/optionsMain.js
 2016-02-23 21:13:20 +08:00
Jia Hao
ba071cf5a8 Fix escaped string 2016-02-23 17:21:09 +08:00
Jia Hao
6ca4e794cd Implement rudimentary inferment of flash 2016-02-23 16:46:14 +08:00
Benjamin Wiederkehr
dc51407ccb Added option to disable web security. 2016-02-22 21:33:33 +01:00
Jia Hao
fa347cc8b0 Revert "flash support #2" 
Former-commit-id: 03d7d2df2cbc6f3075491e5dd2e6d48d759f4beb
 2016-02-06 01:12:30 +08:00
Jia Hao
add30d5a80 Merge pull request #79 from brunoqueiros/flash_support 
flash support #2

Former-commit-id: b0672ef48c8431c7480b9b3185ed231c23179398
 2016-02-06 01:06:35 +08:00
Jia Hao
99278cfa49 Temporarily undo linux tray to fix other bugs 2016-02-02 23:15:07 +08:00
Jia Hao
81f83ec0ef Merge pull request #110 from zweicoder/feature/tray 
Feature/tray
 2016-01-31 21:58:47 +08:00
Robert Swain
d386598770 counter: Allow for [x] and {x} forms of notification count 2016-01-30 16:42:08 +01:00
zweicoder
494aa06685 Satisfy Travis 2016-01-30 12:27:00 +08:00
zweicoder
97425f9ab5 Fix incorrect defaults for minimizeToTray option 2016-01-30 12:11:29 +08:00
zweicoder
e54e108ce2 Remove log 2016-01-30 12:06:14 +08:00
zweicoder
a910914aa4 Fix Window closing behavior 2016-01-30 12:03:40 +08:00
zweicoder
0c9d6312a4 Fix app not hiding and add quit option 2016-01-30 11:03:38 +08:00
zweicoder
e184aa13ae Add tray icon with hardcoded default icon. 2016-01-30 11:03:38 +08:00
zweicoder
7273a63885 Refactorize hardcoded icon path to main.js for more general usage 2016-01-30 11:03:38 +08:00
Jia Hao
52c518f4b7 Merge branch 'development' of https://github.com/krishkumar/nativefier into krishkumar-development 
- #90 Add keyboard shortcuts for back, forward
 2016-01-30 02:13:10 +08:00
Jia Hao
8f06c555e5 Don't modify the window title 2016-01-30 00:30:25 +08:00
Jia Hao
b2e05c925b Use ES6 syntax for placeholder app 2016-01-29 22:04:41 +08:00
Jia Hao
0d408b001d Fix #103 App name should not be capitalized 2016-01-29 00:20:32 +08:00
Jia Hao
1174cbc28c Cleanup 2016-01-28 11:47:40 +08:00
krishkumar
6f98248a60 Add keyboard shortcut for back, forward 2016-01-26 12:25:02 +05:30
Jia Hao
d0cddfde43 Make Browserwindow always reference app/icon.png for the icon 2016-01-26 14:13:33 +08:00
Jia Hao
d74c368627 Add command line flag to make the packaged app ignore certificate errors, fixes #69 2016-01-25 23:42:28 +08:00
Bruno Queiros
ea3945a836 flash support #2 
Former-commit-id: b83223d4c9a9e6fb52e5f2f78fce144cbea3be3a
 2016-01-25 10:44:10 -02:00
Jia Hao
78a624c23f Fix #32 Ability to copy and paste a URL 2016-01-25 18:34:44 +08:00
Jia Hao
d8fb87ccb5 Implement support for clicking buttons so that users can control where links open as referenced in #73 2016-01-25 16:49:11 +08:00
Jia Hao
949fce5e3c Implement right click context menu for regular href links 2016-01-25 15:56:33 +08:00
Jia Hao
b7e2fbf86e Add sourcemaps support for placeholder app 2016-01-24 21:20:29 +08:00
Jia Hao
00ddedf32d Fix invalid json 2016-01-24 21:17:56 +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
82c29de231 Lint all files 2016-01-24 02:02:23 +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
zweicoder
f0d1adb6b0 Add icon hotfix 2016-01-23 15:37:45 +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
1685407e7a Integrate window state manager with BrowserWindow 2016-01-23 14:52:13 +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
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
e0de7bf463 Implement navigating backward and forward from the application menu 2016-01-23 14:15:25 +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
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
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
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