Commit Graph

  • a1b7fb5259 Refactored all of filter logic to accomodate for paths instead of simply looking at leaf node in tree; fixes bugs where leaf path is non-unique efarooqui 2021-05-06 19:49:32 -07:00
  • d3c4c44da5 Working aggregate filter paths with path as key; need to reorganize coloring algorithm efarooqui 2021-05-06 16:42:29 -07:00
  • 016add8840 Merge branch 'develop' of https://github.com/forensic-architecture/timemap into bugfix/modify-filters-to-use-id-not-title efarooqui 2021-05-06 16:24:48 -07:00
  • 62ff945ff6 Extraneous comment efarooqui 2021-04-30 18:57:34 -07:00
  • 6f7cd47ee4 Merge pull request #201 from forensic-architecture/bugfix/select-category-by-title Ebrahem Farooqui 2021-04-30 17:51:53 -07:00
  • 604ff44ff2 Removing misc comments efarooqui 2021-04-30 17:49:59 -07:00
  • 123ed80d74 Allow categories to be selected by title and not id; allow for primary key field efarooqui 2021-04-30 17:47:16 -07:00
  • 1d10ef1d99 Triggering job from develop branch Ebrahem Farooqui 2021-04-28 19:49:03 -07:00
  • d6c5b55152 open street maps is our default base map Ebrahem Farooqui 2021-04-28 18:48:07 -07:00
  • 11113550e1 Merge pull request #200 from forensic-architecture/bugfix/lat-long-should-be-decimal-format Ebrahem Farooqui 2021-04-28 18:13:16 -07:00
  • b09f85748b Modifying lat long to have decimals and not commas; adding extra title field to associations efarooqui 2021-04-28 18:10:41 -07:00
  • 6b2e110295 Modifying aggregatedpaths func to return paths as keys to object instead of just singular leaf efarooqui 2021-04-28 18:05:23 -07:00
  • 62274fdb23 Adding github head ref Ebrahem Farooqui 2021-03-01 16:06:02 -08:00
  • e99398ceab Cleaning technical debt (#192) Lachlan Kermode 2021-01-19 22:22:12 +01:00
  • 745953a435 Topic/cd workflow (#193) Lachlan Kermode 2021-01-19 22:08:06 +01:00
  • 1bbcd57e5e Fix/clean errors (#191) Lachlan Kermode 2021-01-17 18:16:28 +13:00
  • 1f20fd68ec Update homepage to search for static assets in the relative dir Ebrahem Farooqui 2021-01-06 15:47:08 -08:00
  • 491c46546e Create index file in develop Ebrahem Farooqui 2021-01-06 11:24:43 -08:00
  • 78b497b7c2 Merge pull request #188 from forensic-architecture/feature/build-system-cra-ejected Zac Ioannidis 2020-12-23 17:12:11 +02:00
  • 1697ded2f6 Revert to default config for test suite Zac Ioannidis 2020-12-14 14:37:35 +00:00
  • 6a553795c4 Adding package.json command that plays well with Travis Zac Ioannidis 2020-12-14 14:20:13 +00:00
  • 2108a79808 Changed import path for the React design system, so that it can be used by Jest Zac Ioannidis 2020-12-14 13:50:17 +00:00
  • cd8b7230c4 Added pre-commit git hooks for linting the src folder Zac Ioannidis 2020-12-14 13:43:09 +00:00
  • bb973d8b2b Ignore formatting on Create React App-related scaffolding Zac Ioannidis 2020-12-14 13:42:53 +00:00
  • 730828fc5f Changed default port to 8080 Zac Ioannidis 2020-12-14 13:42:08 +00:00
  • 02128ceed3 Added Jest test suite Zac Ioannidis 2020-12-14 13:30:49 +00:00
  • 1efd2ec15b un-gitignored relevant files under config/ Zac Ioannidis 2020-12-09 11:17:13 +00:00
  • 02095e91e2 Merge pull request #189 from forensic-architecture/bug/card-layout-template-ingestion Zac Ioannidis 2020-12-09 11:07:05 +00:00
  • 3746705ee2 Using generateCardLayout from our design library to switch between appropriate card layouts Zac Ioannidis 2020-12-08 13:40:46 +00:00
  • 8497864479 Removed eslintcache Zac Ioannidis 2020-12-08 13:18:45 +00:00
  • 81e00fd917 Using prettier for linting Zac Ioannidis 2020-12-08 13:13:50 +00:00
  • fa329066e4 This is working, apart from ingesting configuration files when building Zac Ioannidis 2020-12-08 12:51:22 +00:00
  • 539dccdb86 Tried building Zac Ioannidis 2020-12-07 19:39:30 +00:00
  • 3a54cd7df5 Ingesting config through Create React App Zac Ioannidis 2020-12-07 19:28:07 +00:00
  • 00d840a65b Added eject script Zac Ioannidis 2020-12-07 18:46:42 +00:00
  • b658d55800 Initial commit before adding Craco Zac Ioannidis 2020-12-07 18:14:21 +00:00
  • 14ace9a0d5 Merge pull request #187 from 1cgonza/feature/spanish-translation Ebrahem Farooqui 2020-12-01 08:29:55 -08:00
  • df2ccd33fa export language from utilities Juan Camilo González 2020-11-30 14:21:27 -05:00
  • 71e0e24b86 default "en-US" if language is not in config.js Juan Camilo González 2020-11-30 09:57:48 -05:00
  • ffdb330f7f Lint fixes Juan Camilo González 2020-11-30 09:19:23 -05:00
  • c0a7036803 🌐 Translate JS dates & propose utility for d3 locale Juan Camilo González 2020-11-29 18:28:24 -05:00
  • 430440569a 🌐 Use locale throughout layouts Juan Camilo González 2020-11-29 18:25:51 -05:00
  • 13dfc2af15 🌐 Spanish copy Juan Camilo González 2020-11-29 18:23:53 -05:00
  • 3c8b543316 merge upstream from fork Juan Camilo González 2020-11-29 10:58:03 -05:00
  • c3a9709e3c fix contributing typos Lachlan Kermode 2020-11-25 14:24:26 +00:00
  • 12f8c40c71 update CONTRIBUTING.md (#185) Lachlan Kermode 2020-11-25 12:16:12 +00:00
  • 166c6e4063 amend config (#183) Lachlan Kermode 2020-11-20 10:36:26 +00:00
  • e1de58e701 Added generators for card layouts. (#182) Zac Ioannidis 2020-11-20 06:35:57 +00:00
  • 3ce1c3c890 Merge pull request #181 from forensic-architecture/fix/infopopup-obscured-close-button Zac Ioannidis 2020-10-30 16:48:46 +00:00
  • 6eb6083984 Don't fall back when on tablet - Fix infopoup on top of screen, so the close button isn't obscured on small viewports Zac Ioannidis 2020-10-30 16:00:20 +00:00
  • a6417cc6f0 update example (#180) Lachlan Kermode 2020-10-29 18:23:37 +01:00
  • 8b507fde96 some styling fixes (#178) Lachlan Kermode 2020-10-29 18:14:32 +01:00
  • 955e3631f9 Merge pull request #179 from forensic-architecture/fix/infopopup-responsiveness Zac Ioannidis 2020-10-29 12:23:54 +00:00
  • d1f4ade83d Make width responsive through a CSS variable that's accessed in React Zac Ioannidis 2020-10-29 11:42:00 +00:00
  • 4fdfd12401 Lint fix Zac Ioannidis 2020-10-29 11:25:07 +00:00
  • ad5995b498 Bump up opacity of infopopup Zac Ioannidis 2020-10-29 11:21:38 +00:00
  • e3a7dbe039 Pin infopopup to top, let it float on top of timeline on reduced viewport height Zac Ioannidis 2020-10-29 11:21:26 +00:00
  • 7080c6d7af Feature/smallfixes (#177) Lachlan Kermode 2020-10-29 09:31:13 +01:00
  • 001365976c Feature/update splash page copy (#176) Ebrahem Farooqui 2020-10-28 23:12:29 -07:00
  • 9175057015 Feature/handle cluster select from timeline (#175) Ebrahem Farooqui 2020-10-28 23:10:56 -07:00
  • e25b437f75 Merge pull request #174 from forensic-architecture/feature/simplified-card-props Ebrahem Farooqui 2020-10-28 17:30:02 -07:00
  • 5831c9ce4d Update version of design-system Zac Ioannidis 2020-10-28 23:49:32 +00:00
  • e9c1497ee8 Added new layout for cards Zac Ioannidis 2020-10-28 23:41:14 +00:00
  • e9542f42a9 Lint fix Zac Ioannidis 2020-10-28 19:33:05 +00:00
  • f09189469c Added markdown component for hiding source Zac Ioannidis 2020-10-28 19:28:18 +00:00
  • e3276dfe8e Added against field Zac Ioannidis 2020-10-28 19:02:22 +00:00
  • ac5565167e Merge branch 'develop' into feature/simplified-card-props Zac Ioannidis 2020-10-28 18:25:16 +00:00
  • 84c32ecf8d Adding color for categories Zac Ioannidis 2020-10-28 18:23:41 +00:00
  • c382662093 Added new fields to the rendering of the Card Component Zac Ioannidis 2020-10-28 17:19:28 +00:00
  • eff13c3d92 Feature/infopopup (#173) Lachlan Kermode 2020-10-28 17:54:59 +01:00
  • 3e20337b5e Using new Card API Zac Ioannidis 2020-10-28 16:09:29 +00:00
  • 029bc4a03e Importing <Card /> from NPM-published design-system library (#171) Zac Ioannidis 2020-10-28 10:09:02 +00:00
  • 901100d756 Feature/add coloring algorithm (#172) Lachlan Kermode 2020-10-28 09:54:16 +01:00
  • d034258e01 Update toolbar.scss Ebrahem Farooqui 2020-10-27 12:36:37 -07:00
  • fff1e46b16 Update utilities.js Ebrahem Farooqui 2020-10-27 12:22:50 -07:00
  • dba264ced6 Merge pull request #168 from forensic-architecture/fix/dot-vs-bar Ebrahem Farooqui 2020-10-27 08:24:22 -07:00
  • e0cc5e1964 Merged in changes from develop efarooqui 2020-10-27 08:15:55 -07:00
  • 7438cba250 Merge pull request #170 from forensic-architecture/fix/recursive-corner-case Ebrahem Farooqui 2020-10-27 08:13:29 -07:00
  • d38520ea3d fix corner case for toggling parents off Lachlan Kermode 2020-10-27 15:34:46 +01:00
  • c1afd75cea fix recursive case Lachlan Kermode 2020-10-27 13:35:50 +01:00
  • c454775fcb Feature/add coloring algorithm (#169) Ebrahem Farooqui 2020-10-27 05:33:32 -07:00
  • 411c39a209 fix check to render a dot or bar in timeline Lachlan Kermode 2020-10-26 11:13:57 +01:00
  • ddbee03f50 Feature/ux fixes (#167) Lachlan Kermode 2020-10-22 20:09:13 +03:00
  • f44d3e2481 Merge pull request #166 from forensic-architecture/bugfix/make-supercluster-independently-configurable Ebrahem Farooqui 2020-10-21 21:00:06 -07:00
  • 4107058ec6 Trailing comma efarooqui 2020-10-21 20:54:25 -07:00
  • d7ddc80c5c Moved supercluster config outside of map; to set the lowest level at which clusters appear, set maxZoom in config efarooqui 2020-10-21 20:52:59 -07:00
  • 534400cc7f Merge pull request #165 from forensic-architecture/feature/supercluster-corners Ebrahem Farooqui 2020-10-21 10:24:23 -07:00
  • 779894de77 Merge branch 'develop' of https://github.com/forensic-architecture/timemap into feature/supercluster-corners efarooqui 2020-10-21 10:11:19 -07:00
  • 080102cd37 Working index load on initial map render; needed to add callback to set state function efarooqui 2020-10-21 10:03:21 -07:00
  • 8f01b73b7d Merge pull request #164 from forensic-architecture/feature/supercluster-corners Lachlan Kermode 2020-10-21 19:53:29 +03:00
  • 57c7c3f96e lint Lachlan Kermode 2020-10-21 18:33:51 +03:00
  • ceed82e4f3 fix corner case where clusters sometimes remain on screen without events Lachlan Kermode 2020-10-21 18:33:06 +03:00
  • adb5d6f959 lint Lachlan Kermode 2020-10-21 17:53:56 +03:00
  • 3d010e4558 return reduce logic for when event shadows exist Lachlan Kermode 2020-10-21 17:45:12 +03:00
  • 9a1e2f6ad1 fix timeline render when there are no categories Lachlan Kermode 2020-10-21 17:35:36 +03:00
  • 59d2685879 check for USE_CATEGORIES Lachlan Kermode 2020-10-21 16:57:26 +03:00
  • a66bc3a896 Merge pull request #162 from forensic-architecture/feature/add-supercluster-visualization Ebrahem Farooqui 2020-10-20 15:31:31 -07:00
  • 9bc9c6d9a2 Merging in develop branch efarooqui 2020-10-20 15:26:15 -07:00
  • 303abe8b94 Merge pull request #163 from forensic-architecture/feature/refactor-categories Ebrahem Farooqui 2020-10-20 15:21:43 -07:00
  • 5e2982786f Linting fixes efarooqui 2020-10-20 15:15:04 -07:00