Connor Turland
|
f49a674566
|
tweaks for developing on this branch
|
2017-02-06 03:41:28 +00:00 |
|
Connor Turland
|
72fd2717b6
|
Merge branch 'develop' into feature/convo.algo
|
2017-02-05 05:26:58 +00:00 |
|
Devin Howard
|
2fd972ddce
|
ajax queue (fixes #853) (#1037)
* jquery.ajaxq
* install jquery.ajaxq from npm
* patch ajaxq into Backbone code
* use ajaxq library with more github stars
* eslint
|
2017-01-22 13:50:34 -05:00 |
|
Connor Turland
|
bf9b25da9f
|
merge develop
|
2017-01-04 10:50:59 -05:00 |
|
Devin Howard
|
01cd624bfa
|
add polyfill so chrome 49 can upload map thumbnail screenshots (#946)
|
2016-12-06 12:36:06 -05:00 |
|
Devin Howard
|
bc1f212c93
|
fix tab/shift-tab for metacode selection (#879)
|
2016-10-30 00:08:51 +08:00 |
|
Devin Howard
|
a63cd02bc6
|
fix develop branch bug
|
2016-10-23 22:51:16 +08:00 |
|
Devin Howard
|
5db8e27496
|
make metacode selector reliable after switching metacode sets (#816)
|
2016-10-23 22:11:26 +08:00 |
|
Devin Howard
|
261ed49977
|
replace uservoice with docs.metamaps.cc + Hylo (#777)
* replace uservoice with docs.metamaps.cc + Hylo
* re-add the feedback tab as link to hylo
|
2016-10-19 13:39:57 -04:00 |
|
Connor Turland
|
139837e997
|
restructure realtime server for clarity (#780)
* restructure realtime server for clarity
* better indenting on signal.js
* don't need it because socketioconnection is being imported now
|
2016-10-18 20:29:21 -04:00 |
|
Connor Turland
|
517cfcb913
|
remove static lib files in favor of npm ones (#773)
* remove static lib files in favor of npm ones
* update howler to work correctly
* patch npm modules to not use window
|
2016-10-17 10:39:08 -04:00 |
|
Devin Howard
|
fe1c57b458
|
further updates - make Enter update bip fields whaaat
|
2016-10-08 16:55:46 +08:00 |
|
Devin Howard
|
0085ce71e6
|
upgrade to best in place 3.0.0 alpha
|
2016-10-08 09:24:16 +08:00 |
|
Devin Howard
|
07e4ac3865
|
attempt to get npm testing working; fail
|
2016-09-23 10:37:59 +08:00 |
|
Connor Turland
|
74630c2631
|
messed up comment
|
2016-09-20 12:04:42 -04:00 |
|
Connor Turland
|
966dd79187
|
Merge branch 'develop' into feature/better.select
|
2016-09-20 11:55:25 -04:00 |
|
Connor Turland
|
aace6796f5
|
allow topic carousel to be pinned open (#643)
* so that rapid topic creation can happen in succession
* close when map closes
|
2016-09-19 20:30:34 -04:00 |
|
Connor Turland
|
5d04d16590
|
create MetacodeSelect component
|
2016-09-18 15:22:51 +00: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 |
|
Connor Turland
|
3c9d722945
|
accept or reject video offers
|
2015-12-11 17:29:17 -05:00 |
|
Connor Turland
|
75554d58bf
|
temp
|
2015-12-03 17:15:15 -05:00 |
|
Devin Howard
|
bd9c275ada
|
upgrade typeahead to 1.10 and new syntax
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
ff48b2456a
|
Revert "upgrade typeahead to allow new syntax"
This reverts commit 347d77df82 .
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
8826dfdcf6
|
upgrade typeahead to allow new syntax
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
8bf2eb31f3
|
remove old jquery-ui file
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
14eeb0cbe6
|
upgrade typeahead to 1.10 and new syntax
|
2015-10-01 14:55:26 +08:00 |
|
Devin Howard
|
b3b065e623
|
Revert "upgrade typeahead to allow new syntax"
This reverts commit 347d77df82 .
|
2015-10-01 11:34:19 +08:00 |
|
Devin Howard
|
347d77df82
|
upgrade typeahead to allow new syntax
|
2015-10-01 11:14:25 +08:00 |
|
Devin Howard
|
a31a92b321
|
Merge branch 'develop' into rails4
|
2015-09-15 20:37:47 +08:00 |
|
Devin Howard
|
d67d098b2a
|
remove old jquery-ui file
|
2015-09-10 22:40:45 +08:00 |
|
Connor Turland
|
5cd4db66c6
|
needed to update embedly
|
2015-08-03 14:02:30 -04:00 |
|
Connor Turland
|
bb99583622
|
updated embedly library, and data-card-chrome was now causing a breaking change
|
2015-01-28 19:19:07 -05:00 |
|
Connor Turland
|
1cceaceb06
|
cannow handle multiple metacodes with same names
|
2014-10-16 21:03:11 -04:00 |
|
Raymon Johnstone
|
bbbbe57c1b
|
new library
|
2014-10-14 23:43:25 -04:00 |
|
Connor Turland
|
51221ee3f7
|
improvements to map info card, as well as small changes to the permission changers in the topic and synapse cards
|
2014-10-13 19:27:30 -04:00 |
|
Connor Turland
|
9ba6daec90
|
further fixed uservoice to identify user
|
2014-10-07 15:39:11 -04:00 |
|
Connor Turland
|
b5068b6bc4
|
finalized uservoice config
|
2014-10-07 15:19:10 -04:00 |
|
Raymon Johnstone
|
3cb5c4ce3a
|
index on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar
|
2014-10-07 12:39:14 -04:00 |
|
Connor Turland
|
d30417f958
|
fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar
|
2014-10-04 00:15:47 -04:00 |
|
Connor Turland
|
031f97ba42
|
search results styling
|
2014-10-01 13:18:24 -04:00 |
|
Shai Mor
|
57fb6a15c4
|
start on search results styling, pulled in external js libraries and css
|
2014-10-01 09:54:56 -04:00 |
|
Connor Turland
|
ff6eef7807
|
synapse form styling and positioning
|
2014-09-21 01:02:21 -04:00 |
|
Connor Turland
|
90e974164d
|
added more resources into help lightbox
|
2014-09-20 15:11:58 -04:00 |
|
Connor Turland
|
b6893d8f92
|
fixed admin panels
|
2014-09-15 21:57:34 -04:00 |
|