glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Commit graph

  • 7eb8ae37ee Merge pull request #526 from metamaps/fix/invite-link Devin Howard 2016-04-01 13:37:33 +0800
  • 7d6acb7014 fix json import Devin Howard 2016-03-31 13:03:14 +0800
  • a83382efe9 Merge branch 'develop' v2.8.2 Devin Howard 2016-03-31 10:11:49 +0800
  • b9b9e57c41 Merge pull request #528 from metamaps/fix/import-fixes Devin Howard 2016-03-31 10:04:33 +0800
  • ccd07ddd19 import fixes Devin Howard 2016-03-31 09:25:14 +0800
  • a2fe1399e4 fix invite link Devin Howard 2016-03-29 22:34:47 +0800
  • c1aa7c6a92 Merge pull request #523 from metamaps/feature/production-deploy-steps Devin Howard 2016-03-29 10:00:00 +0800
  • da25dd0d9c add production deploy/update steps (see issue #518) Devin Howard 2016-03-28 10:38:10 +0800
  • b2a4cbf3ec Merge pull request #522 from Tadasu85/master Raymon Johnstone 2016-03-27 18:09:16 -0400
  • e1c0509c91 Merge pull request #520 from metamaps/develop v2.8.1 Connor Turland 2016-03-27 12:12:26 -0700
  • 3c03d30c08 Merge pull request #519 from metamaps/bug/requestinvite Connor Turland 2016-03-27 12:11:21 -0700
  • 8fa856451d request invite page was broken Connor Turland 2016-03-27 12:02:21 -0700
  • fbba487b83 Merge pull request #482 from metamaps/develop v2.8 Connor Turland 2016-03-27 00:43:54 -0700
  • 8a6e702c12 fix js error Devin Howard 2016-03-27 15:32:18 +0800
  • dae3106b34 Merge pull request #509 from metamaps/feature/import.export Devin Howard 2016-03-27 15:22:17 +0800
  • 49f4b2030e gemfile.lock needed to change for travis to be happy Connor Turland 2016-03-27 00:21:32 -0700
  • 30d327f07a solution using backbone events instead of setTimeout Devin Howard 2016-03-27 15:20:09 +0800
  • a82b0048d8 don't need sequenced Connor Turland 2016-03-27 00:14:22 -0700
  • f9e6249615 Fix up import - want more backboney event listening though Devin Howard 2016-03-27 11:46:58 +0800
  • e4145ef9fb Merge pull request #506 from metamaps/feature/import.export Connor Turland 2016-03-26 23:46:28 -0700
  • ae9f4a51a2 fix a few embarassing errors - export is working Devin Howard 2016-03-26 15:21:55 +0800
  • 53867caae8 allow JSON or TSV parsing Devin Howard 2016-03-26 14:20:49 +0800
  • 92f78aa56a update tsv code to handle new export code at the very least. Devin Howard 2016-03-26 12:49:26 +0800
  • d3649f1d26 DRY map exporting with policy_scoping Devin Howard 2016-03-26 11:31:55 +0800
  • 14bdc8546b metacodes#show routes Devin Howard 2016-03-26 10:12:32 +0800
  • 579ddcc047 Merge pull request #505 from metamaps/fix/crappy-export Devin Howard 2016-03-25 16:55:05 +0800
  • 387c863222 fix a bug with synapses and use cid to link new topics with synapses Devin Howard 2016-02-21 17:02:37 +0800
  • c77cc32734 import fixes Devin Howard 2016-02-21 16:28:31 +0800
  • ea677f8a6b DRY up csv/xls rendering, put it into model Devin Howard 2016-02-13 12:53:07 +0800
  • 8f532708ce update xls/csv format to better serialize topics and synapses Devin Howard 2016-02-12 15:57:34 +0800
  • 61262aaec2 implement csv/xls export Devin Howard 2016-02-05 17:49:59 +0800
  • 0c1e12a301 use state machine to implement smarter topic/synapse import Devin Howard 2016-02-14 22:39:29 +0800
  • b47ed7b5b4 don't ask about adding 0 topics Devin Howard 2016-02-07 17:51:01 +0800
  • 6df7fa849a bare minimum topic import functionality - use by Ctrl+V onto the map canvas itself Devin Howard 2016-02-07 16:56:03 +0800
  • 6c055ea3b9 add missing synapses_csv function (fixes #504) Devin Howard 2016-03-25 16:35:43 +0800
  • 87d6dfe8de fix the autocomplete Connor Turland 2016-03-24 23:36:57 -0700
  • b36d5df6cb this may make it work Connor Turland 2016-03-24 23:33:26 -0700
  • c6f1e3cc4a breaking the mapping_policy Connor Turland 2016-03-24 23:29:08 -0700
  • fc1dc591f3 Merge branch 'copy/version.and.peers' into develop Connor Turland 2016-03-24 21:28:24 -0700
  • 415c9b8ac3 final touchups on oauth Connor Turland 2016-03-24 21:26:07 -0700
  • 540b35c757 Merge branch 'feature/no-cancancan' into develop Connor Turland 2016-03-24 20:47:35 -0700
  • 42eea78bc4 Merge branch 'fix/typo' into develop Connor Turland 2016-03-24 20:47:23 -0700
  • 530a16cadb instantiate_resource Devin Howard 2016-03-25 10:26:32 +0800
  • 34d3a80db1 use new pundit-enabled snorlax Devin Howard 2016-03-25 10:05:22 +0800
  • 14dfe3c926 styling for doorkeeper and api functional Connor Turland 2016-03-24 17:16:27 -0700
  • e23224aa16 Merge pull request #1 from metamaps/master Raymon Johnstone 2016-03-23 22:51:42 -0400
  • 4f86c127cd Merge 5054773473 into b6fac7d49b Devin Howard 2016-03-24 02:30:20 +0000
  • 5054773473 this seems to fix the uninitialized constant error Devin Howard 2016-03-24 10:30:10 +0800
  • b783c8b6b2 remove cancan Devin Howard 2016-03-24 10:17:45 +0800
  • 5317711b57 Merge branch 'develop' into oauth.provider Connor Turland 2016-03-23 18:00:59 -0700
  • a9a5ca9136 Merge e4600a987a into b6fac7d49b Connor Turland 2016-03-24 00:54:24 +0000
  • b6fac7d49b Merge pull request #420 from metamaps/feature/realtime.video Connor Turland 2016-03-23 17:46:35 -0700
  • e4600a987a v2.8 actually Devin Howard 2016-03-24 08:26:09 +0800
  • 70bc0959b0 update version, date, and peers Connor Turland 2016-03-23 16:50:53 -0700
  • c4890274f2 switch messages to use pundit Connor Turland 2016-03-23 16:29:26 -0700
  • baa5439f0f auto position videos which haven't been manually positioned Connor Turland 2016-03-23 16:12:23 -0700
  • 3bb3fa9e73 Merge pull request #493 from metamaps/feature/icon-tests Devin Howard 2016-03-22 14:22:05 +0800
  • b305584d5d Merge pull request #490 from metamaps/feature/call-for-developers Devin Howard 2016-03-22 14:21:52 +0800
  • cb4137c13f Merge pull request #491 from metamaps/feature/rails-intro Devin Howard 2016-03-22 14:21:38 +0800
  • 617dec72b9 hide sound option. green 'in call' dot. tooltip Connor Turland 2016-03-21 13:08:34 -0700
  • e6ac4b1dcb make metamaps an oauth provider Connor Turland 2016-03-19 13:28:55 +1100
  • 0c3010be90 Small revisions to rails intro Devin Howard 2016-03-16 11:45:12 +0800
  • a0d38c8fb8 check https manual icons Devin Howard 2016-03-16 11:42:51 +0800
  • 8b54e53743 metacode icon tests Devin Howard 2016-03-16 11:39:24 +0800
  • 5ea61341eb add rails intro for newcomers Devin Howard 2016-03-15 16:16:19 +0800
  • 756fe75664 call for developers in Inspect Element window Devin Howard 2016-02-29 10:46:42 +0800
  • f055f4c7c5 Merge branch 'develop' into feature/realtime.video Connor Turland 2016-03-14 21:45:36 +1100
  • ac9460be77 do still need cancan Connor Turland 2016-03-14 21:44:50 +1100
  • 1ee33b843f Merge branch 'develop' into feature/realtime.video Connor Turland 2016-03-14 21:40:25 +1100
  • 3e24a088da Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop Connor Turland 2016-03-14 21:36:57 +1100
  • 8bd032472d topic related things weren't working at all Connor Turland 2016-03-14 21:36:34 +1100
  • f24def8be6 fix up javascript errors Connor Turland 2016-03-14 21:36:16 +1100
  • 10a5a099e7 Merge pull request #489 from metamaps/feature/fix-tests Connor Turland 2016-03-14 18:17:25 +1100
  • 5cb5eac9d6 Merge pull request #488 from metamaps/feature/no-cancan Devin Howard 2016-03-14 14:44:35 +0800
  • a05c7dc5fe avoid pundit error if no map specified with a mapping Devin Howard 2016-03-14 14:37:01 +0800
  • d11f3923dd remove unused has_viewable_synapses function Devin Howard 2016-03-14 14:34:36 +0800
  • 32326ff4af update map/topic delete action test Devin Howard 2016-03-14 11:46:45 +0800
  • 7716462c8f fix topics controller test Devin Howard 2016-03-14 11:40:23 +0800
  • ee0ca3ba35 Merge pull request #487 from metamaps/feature/pundit Devin Howard 2016-03-14 11:46:09 +0800
  • f7201e048e pending mapping policy Devin Howard 2016-03-14 11:15:10 +0800
  • 3823c708fd update mapping policy Devin Howard 2016-03-14 11:09:27 +0800
  • c5009952f3 remove permissions tests Devin Howard 2016-03-14 11:03:30 +0800
  • dbb8052a17 trifecta of policy tests Devin Howard 2016-03-14 11:00:54 +0800
  • 88c070cbbd no cancan Devin Howard 2016-03-14 10:55:26 +0800
  • 8664cc0bd9 Merge branch 'develop' into feature/realtime.video Connor Turland 2016-03-14 11:11:11 +1100
  • 579c36ec75 ensure the search box opens Connor Turland 2016-03-14 11:10:18 +1100
  • 6715ba7e7f not a function Connor Turland 2016-03-14 11:03:11 +1100
  • 604087c592 Merge branch 'develop' into feature/realtime.video Connor Turland 2016-03-14 10:45:16 +1100
  • 6f5258cbb7 needed a policy for tokens Connor Turland 2016-03-14 08:19:26 +1100
  • b40fedda1a Merge pull request #483 from harlantwood/travis Connor Turland 2016-03-14 07:54:20 +1100
  • e0b2991596 Merge pull request #484 from harlantwood/token-entropy Connor Turland 2016-03-14 07:51:37 +1100
  • f3eb558971 fix test regex Harlan T Wood 2016-03-13 13:28:07 -0700
  • 3fbb3d1dc9 more token entropy Harlan T Wood 2016-03-13 00:20:18 -0800
  • 74cf9ba717 Run tests on Travis CI; show build status badge Harlan T Wood 2016-03-12 19:40:56 -0800
  • 4f76d3914d Merge pull request #418 from metamaps/feature/slack Connor Turland 2016-03-13 12:00:17 +1100
  • 72b2e8f8f2 doesn't look good for now, take it out, add it later Connor Turland 2016-03-13 11:58:09 +1100
  • 77d69dd2a3 turns out we do need delayed_job Connor Turland 2016-03-13 11:56:18 +1100
  • fe578ca3b2 add migrations Connor Turland 2016-03-13 11:24:00 +1100
  • d863d1c15b remove traces of delayed_job Connor Turland 2016-03-13 10:42:55 +1100
  • 11e57c1b37 rebase onto develop which now has API and pundit Connor Turland 2016-03-13 10:36:38 +1100