Connor Turland
0a52de714e
make it match develop
2017-02-05 05:41:29 +00:00
Connor Turland
72fd2717b6
Merge branch 'develop' into feature/convo.algo
2017-02-05 05:26:58 +00:00
Devin Howard
af2c6ebef1
split screenshot function/button into two parts ( #1027 )
...
* split screenshot function into 4 separate helpers
* screenshot download button in import dialog box
* thumbnail button inside map info box
* import blue button styling
* fight with styling to make the button at least appear
* add more text
* fix tooltip display
* automatically start downloading the screenshot
* eslint
* revamp GlobalUI.notifyUser
* fix object destructuring syntax
* fix
2017-01-19 14:50:08 -05:00
Connor Turland
4a17d00123
stuff with metacodes working well again
2017-01-12 04:00:52 -05:00
Connor Turland
9c13f5a281
metacode selector working nicely
2017-01-12 00:04:49 -05:00
Connor Turland
5302f03196
remove exclamation mark
2017-01-11 23:00:19 -05:00
Connor Turland
bf9b25da9f
merge develop
2017-01-04 10:50:59 -05:00
Devin Howard
2f4fe525ce
Fix a bunch of errors and style issues
2016-11-07 14:55:20 -05:00
Devin Howard
7c9b6a2205
try to move all rails data into Metamaps.ServerData
...
Metamaps.Erb and currentPage and currentSection are still not in; should they be?
2016-11-07 14:55:20 -05:00
Devin Howard
8026969799
start storing data in ServerData
2016-11-07 14:55:17 -05:00
Devin Howard
fb6c8a74a7
scoping on topic json properties ( #813 )
2016-10-23 22:11:38 +08:00
Connor Turland
4602ded8a4
access requests ( #762 )
...
* start on access requests
* set up access requests further
* set default values for approved and answered
2016-10-16 20:22:00 -04:00
Devin Howard
0085ce71e6
upgrade to best in place 3.0.0 alpha
2016-10-08 09:24:16 +08:00
Devin Howard
a86101dda0
remove excel export
2016-09-27 21:10:14 +08:00
Devin Howard
05495b0224
move explore views to their own folder
2016-09-25 23:35:35 +08:00
Devin Howard
f8c11f234d
more rubocop updates
2016-09-24 12:27:34 +08:00
Connor Turland
ce7c88c78c
add more space between nodes using auto-layout
2016-09-20 12:27:46 -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
Connor Turland
19dabe81cc
Enable users to star maps, and to see their starred collection ( #615 )
...
* enable starring
* users should be able to star others maps
* proper star icon
* starred maps display as starred without refreshing
* oops
* make phrasing clearer
2016-08-31 16:58:49 -04:00
Connor Turland
370499e453
avoid prompt
2016-08-30 17:00:14 -04:00
Connor Turland
da30078ef4
er, we use a static/modded version of best_in_place ( #608 )
2016-08-15 17:01:24 -04:00
Connor Turland
b4c75649ba
all teh mobile things
2016-08-12 04:04:18 +00: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
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
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
bc7db85c8c
update map index views
2016-02-28 13:14:34 +08:00
Devin Howard
59f84cfe20
cleanup TODO lines
2016-02-23 18:59:45 +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
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
089528c46d
great progress
2015-12-11 14:23:41 -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
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
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
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
