phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,483 Commits 1 Branch 0 Tags
963232a98ec340805d1ce609427a6eda63e741d6
Commit Graph

3483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Castle
511a02f9a1 Introduce some consistency in grammar and punctuation into @description. 2013-12-03 23:51:54 -08:00
Jon Atkins
adaa348bde Merge pull request #680 from nexushoratio/to-push 
More typos; actual code this time.
 2013-12-03 22:42:49 -08:00
Mike Castle
1732f11f03 Fix typos in actual code. A CSS class name, and a variable name. 2013-12-03 21:59:21 -08:00
nexushoratio
27991bab10 Merge pull request #10 from nexushoratio/master 
Pull from upstream.
 2013-12-03 21:56:05 -08:00
nexushoratio
60d7f5cc6b Merge pull request #9 from jonatkins/master 
Pull from upstream.
 2013-12-03 21:55:03 -08:00
fkloft
b0d1ec84de mobile: make portals-list appear appear in nav drawer 2013-12-04 00:42:25 +01:00
fkloft
235140cbc4 Merge branch 'master' into navdrawer-api 2013-12-04 00:39:10 +01:00
Jon Atkins
89b23e8fbc decrease width from 800 to 700 pixels - resolves issues on mobile 2013-12-03 23:34:53 +00:00
Jon Atkins
99a0b3e975 delete the old broken version of portals-list 2013-12-03 23:29:48 +00:00
Jon Atkins
a2e181d052 Merge branch 'master' of https://github.com/Marx314/ingress-intel-total-conversion into Marx314-master 2013-12-03 23:29:21 +00:00
fkloft
0dcc9bfd7e Merge branch 'master' into navdrawer-api 
Conflicts:
	mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
 2013-12-03 23:48:54 +01:00
maubry
18bacd956a accidental copy and pasta! 
plugin: portals list - fix for changes to Niantc data
Issue #668
 2013-12-03 17:47:28 -05:00
Philipp Schaefer
270705cf6c Merge branch 'master' of github.com:jonatkins/ingress-intel-total-conversion 2013-12-03 23:30:20 +01:00
fkloft
6c0327b01c Show a hint that plugins are now in the nav drawer 2013-12-03 23:07:05 +01:00
Philipp Schaefer
47fb16707c drawable changes part 4 2013-12-03 23:03:58 +01:00
Philipp Schaefer
b434b81757 drawable changes part 3 2013-12-03 22:57:15 +01:00
Philipp Schaefer
aff4a9f9f9 drawable changes part 2 2013-12-03 22:12:25 +01:00
Jon Atkins
39721fa0b8 Merge pull request #678 from fkloft/ipas 
Fix ipas-link
 2013-12-03 08:49:12 -08:00
Philipp Schaefer
c1434db0dc drawable changes part1 2013-12-03 17:37:41 +01:00
maubry
7a12681fab Iteration two, using TEAM_* constant, level with 0 base, getLatLng and fields/links count. 
plugin: portals list - fix for changes to Niantc data
Issue #668
 2013-12-03 11:11:10 -05:00
fkloft
fd24fad641 Change background colors 2013-12-03 16:48:40 +01:00
fkloft
7e0cfd0159 Fix ipas-link 2013-12-03 16:15:17 +01:00
Philipp Schaefer
7b69693a3f - don't push current pane to backstack if it was called via back button 
- fixes endless loop of while toggling panes
 2013-12-03 13:49:38 +01:00
Jon Atkins
7140cd41d7 Merge pull request #677 from nexushoratio/to-push 
Fix a number of typos/spelling issues in comments.
 2013-12-02 23:56:48 -08:00
Mike Castle
b783ef9cf6 Spell check and found a bunch of new comments with typos. 2013-12-02 23:15:02 -08:00
nexushoratio
82f4ee4410 Merge pull request #8 from nexushoratio/master 
Pull from upstream.
 2013-12-02 22:50:23 -08:00
nexushoratio
f3bf30a99b Merge pull request #7 from jonatkins/master 
Pull from upstream.
 2013-12-02 22:49:15 -08:00
maubry
03fadb3078 plugin: portals list - fix for changes to Niantc data 
Issue #668
 2013-12-03 00:24:10 -05:00
fkloft
cb603ea7be Allow plugins to specify an icon for the nav drawer 
(and add icons for bookmarks)
 2013-12-03 00:06:15 +01:00
fkloft
8a10848e15 Naive attempt to make bookmarks compatible with nav drawer. @ZasoGD - please have a look, if necessary undo this commit and do it right 2013-12-02 23:47:00 +01:00
fkloft
ad6a447bde Allow plugins to add panes to mobile nav drawer 2013-12-02 23:40:25 +01:00
fkloft
40d25ad8ef Replace Pane enum with class 2013-12-02 23:06:18 +01:00
Jon Atkins
10b662d8c1 Merge pull request #673 from fkloft/website 
Website: some changes
 2013-12-02 12:12:23 -08:00
fkloft
39d1ea6b5b Website: update mobile download and faq page 
- Android login is disabled now
- issue #90 is closed
- mention issue #257
 2013-12-02 20:58:56 +01:00
fkloft
6ffbc2e2de Website: Add icons for mobile/desktop 2013-12-02 20:44:31 +01:00
Jon Atkins
c5b93234a9 Merge pull request #672 from nexushoratio/to-push 
To push
 2013-12-02 09:57:25 -08:00
Jon Atkins
41979cb107 remove automatic refresh when 'account not activated' message or similar is shown 
in the past this was a common temporary issue with the intel site, so was worth having as a case in the code
however, this is now very rare, and the more likely reason is an account suspension/ban - and a refresh won't help here!
 2013-12-02 17:54:49 +00:00
Jon Atkins
26d410d306 comment concerning issues with AP gain calculations - relevant to #671 2013-12-02 17:53:57 +00:00
Jon Atkins
eadc044712 don't try and request portal detailed data for a 'null' guid! oops 2013-12-02 17:53:22 +00:00
Mike Castle
135318022a Fix bad merge from upstream (git novice in action). 2013-12-02 02:25:08 -08:00
Mike Castle
4d8054c0d4 Merge branch 'to-push' of github.com:nexushoratio/ingress-intel-total-conversion into to-push 
Conflicts:
	plugins/portal-defense.user.js
	plugins/show-linked-portals.user.js
 2013-12-02 02:18:03 -08:00
nexushoratio
68ec278914 Merge pull request #6 from nexushoratio/master 
Pull from upstream.
 2013-12-02 01:54:16 -08:00
nexushoratio
5cdd01bcd9 Merge pull request #5 from jonatkins/master 
Pull from upstream.
 2013-12-02 01:52:50 -08:00
Jon Atkins
7d923ee64e add a debugger breakpoint in hook exception handling 2013-12-02 06:08:39 +00:00
Jon Atkins
b5d1cbbfdf use 1ms setTimeout calls to send initial requests for game score and artifact details 
as part of the munge code cleanups, a safety check was added to the munge searches. if no munge sets can be found, an exception is thrown and no requests are sent. if these requests are posted as part of the regular IITC boot process, these exceptions cause IITC to fail to load. this is a quick and safe fix
 2013-12-02 04:53:43 +00:00
Jon Atkins
851cde4745 bugfix: field count wasn't displayed for portals 2013-12-02 03:19:12 +00:00
Jon Atkins
223885c604 bump version number 2013-12-02 03:18:55 +00:00
Jon Atkins
689350bd3f website: add news of new release 2013-12-02 01:24:58 +00:00
fkloft
a392e5ec17 guess-player-levels: make player names colored and clickable 2013-12-02 00:08:26 +01:00
fkloft
41af1e189b Use minimum level instead of guessed level 
(The dialog description says 'Players have at least the following level:')

At first, many players might be shown as L1, but this will fade as soon as deploy messages by them are captured.
 2013-12-02 00:08:26 +01:00