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
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
Devin Howard
75700f06a9
make invite link use REQUEST_URI
2015-12-03 16:57:29 -05:00
Devin Howard
96f5e6ac35
add asset_path calls
2015-12-03 16:57:26 -05:00
Devin Howard
29411cf1e5
asset_path
2015-12-03 16:57:26 -05:00
Devin Howard
c782c4d0bb
remove binding.pry
2015-12-03 16:57:26 -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
2369c9ce5e
select metacodes with one query instead of n queries, move logic to application_helper
2015-12-03 16:57:23 -05:00
Devin Howard
e34b5bd2ad
fix best in place deprecation warnings in map info box
2015-12-03 16:57:22 -05:00
Connor Turland
03ab04050d
switching metacode sets was being caught by Metamaps.Router.intercept
2015-11-07 01:33:18 +08:00
Devin Howard
660ee52292
make invite link use REQUEST_URI
2015-11-03 22:22:53 +08:00
Devin Howard
fcd866c05e
add asset_path calls
2015-10-25 16:50:07 +08:00
Devin Howard
da98a53a3e
asset_path
2015-10-23 23:56:29 +08:00
Devin Howard
b00784731b
remove binding.pry
2015-10-23 23:42:21 +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
Devin Howard
086acb09af
select metacodes with one query instead of n queries, move logic to application_helper
2015-09-19 20:17:56 +08:00
Devin Howard
31015295f8
fix best in place deprecation warnings in map info box
2015-09-19 17:11:48 +08:00
Connor Turland
48cab05d7c
Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop
2014-12-02 13:32:48 -05:00
Connor Turland
eece1446f2
added tutorial
2014-12-02 13:32:36 -05:00
poietic
8a8123c3c2
copy changes to homepage
2014-11-30 16:55:48 -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
Connor Turland
7548c1953f
Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop
2014-11-30 13:52:32 -05:00
Connor Turland
ce7bec98ed
fixed wrong notify message bug. fixed firefox z-index issue. moved fork on github link and pointed to new metamaps repo
2014-11-30 13:47:41 -05:00
Bashar Jabbour
0e3486ddc5
make topic card mapper icon link to mapper profile
2014-11-29 16:27:43 -05:00
Bashar Jabbour
ce3ab9903a
make map contributor list dropdown into links to profiles
2014-11-29 15:56:38 -05:00
Connor Turland
f938ffade3
homepage changes
2014-11-29 12:25:11 -05:00
Connor Turland
f9d3292891
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
2014-11-29 11:17:33 -05:00
Connor Turland
f02aa53637
fixed feedback tab, added support us button
2014-11-29 11:17:11 -05:00
poietic
99b0fa0c68
links in light boxes
2014-11-29 08:06:12 -08:00
Connor Turland
cb3db06406
switched home page to active maps instead of my maps
2014-11-29 01:37:06 -05:00
Connor Turland
870b4e2829
hid elements from homepage
2014-11-27 21:45:04 -05:00
Connor Turland
0e3393e1b5
fixed metacode select lists to be flexible to metacodes
2014-11-27 18:10:17 -05:00
Connor Turland
caa80c067b
links to maps go through without refresh from topic card.
2014-11-27 17:27:22 -05:00
Bashar Jabbour
a284889593
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-11-27 15:02:58 -05:00
Bashar Jabbour
78743fbba5
updated the tooltip of maps topic appears in
2014-11-27 15:02:44 -05:00
Connor Turland
2829005d4e
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
2014-11-26 16:37:50 -05:00
Connor Turland
377138c483
fixed up search results some. colophon links open in new tab. updated homepage bg image. fixed topic carousel dimensions
2014-11-26 16:37:13 -05:00
Bashar Jabbour
363ca365c1
added tooltip to see topics synapses
2014-11-26 15:23:32 -05:00
Connor Turland
ab53e996d4
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
2014-11-26 14:49:16 -05:00
Connor Turland
36aeead2aa
homepage updates. updated the 'last updated' text. fixed map cards
2014-11-26 14:49:01 -05:00
Bashar Jabbour
814a804dd8
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-11-26 14:44:42 -05:00
Bashar Jabbour
085bf78b0e
added tooltip for maps that topic appears in
2014-11-26 14:44:31 -05:00
Connor Turland
a003e203af
big home change revisions. not 100% complete
2014-11-26 12:58:20 -05:00
Connor Turland
dbf4152a81
updated map delete sprite
2014-11-26 10:51:05 -05:00
Connor Turland
d08774d8bc
changed user image settings. added mapper profile page
2014-11-25 15:06:30 -05:00
Connor Turland
e9114a309f
fixed up map info box issues, finished up search tooltips
2014-11-23 22:28:29 -05:00
Bashar Jabbour
5725007e78
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-11-22 19:35:15 -05:00
Bashar Jabbour
23510f2f87
added user image stack for map search results and associated tooltip
2014-11-22 19:35:03 -05:00
Connor Turland
a9e488d9cb
NOTE: rake db:migrate required. added generation column to users
2014-11-21 16:50:42 -05:00
Connor Turland
0ebc3dbc37
filter and realtime button active states. zoomExtents excludes filtered topics
2014-11-21 15:45:44 -05:00
Connor Turland
a20f6b760f
finished up map info box in terms of dynamically switching pages to other maps. styled other tips.
2014-11-19 22:42:14 -05:00
Bashar Jabbour
c4de02a958
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002
2014-11-18 14:50:17 -05:00
Bashar Jabbour
818042aeae
added tooltip of map contributors in mapinfo lightbox
2014-11-18 14:48:50 -05:00
Connor Turland
fe5d682fc2
finished synapse autocomplete styling
2014-11-16 15:17:32 -05:00
Connor Turland
2cf91d39b4
another test for uservoice auto signout. this time with iframe and json
2014-11-14 21:19:14 -05:00
Connor Turland
beb05f1f39
another test for uservoice auto signout. this time with iframe
2014-11-14 21:11:51 -05:00
Connor Turland
dc37b280e1
another test for uservoice auto signout
2014-11-14 21:03:24 -05:00
Connor Turland
e0c9aba857
auto sign out of uservoice
2014-11-14 20:54:51 -05:00
Connor Turland
4e8dabba36
removed worker from heroku deploy. styled lightboxes. made form for new user able to populate with code
2014-11-14 20:21:16 -05:00
Connor Turland
ac40c0af48
touched up tooltips
2014-11-14 08:21:09 -05:00
Bashar Jabbour
78455c6a35
Added capture screenshot tooltip
2014-11-12 13:40:00 -05:00
Bashar Jabbour
02d49c166a
upated tooltips
2014-11-12 13:36:41 -05:00
Metamaps
842313bb07
updated the tooltips
2014-11-12 13:31:15 -05:00
Connor Turland
534bdae495
little lightbox fix
2014-11-11 02:27:34 -05:00
Connor Turland
7a9f737fdb
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
2014-11-11 02:23:48 -05:00
Connor Turland
9b0304c403
added filtering back to topic view
2014-11-11 02:23:39 -05:00
poietic
c285f53a57
added link to our collaborative spaces
2014-11-10 18:27:38 -08:00
poietic
cfe2ef9adb
couple more tweaks.
2014-11-10 17:05:37 -08:00
poietic
1658c5fb5d
lightbox content tweaks
2014-11-10 17:02:07 -08:00
Connor Turland
44923eb660
added new map screenshot capture method
2014-11-09 22:10:13 -05:00
Connor Turland
d73fa37f57
tweaked donate and get involved html
2014-11-08 15:00:12 -05:00
poietic
ea689f182c
added Donate lightbox! more content changes
...
of about, get involved sections
2014-11-06 12:42:26 -08:00
Connor Turland
c5907914e3
fixed user images, set up map updates for realtime
2014-11-04 12:37:17 -05:00
Connor Turland
6a052f9ea1
added loading icon to account page while image uploads
2014-11-03 21:59:15 -05:00
Connor Turland
ee1ca7853f
removed embed. fixed switch metacode set lightbox overflow. disabled topic creation and topic deletion from public maps by non-owner
2014-11-03 08:46:22 -05:00
Connor Turland
2a9a27c6c5
stops user from creating map with empty name, or topic with empty name. sets max length on topic name. allows enter key to create map
2014-11-02 16:04:53 -05:00
Connor Turland
7805871ec2
made IE lightbox auto display when on IE
2014-11-02 14:32:42 -05:00
Connor Turland
12e65c638b
changes for reset password form
2014-10-27 18:24:30 -04:00
Connor Turland
33202b5243
checking cheatsheet content
2014-10-27 17:37:42 -04:00
Connor Turland
8b97c098f7
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
2014-10-27 17:34:28 -04:00
Connor Turland
c35174a99e
removed extraneous typekit codes
2014-10-27 17:34:15 -04:00
poietic
ad2a02bb8c
removed extra div
2014-10-27 13:43:06 -04:00
poietic
e898633d69
updated shortcuts + user actions.
2014-10-27 13:42:15 -04:00
Connor Turland
cbf71ca2da
four little styling bugs
2014-10-24 12:10:56 -04:00
Connor Turland
1aaecd0a8f
improved sign up error display, fixed styling for firefox, fixed page stuck on loading spinner bug
2014-10-24 11:30:26 -04:00
Connor Turland
c6195956ca
fixed topright sprite and fixed typekits for develop
2014-10-22 21:32:38 -04:00
Connor Turland
fdfa720849
fixed ga code, and updated topright_sprite image with one that doesn't have littl glitches
2014-10-22 21:04:28 -04:00
poietic
89b6305be8
updated bitcoin widget with correct wallet info
2014-10-22 17:07:41 -04:00
Connor Turland
49c0af3add
Merge pull request #371 from Connoropolous/wip-MouseStuff
...
Changes to Mouse Functionality
2014-10-22 11:34:51 -04:00
Connor Turland
a7328526a8
got profile picture uploading working, as well as profile picture removing, as well as password changing
2014-10-21 20:31:59 -04:00
Raymon Johnstone
6840d69747
lightboxes and stylesheet changes
2014-10-18 13:56:45 -04:00
Connor Turland
fbfe695998
adding topics to map from search results happens in a spiral
2014-10-16 23:54:26 -04:00
Connor Turland
1cceaceb06
cannow handle multiple metacodes with same names
2014-10-16 21:03:11 -04:00
Connor Turland
86bd12ca09
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom
2014-10-14 23:20:46 -04:00
