Connor Turland
6b2386a545
progress onthe home page
2016-08-04 13:56:39 -04:00
Connor Turland
293e68da05
remove old stuff
2016-08-04 13:56:39 -04:00
Devin Howard
720f67cee7
move metacode loading earlier, and add a query string to work around amazon aws CORS issues
2016-08-03 08:54:10 +08:00
Connor Turland
2a3fa80540
wording needed updating
2016-04-24 12:15:40 -04:00
Connor Turland
8c51108a0c
enable shared private and public maps ( #530 )
...
* enable shared private and public maps
* change the list
* yeehaw add collaborators
* I believe this fixes the error connor brought up
* when topic or synapse is no longer on a map, don't defer
* needs to be before?
* just do it in the controller
* make recommendation they sign in and retry
* better email
* config for mailer previews
* improve wording
* shouldn't have included that
* switch to green
* don't execute if there's no map
* wasn't including the right people in some circumstances
* Finish breaking out JS files (#551 )
* metamaps.Realtime refactor
* Metamaps.Util
* Metamaps.Visualize
* Metamaps.SynapseCard
* Metamaps.TopicCard
* Metamaps.Create.js
* Remove erb extension from Metamaps.Map.js
* Metmaps.Account and Metamaps.GlobalUI remove extension
* Metamaps.JIT no more erb extension
* move Backbone.init; standard-format on Metamaps.js.erb
* factor out canvas support check function
* some llittle template bugs
* remove featured from signed in explore maps bar
* don't let it overflow off the page
2016-04-24 11:50:35 -04:00
Devin Howard
e6c4313184
reindent upperelements template + fix input tag
2016-04-13 10:50:51 +08:00
Devin Howard
a2ce20b564
versioncode fix
2016-04-13 10:48:34 +08:00
Devin Howard
c9bba0cdb2
rename repo
2016-04-13 10:16:54 +08:00
Devin Howard
2e6f04d0be
metamaps.debug function, and move VERSION into a rails constant initializer.
...
from this commit on, we would need to modify config/initializers/version.rb to increment the version number.
2016-04-06 10:27:31 +08:00
Connor Turland
fc1dc591f3
Merge branch 'copy/version.and.peers' into develop
2016-03-24 21:28:24 -07:00
Connor Turland
415c9b8ac3
final touchups on oauth
2016-03-24 21:26:07 -07:00
Connor Turland
14dfe3c926
styling for doorkeeper and api functional
2016-03-24 17:16:27 -07:00
Connor Turland
b6fac7d49b
Merge pull request #420 from metamaps/feature/realtime.video
...
JUUUUUUUUNTOOOO
2016-03-23 17:46:35 -07:00
Connor Turland
70bc0959b0
update version, date, and peers
2016-03-23 16:52:53 -07:00
Devin Howard
756fe75664
call for developers in Inspect Element window
2016-03-15 16:06:37 +08:00
Connor Turland
604087c592
Merge branch 'develop' into feature/realtime.video
2016-03-14 10:45:16 +11:00
Connor Turland
2d53922f1c
can load maps
2016-03-12 11:46:01 +11:00
Connor Turland
c6fea78054
merge develop
2016-02-29 13:58:47 +13:00
Devin Howard
7a74668c8d
tweaks to lightboxes view post-SSL
2016-02-23 18:56:50 +08:00
Devin Howard
786eeae72a
Merge branch 'develop' into feature/realtime.video
2016-02-06 12:56:23 +08:00
Devin Howard
3fe93be987
Merge branch 'master' into develop
2016-02-05 20:21:31 +08:00
Devin Howard
48ec4a024e
mark 2.7.1
2016-02-05 20:12:05 +08:00
Devin Howard
b3d321c7e9
topic icon <--
2016-02-05 18:27:26 +08:00
Devin Howard
8202fb38f3
Merge branch 'develop' into feature/realtime.video
2016-02-05 16:27:43 +08:00
Devin Howard
f2cbde50ca
dos2unix on the whole repo
2016-02-05 11:43:15 +08:00
Devin Howard
3e28831595
Merge branch 'develop' into feature/realtime.video
2016-02-05 11:38:19 +08:00
Devin Howard
c80efac7de
tag v2.8
2016-02-05 11:37:33 +08:00
Devin Howard
e73ade0442
tag v2.7
2016-02-05 11:29:05 +08:00
poietic
c8d6563f45
changed links from old uservoice url.
...
links to support forum were pointed towards our expired custom domain
from service, renamed them all so that they link up.
2016-01-29 16:00:30 -08:00
Connor Turland
4557b8e305
merge develop
2016-01-22 14:59:09 +13:00
Devin Howard
14a292331b
two tweaks to help production deploy
2016-01-19 14:27:25 +08:00
Devin Howard
3cdab531a6
move more config into .example-env
2016-01-06 22:57:01 +08:00
Connor Turland
49dd2f2e92
merge develop
2015-12-22 13:16:03 -05:00
Devin Howard
8394e0ce86
re-add regular uservoice code
2015-12-22 07:13:26 +08:00
Devin Howard
603b9dc52e
remove uservoice code
2015-12-21 10:16:51 +08:00
Devin Howard
d33f4bffb1
typekit https
2015-12-20 20:19:24 +08:00
Devin Howard
e2bf1d5eb1
try to make metamaps more tls friendly
2015-12-20 18:36:57 +08:00
Connor Turland
8b090be0b3
convert to something more 'call' style
2015-12-12 19:00:51 -05:00
Connor Turland
089528c46d
great progress
2015-12-11 14:23:41 -05:00
Connor Turland
2929547736
position the chat box, and remove the old junto panel
2015-12-03 17:15:15 -05:00
Devin Howard
75700f06a9
make invite link use REQUEST_URI
2015-12-03 16:57:29 -05:00
Devin Howard
a7e512e25a
working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before...
2015-12-03 16:57:24 -05:00
Devin Howard
b395bd0b50
replace the obvious spots with asset_path
2015-12-03 16:57:23 -05:00
Devin Howard
660ee52292
make invite link use REQUEST_URI
2015-11-03 22:22:53 +08:00
Devin Howard
a51777b0ba
working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before...
2015-10-02 13:36:51 +08:00
Devin Howard
8f8f40c0e4
replace the obvious spots with asset_path
2015-09-22 22:27:34 +08:00
Connor Turland
bcf7edb880
changed other references to connoropolous/metamaps_gen002 to metamaps/metamaps_gen002
2014-11-30 14:27:20 -05:00
Connor Turland
f62efa0d68
fixed terms of service link for live site
2014-11-30 14:06:59 -05:00
Bashar Jabbour
0e3486ddc5
make topic card mapper icon link to mapper profile
2014-11-29 16:27:43 -05:00
Connor Turland
f9d3292891
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
2014-11-29 11:17:33 -05:00
