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

Commit graph

  • b0860ef670 Merge branch 'develop' Devin Howard 2016-06-08 12:47:26 +0800
  • 1d12aed3eb switch to dotenv-rails Devin Howard 2016-06-07 12:55:49 +0800
  • 11f921b058 remove secret key from source control - fixme on production. Devin Howard 2016-06-07 12:54:52 +0800
  • ce3271d8f0 hide the permission box, unless you're the one who can change the permission feature/flex.permission.styling Connor Turland 2016-05-30 18:07:04 -0400
  • c08868a5c1 user presence event (#552) Connor Turland 2016-04-26 08:08:12 -0400
  • 45adda93b1 set up scaffolding for js tests (#553) Devin Howard 2016-04-26 10:22:32 +0800
  • 7e87af591b cache node and bundler Devin Howard 2016-04-26 10:18:38 +0800
  • 2d44c4c599 what about this Devin Howard 2016-04-26 10:15:11 +0800
  • 7a3cf5aba5 does this CI config work? Devin Howard 2016-04-26 10:12:41 +0800
  • 027f0093ed documentation Devin Howard 2016-04-26 10:05:19 +0800
  • 10e82b696a set up scaffolding for tests Devin Howard 2016-04-25 19:09:22 +0800
  • f2384a2b13 user presence event Connor Turland 2016-04-24 16:33:15 -0400
  • 2a3fa80540 wording needed updating Connor Turland 2016-04-24 12:15:40 -0400
  • 8c51108a0c enable shared private and public maps (#530) Connor Turland 2016-04-24 11:50:35 -0400
  • 37d1b71418 don't let it overflow off the page Connor Turland 2016-04-24 11:28:20 -0400
  • 7cc3e100af remove featured from signed in explore maps bar Connor Turland 2016-04-24 11:22:57 -0400
  • ec566f0ea3 some llittle template bugs Connor Turland 2016-04-24 11:22:38 -0400
  • 8000fbd766 Finish breaking out JS files (#551) Devin Howard 2016-04-24 22:58:10 +0800
  • ddaf8f5410 factor out canvas support check function Devin Howard 2016-04-24 13:10:36 +0800
  • 9caeeb0910 move Backbone.init; standard-format on Metamaps.js.erb Devin Howard 2016-04-24 13:08:56 +0800
  • 24368fef60 Metamaps.JIT no more erb extension Devin Howard 2016-04-24 13:01:01 +0800
  • b230c343b1 Metmaps.Account and Metamaps.GlobalUI remove extension Devin Howard 2016-04-24 12:59:24 +0800
  • 21e665450f Remove erb extension from Metamaps.Map.js Devin Howard 2016-04-24 12:56:17 +0800
  • ba7bd2a7d0 Metamaps.Create.js Devin Howard 2016-04-24 12:56:04 +0800
  • e2b8aa5fb7 Metamaps.TopicCard Devin Howard 2016-04-24 12:44:23 +0800
  • c668c774dd Metamaps.SynapseCard Devin Howard 2016-04-24 12:42:36 +0800
  • e8e866c196 Metamaps.Visualize Devin Howard 2016-04-24 12:38:43 +0800
  • 87b6dfb739 Metamaps.Util Devin Howard 2016-04-24 12:33:52 +0800
  • 987a2d16d0 metamaps.Realtime refactor Devin Howard 2016-04-24 12:27:39 +0800
  • 8197d74955 wasn't including the right people in some circumstances Connor Turland 2016-04-22 15:02:16 -0400
  • a3b4f96d37 don't execute if there's no map Connor Turland 2016-04-22 14:32:24 -0400
  • 1c988b5a8f switch to green Connor Turland 2016-04-22 14:31:56 -0400
  • f704d1d2c9 shouldn't have included that Connor Turland 2016-04-22 14:25:24 -0400
  • 71c11cc79e improve wording Connor Turland 2016-04-22 12:35:38 -0400
  • 4c0df041b9 config for mailer previews Connor Turland 2016-04-22 12:02:54 -0400
  • d90e51eb1e better email Connor Turland 2016-04-22 12:02:06 -0400
  • 46540ff753 make recommendation they sign in and retry Connor Turland 2016-04-22 10:58:49 -0400
  • ce72bde309 just do it in the controller Connor Turland 2016-04-22 12:51:07 +0000
  • 7cf0ddc2ee needs to be before? Connor Turland 2016-04-22 12:38:38 +0000
  • 5928969724 when topic or synapse is no longer on a map, don't defer Connor Turland 2016-04-22 12:27:26 +0000
  • b2da15245a I believe this fixes the error connor brought up Devin Howard 2016-04-22 14:00:35 +0800
  • c7402c3ee5 Merge branch 'develop' into feature/flex.permissions Devin Howard 2016-04-22 13:57:27 +0800
  • 6c7ce56e4f yeehaw add collaborators Connor Turland 2016-04-21 18:54:26 -0400
  • 44ae6730a6 fix user search error Devin Howard 2016-04-21 12:30:11 +0800
  • d08143f814 fix user search error Devin Howard 2016-04-21 12:00:35 +0800
  • 437c73b0fe Merge develop v2.8.6 Devin Howard 2016-04-20 11:25:59 +0800
  • e569a0376d Merge pull request #548 from metamaps/feature/refactor-javascript Devin Howard 2016-04-20 11:24:20 +0800
  • fa51ee850e change the list Connor Turland 2016-04-19 23:20:37 -0400
  • af4a958f59 Merge pull request #549 from metamaps/fix/map-fork Devin Howard 2016-04-20 09:36:52 +0800
  • da0da1a117 Merge pull request #546 from metamaps/feature/exception-notification Devin Howard 2016-04-20 09:06:42 +0800
  • 837e4bde1b fix map forking (fix #540) Devin Howard 2016-04-20 08:51:38 +0800
  • ab70d65aab enable shared private and public maps Connor Turland 2016-04-01 00:01:47 -0400
  • 5a60135392 Merge branch 'develop' v2.8.5 Devin Howard 2016-04-15 11:51:40 +0800
  • c1d963d669 remove .erb from files that don't need it Devin Howard 2016-04-15 09:18:17 +0800
  • 8bb96d12a6 Metamaps.Control Devin Howard 2016-04-15 09:11:50 +0800
  • 6a8921ae6d standard-format Metamaps.JIT.js.erb Devin Howard 2016-04-15 08:43:46 +0800
  • 074eaf0bd3 alphabetize dependecies Devin Howard 2016-04-15 08:37:19 +0800
  • 324719e531 Metamaps.Filter Devin Howard 2016-04-15 08:36:50 +0800
  • b10f0cef0e Metamaps.Listeners.js.erb Devin Howard 2016-04-15 08:31:22 +0800
  • a5bd0440a8 Metamaps.Organize Devin Howard 2016-04-15 08:28:28 +0800
  • ca5928113d whoops don't forget standard format Devin Howard 2016-04-14 14:16:16 +0800
  • de62a08307 Metamaps.Topic Devin Howard 2016-04-14 14:12:12 +0800
  • 4833dd8da6 Metamaps.Synapse Devin Howard 2016-04-14 14:05:50 +0800
  • 11a87582c7 Metamaps.Map Devin Howard 2016-04-14 14:01:21 +0800
  • 13d6ab56e5 factor out two more small view modules Devin Howard 2016-04-14 13:54:19 +0800
  • 7bb7f345f1 added an event for conversations starting (#547) Connor Turland 2016-04-14 14:35:28 -0400
  • 958791952c switch to post Connor Turland 2016-04-14 14:34:17 -0400
  • 317f0c245e Merge pull request #545 from metamaps/feature/refactor-javascript Devin Howard 2016-04-14 12:35:21 +0800
  • d94f8f0308 added an event for conversations starting Connor Turland 2016-04-13 23:50:01 -0400
  • fb80f56a7d slack exception notifications Devin Howard 2016-04-13 17:20:01 +0800
  • 134d4171f8 alphabetize gemfile Devin Howard 2016-04-13 17:07:21 +0800
  • 6653d10edf Debug gets a header. Still need to parse through Metamaps, Metamaps.GlobalUI, and Metamaps.JIT Devin Howard 2016-04-13 16:06:01 +0800
  • be99ad8285 factor out Metamaps.Admin Devin Howard 2016-04-13 16:04:15 +0800
  • 799f6e4623 Metamaps.Router standard style Devin Howard 2016-03-27 20:18:37 +0800
  • df9c0a93bc Metamaps.Views standard style Devin Howard 2016-03-27 19:50:07 +0800
  • e8c55df4e8 Metamaps.Backbone standard style Devin Howard 2016-03-27 19:46:36 +0800
  • 5a3ab025b7 Metamaps.Import standard style Devin Howard 2016-03-27 19:43:30 +0800
  • 031e35e50c Merge branch 'develop' Devin Howard 2016-04-13 10:53:46 +0800
  • d2d67d5d6c Merge pull request #544 from metamaps/fix/versioncode Devin Howard 2016-04-13 10:53:31 +0800
  • e6c4313184 reindent upperelements template + fix input tag Devin Howard 2016-04-13 10:50:51 +0800
  • a2ce20b564 versioncode fix Devin Howard 2016-04-13 10:48:34 +0800
  • bd1e1ffe81 ruby gemset Devin Howard 2016-04-13 10:32:27 +0800
  • 3040c004f0 ruby gemset Devin Howard 2016-04-13 10:32:27 +0800
  • 0de7333d6a Merge branch 'develop' Devin Howard 2016-04-13 10:26:01 +0800
  • 5ed1fd3156 v2.8.4 v2.8.4 Devin Howard 2016-04-13 10:19:35 +0800
  • 0a9a1c27d8 Merge pull request #543 from metamaps/feature/rename-repo Devin Howard 2016-04-13 10:17:30 +0800
  • c9bba0cdb2 rename repo Devin Howard 2016-04-13 10:16:54 +0800
  • 33d17ed3bc Merge df8325c58e into 6659a97f28 Connor Turland 2016-04-13 02:14:24 +0000
  • 6659a97f28 Merge pull request #536 from metamaps/feature/metamaps.debug Devin Howard 2016-04-13 10:14:23 +0800
  • fd9c27c631 Merge pull request #535 from metamaps/feature/cors Devin Howard 2016-04-13 10:13:16 +0800
  • df8325c58e repo name changed Connor Turland 2016-04-12 10:18:19 -0400
  • e27d64e643 only allow cors on api routes Devin Howard 2016-04-06 20:09:25 +0800
  • 2e6f04d0be metamaps.debug function, and move VERSION into a rails constant initializer. Devin Howard 2016-04-06 10:27:31 +0800
  • a8d0d9da09 2.8.3: v2.8.3 Devin Howard 2016-04-06 10:06:37 +0800
  • 7de642ccb2 add rack-cors; fix #531 Devin Howard 2016-04-05 10:12:12 +0800
  • 8a6d434fc3 Junto Sounds Connor Turland 2016-04-04 10:50:02 -0400
  • c3595f9cb4 bug fixes and chat sounds on by default Connor Turland 2016-04-04 10:37:36 -0400
  • ac762e0056 prevent double sound Connor Turland 2016-04-03 20:58:17 -0400
  • 1a69b0faf4 awesome news sounnndzzzz Connor Turland 2016-04-03 20:40:40 -0400
  • f21a3d114f Merge pull request #529 from metamaps/fix/import-fixes Devin Howard 2016-04-01 13:37:43 +0800