Commit graph

2383 commits

Author SHA1 Message Date
Tom Bogle
ee8df516ed
Merge pull request #1053 from keymanapp/mac-code-cleanup
[Mac] Minor code cleanup
2018-07-13 11:20:40 -04:00
Tom Bogle
57f1337f08
Merge pull request #1071 from keymanapp/mac-1059-cherry-pick-from-stable-10.0-do-not-call-unsupported-selectors
[Mac] #1059 cherry pick from stable 10.0 (do not call unsupported selectors)
2018-07-13 10:48:42 -04:00
Tom Bogle
d76985c125 [Mac] Cherry-picked clean-up of history file + some additional clean-up 2018-07-13 08:35:34 -04:00
Tom Bogle
aebd17866f [Mac] Cherry-pick of change to history.md for #1059 2018-07-12 17:09:22 -04:00
Tom Bogle
ec811eb7f8 [Mac] Cherry-pick of commit to fix #1059 on stable-10.0
Avoid calls to unsupported selectors on old version of OS
2018-07-12 17:08:07 -04:00
Darcy Wong
fbb8c42915
Merge pull request #1068 from keymanapp/windows-docbook-links-alpha
[Windows] Fix docbook links (alpha)
2018-07-12 09:51:15 -05:00
Darcy Wong
0973ef578a Fix docbook links
This fixes the links on the help pages for
* https://help.keyman.com/products/desktop/10.0/docs/common_mac.php
* https://help.keyman.com/products/desktop/10.0/docs/common_linux.php
2018-07-12 09:18:56 -05:00
Tom Bogle
3343e137e8
Merge pull request #1063 from keymanapp/ios-fix-alpha-history
[iOS] Moved alpha change info to 11.0 alpha section
2018-07-12 08:46:14 -04:00
Tom Bogle
9541b12cfa [iOS] Moved alpha change info to 11.0 alpha section
Having a date and specific version messed up the build (and probably isn't needed)
2018-07-11 09:46:12 -04:00
Marc Durdin
9565a840f3
Merge pull request #1062 from keymanapp/ios-remove-android-reference-master
[ios] Remove reference to Android in history to satisfy App Store review
2018-07-11 16:41:26 +08:00
Marc Durdin
7f194ad102
Merge branch 'master' into ios-remove-android-reference-master 2018-07-11 16:41:12 +08:00
Marc Durdin
5bffb4ae65 [ios] Remove reference to Android in history to satisfy App Store review 2018-07-09 14:35:17 +07:00
Tom Bogle
88e7e2c004
Merge pull request #1058 from keymanapp/ios-824-remove-blank-buttons
[iOS] #824 - remove blank buttons from alert screens
2018-07-08 22:11:10 -04:00
Marc Durdin
0c271b6b72
Merge pull request #1057 from keymanapp/web-incorrect-row-count-assumption-1055-master
[web] (master) If a layer has lower row count to default layer in embedded mode, then Keyman throws an error.
2018-07-07 08:11:40 +07:00
Tom Bogle
d43db6b00e [iOS] Fixes #824 2018-07-06 16:39:50 -04:00
Tom Bogle
7efc5beb12 [iOS] #824 Final changes to switch from UIAlertView to UIAlertController 2018-07-06 11:54:37 -04:00
Marc Durdin
61cdf664a7 Merge branch 'web-incorrect-row-count-assumption-1055-master' of https://github.com/keymanapp/keyman into web-incorrect-row-count-assumption-1055-master 2018-07-06 15:57:33 +07:00
Marc Durdin
0daab7130e Fixup cmdline 2018-07-06 14:43:51 +07:00
Marc Durdin
7a7c6851f7 Test debug log for karma - try to find out why it is falling over 2018-07-06 14:41:56 +07:00
Marc Durdin
1f3e8f1220 [web] Try tests with real iOS devices as emulators no longer supported 2018-07-06 12:47:37 +07:00
Marc Durdin
a2a80ef601
Merge branch 'master' into web-incorrect-row-count-assumption-1055-master 2018-07-06 10:32:49 +07:00
Marc Durdin
da7873744a history 2018-07-06 10:30:49 +07:00
Marc Durdin
8c119d3ea7 [web] Fixes #1055. If a layer has lower row count to default layer in embedded mode, then Keyman throws an error. 2018-07-06 10:27:04 +07:00
Tom Bogle
1ad05e8df7 [iOS] More replacements of deprecated UIAlertView calls [WIP] 2018-07-05 17:14:13 -04:00
Tom Bogle
281e892cc4 [iOS] Whitespace changes 2018-07-05 15:43:08 -04:00
Tom Bogle
385409f73f [iOS] #824 - WIP - Started replacing UIAlertView calls 2018-07-05 15:43:08 -04:00
Tom Bogle
724b50224c [Mac] Removed unneeded code for handling mouse events in IM
The low-level event tap already handles detection of mouse events that could make the context out of date.
2018-07-05 14:22:52 -04:00
Tom Bogle
bd2fe2ee69 [Mac] Cleanup to remove old comment and fix indent (aesthetic only) 2018-07-05 14:18:10 -04:00
Tom Bogle
c84141420a Merge remote-tracking branch 'origin/master' 2018-07-05 13:55:46 -04:00
Tom Bogle
1f05d4b95d
Merge pull request #1050 from keymanapp/mac-refactor-target-action-call-from-keyView
[Mac] Refactored target-action call from keyView
2018-07-05 13:53:47 -04:00
Tom Bogle
28147b631c [Mac] [WIP] - Refactoring of target-action call from keyView 2018-07-03 10:14:23 -04:00
Marc Durdin
1c6d5256ac
Merge pull request #1042 from keymanapp/beta-history-alpha
10.0 stable release
2018-06-28 09:56:14 +07:00
Marc Durdin
f236283780
Merge pull request #1041 from keymanapp/beta-history
10.0 stable release
2018-06-28 09:55:33 +07:00
Marc Durdin
3ff3774a11
Merge branch 'master' into beta-history-alpha 2018-06-28 09:54:25 +07:00
Marc Durdin
b37cb718b5 10.0 stable release 2018-06-28 09:52:30 +07:00
Tom Bogle
c56519f64b
Merge pull request #1040 from keymanapp/beta-p3s6-alpha
P3S6 Beta to Alpha (final run?)
2018-06-27 22:44:19 -04:00
Marc Durdin
d8ee770b62
Merge branch 'master' into beta-p3s6-alpha 2018-06-28 09:43:40 +07:00
Marc Durdin
97ed4238de
Merge pull request #1039 from keymanapp/mac-revert-treat-keynote-and-pages-as-legacy
[Mac] #991 - Reverted changes for #872 (to solve more serious bugs)
2018-06-28 09:40:17 +07:00
Marc Durdin
13c0e279f2
Merge branch 'beta' into mac-revert-treat-keynote-and-pages-as-legacy 2018-06-28 09:40:10 +07:00
Marc Durdin
9ae94693ed
Merge pull request #1038 from keymanapp/mac-894-fixed-method-invocation
[Mac] Fixes #894 - Fixed invocation of keyAction (missing self param)
2018-06-28 09:39:47 +07:00
Tom Bogle
976d626671 [Mac] Added comment to explain ugly code. 2018-06-27 22:38:46 -04:00
Marc Durdin
27394c20fa
Merge pull request #1033 from keymanapp/beta-p3s6-alpha
Merge P3S6 beta to alpha
2018-06-28 08:52:27 +07:00
Marc Durdin
8be5c3a148
Merge pull request #1032 from keymanapp/beta-p3s6-history
Updates to history
2018-06-28 08:51:53 +07:00
Tom Bogle
0a0c2e0668 [Mac] #991 - Reverted changes for #872 (to solve more serious bugs) 2018-06-27 16:30:58 -04:00
Tom Bogle
12521fb7d2 [Mac] 894 - Oops, this is the actual fix 2018-06-27 15:10:38 -04:00
Tom Bogle
817d3e65c9 [Mac] Fixes #894 - Fixed invocation of keyAction (missing self param) 2018-06-27 15:06:29 -04:00
Marc Durdin
087f681146 Merge branch 'beta' into beta-p3s6-alpha 2018-06-27 14:58:58 +07:00
Marc Durdin
a3e5ec8af6
Merge pull request #1031 from keymanapp/mac-894-defensive-code-to-prevent-crash
[Mac] Prevent permanently hiding OSK when a menu is dropped down
2018-06-27 14:57:31 +07:00
Marc Durdin
f95218235c
Merge branch 'master' into beta-p3s6-alpha 2018-06-27 14:00:25 +07:00
Marc Durdin
d871951521 Fix conflicts 2018-06-27 13:57:30 +07:00