88 Commits

Author SHA1 Message Date
Vincent Riquer
4968e925fb Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  add timing information
  fix vim accident #dontfeedthetroll
2015-02-01 17:12:49 +01:00
Vincent Riquer
38c9949dd7 add timing information 2015-02-01 04:30:51 +01:00
Vincent Riquer
3fc1a4c679 fix vim accident #dontfeedthetroll 2015-02-01 04:30:04 +01:00
Vincent Riquer
6c2f3bd95a Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  add Translator
  better graph period chooser
2015-01-30 16:39:51 +01:00
Vincent Riquer
b3463f0ea5 Merge branch 'master' into prod
* master:
  SEE THE FUCKING FUTURE!
2015-01-30 16:37:32 +01:00
Vincent Riquer
050c3949fd add Translator 2015-01-30 16:36:03 +01:00
Vincent Riquer
a8e01a37ed better graph period chooser 2015-01-30 16:08:33 +01:00
Vincent Riquer
8964230c5b SEE THE FUCKING FUTURE! 2015-01-30 12:09:03 +01:00
Vincent Riquer
c94c990ad0 Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  fix start/end conservation on import
  Add Recruiter

Conflicts:
	import
2015-01-22 16:19:20 +01:00
Vincent Riquer
338209ed31 fix start/end conservation on import 2015-01-22 16:12:29 +01:00
Vincent Riquer
d6115e9f73 Add Recruiter 2015-01-22 15:57:55 +01:00
Vincent Riquer
0318d46625 restore redirect 2014-12-26 15:40:02 +01:00
Vincent Riquer
8490562d9b Merge remote-tracking branch 'remotes/origin/master' into prod 2014-12-26 15:17:09 +01:00
Vincent Riquer
9269541e0a import more fail-proof 2014-12-26 15:12:45 +01:00
Vincent Riquer
92f7a17959 Add new stats and medals 2014-12-26 15:11:22 +01:00
Vincent Riquer
c43877b8ad Merge remote-tracking branch 'remotes/origin/master' into prod 2014-11-26 11:38:58 +01:00
Vincent Riquer
6b0a4b570d Redirect after import 2014-11-26 11:37:57 +01:00
Vincent Riquer
7fc9376478 Merge remote-tracking branch 'remotes/origin/master' into prod 2014-11-26 11:29:49 +01:00
Vincent Riquer
a7b970f39b Import from ingress-stats 2014-11-26 11:26:13 +01:00
Vincent Riquer
337014794b Add Innovator 2014-11-26 11:25:42 +01:00
Vincent Riquer
963faf4627 Add Missions completed 2014-11-26 11:24:25 +01:00
Vincent Riquer
b18133089f Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  * medals: 0% is 100% for the lower medal
2014-07-07 16:19:42 +02:00
Vincent Riquer
86f243f15b * medals: 0% is 100% for the lower medal
* show currectly unreachable medals as transparent
2014-07-07 16:17:45 +02:00
Vincent Riquer
c1aa8aad00 Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  L9+ colors
2014-07-07 09:41:46 +02:00
Vincent Riquer
7f1b0ed97e L9+ colors 2014-07-07 09:41:15 +02:00
Vincent Riquer
966244cb08 Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  add.html: move"menu" div to end of document
2014-06-30 02:51:56 +02:00
Vincent Riquer
93ef1e8779 add.html: move"menu" div to end of document 2014-06-30 02:50:33 +02:00
Vincent Riquer
3d6f9bc4d0 Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  graph legend:
  summary: link AP to AP graph
2014-06-30 02:21:20 +02:00
Vincent Riquer
be95bbdd38 graph legend:
* remove useless and inaccurate "min"
* remove "max" text
2014-06-30 02:20:01 +02:00
Vincent Riquer
185c2f2d43 summary: link AP to AP graph 2014-06-30 02:18:53 +02:00
Vincent Riquer
fe7329e78f Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  Show current level on all pages
2014-06-29 19:13:09 +02:00
Vincent Riquer
d618373dc9 Show current level on all pages
Begin splitting code into functions
2014-06-29 19:11:33 +02:00
Vincent Riquer
f7c44260b1 Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  tick AP
2014-06-29 00:15:09 +02:00
Vincent Riquer
509e7fa4e3 tick AP 2014-06-29 00:14:28 +02:00
Vincent Riquer
4b5c0af3a8 Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  css validator
2014-06-24 00:59:29 +02:00
Vincent Riquer
ac34043f4c css validator 2014-06-24 00:58:53 +02:00
Vincent Riquer
0754138bc0 Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  separate code from style
  hist: fix anchor placement
2014-06-24 00:44:20 +02:00
Vincent Riquer
0b70bede3f separate code from style 2014-06-24 00:43:29 +02:00
Vincent Riquer
838118a388 hist: fix anchor placement 2014-06-23 15:16:55 +02:00
Vincent Riquer
07135f0c14 Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  floating menu
2014-06-23 03:09:51 +02:00
Vincent Riquer
9c5c4b8c3a floating menu 2014-06-23 03:09:11 +02:00
Vincent Riquer
67b0823520 Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  fancier
2014-06-21 03:40:02 +02:00
Vincent Riquer
806c141d9f fancier 2014-06-21 03:39:09 +02:00
Vincent Riquer
1d9cba737e Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  Ignore ingress.rrd
  Create RRD
  nicer table
2014-06-20 20:30:32 +02:00
Vincent Riquer
f6e2ae750b Ignore ingress.rrd 2014-06-20 20:29:49 +02:00
Vincent Riquer
9bf4e00e16 Create RRD 2014-06-20 20:28:56 +02:00
Vincent Riquer
4991bfa107 nicer table 2014-06-20 20:00:27 +02:00
Vincent Riquer
e4209d388b Merge remote-tracking branch 'origin/master' into prod
* origin/master:
  Licensing
2014-06-20 18:52:28 +02:00
Vincent Riquer
5bdb22b32a Licensing 2014-06-20 18:51:17 +02:00
Vincent Riquer
4082b7c753 restore CACHE_DIR settings 2014-06-20 17:23:46 +02:00