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 |
|
Devin Howard
|
d3649f1d26
|
DRY map exporting with policy_scoping
|
2016-03-26 12:46:43 +08:00 |
|
Devin Howard
|
ea677f8a6b
|
DRY up csv/xls rendering, put it into model
|
2016-03-25 16:48:14 +08:00 |
|
Devin Howard
|
8f532708ce
|
update xls/csv format to better serialize topics and synapses
|
2016-03-25 16:47:35 +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
|
8664cc0bd9
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 11:11:11 +11:00 |
|
Connor Turland
|
579c36ec75
|
ensure the search box opens
|
2016-03-14 11:10:18 +11: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
|
e64a16f1b8
|
main#home view simplify for only unauthenticated users
|
2016-02-28 18:55:48 +08:00 |
|
Devin Howard
|
bc7db85c8c
|
update map index views
|
2016-02-28 13:14:34 +08:00 |
|
Devin Howard
|
8916ff20b6
|
Merge pull request #477 from metamaps/feature/metacode-icon-on-aws
metacode icons on aws (fixes #445)
|
2016-02-28 12:19:00 +08:00 |
|
Devin Howard
|
ac1d4f70b6
|
show old image on metacode edit form; tweak css of admin area
|
2016-02-26 14:06:37 +08:00 |
|
Devin Howard
|
40cd1ebb5c
|
modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed
|
2016-02-25 14:49:48 +08:00 |
|
Devin Howard
|
59f84cfe20
|
cleanup TODO lines
|
2016-02-23 18:59:45 +08:00 |
|
Devin Howard
|
7a74668c8d
|
tweaks to lightboxes view post-SSL
|
2016-02-23 18:56:50 +08:00 |
|
Devin Howard
|
295534e4ab
|
migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION
|
2016-02-23 14:58:20 +08:00 |
|
Devin Howard
|
dc1aa1e28e
|
document synapse cancellation in cheatsheet
|
2016-02-14 15:19:36 +08:00 |
|
Devin Howard
|
987cd7f5a0
|
Merge branch 'feature/xls.export' into release/v2.8
|
2016-02-08 09:58:09 +08:00 |
|
Devin Howard
|
0ae8ea0ca5
|
implement csv/xls export
|
2016-02-07 13:12:18 +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 |
|
Devin Howard
|
a45d0f7791
|
fix search box on authenticated homepage
|
2015-12-24 15:19:03 +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 |
|
Connor Turland
|
5b0e7ffcde
|
switching metacode sets was being caught by Metamaps.Router.intercept
|
2015-12-03 16:57:30 -05:00 |
|