Devin Howard
|
a05c7dc5fe
|
avoid pundit error if no map specified with a mapping
|
2016-03-14 14:37:01 +08:00 |
|
|
Devin Howard
|
d11f3923dd
|
remove unused has_viewable_synapses function
|
2016-03-14 14:34:36 +08:00 |
|
|
Devin Howard
|
3823c708fd
|
update mapping policy
|
2016-03-14 11:09:27 +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
|
6715ba7e7f
|
not a function
|
2016-03-14 11:03:11 +11:00 |
|
|
Connor Turland
|
604087c592
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 10:45:16 +11:00 |
|
|
Connor Turland
|
6f5258cbb7
|
needed a policy for tokens
|
2016-03-14 08:19:26 +11:00 |
|
Harlan T Wood
|
3fbb3d1dc9
|
more token entropy
|
2016-03-13 00:56:10 -08:00 |
|
|
Connor Turland
|
72b2e8f8f2
|
doesn't look good for now, take it out, add it later
|
2016-03-13 11:58:09 +11:00 |
|
|
Connor Turland
|
77d69dd2a3
|
turns out we do need delayed_job
|
2016-03-13 11:56:18 +11:00 |
|
|
Connor Turland
|
11e57c1b37
|
rebase onto develop which now has API and pundit
|
2016-03-13 10:36:38 +11:00 |
|
|
Connor Turland
|
b236f4c689
|
handle not logged in scenarios
|
2016-03-13 02:41:32 +11:00 |
|
|
Connor Turland
|
3aec00e07c
|
just don't include mappable for now
|
2016-03-13 02:28:39 +11:00 |
|
|
Connor Turland
|
f072e39c4c
|
pundit: sometimes no user
|
2016-03-13 02:27:05 +11:00 |
|
|
Connor Turland
|
ada29c6832
|
cleanup
|
2016-03-12 21:35:56 +11:00 |
|
|
Connor Turland
|
efe13dc7c0
|
Merge branch 'develop' into feature/api
|
2016-03-12 21:30:27 +11:00 |
|
|
Connor Turland
|
f58185fd40
|
Merge branch 'feature/pundit' into develop
|
2016-03-12 21:26:06 +11:00 |
|
|
Connor Turland
|
446619c451
|
omg not having this was breaking things
|
2016-03-12 13:20:15 +11:00 |
|
|
Connor Turland
|
8b8db40c67
|
Merge branch 'feature/pundit' into feature/api
|
2016-03-12 12:59:42 +11:00 |
|
|
Connor Turland
|
a295c61322
|
json response was broken
|
2016-03-12 12:58:13 +11:00 |
|
|
Connor Turland
|
e4ac5b0134
|
Merge branch 'feature/pundit' into feature/api
|
2016-03-12 12:40:11 +11:00 |
|
|
Connor Turland
|
bf4fbbeb06
|
fix tokens
|
2016-03-12 12:26:23 +11:00 |
|
|
Devin Howard
|
bb03b49d80
|
update main controller (searching) to use policies
|
2016-03-12 09:09:41 +08:00 |
|
|
Connor Turland
|
521aa6b5d0
|
function no longer exists
|
2016-03-12 11:58:26 +11:00 |
|
|
Connor Turland
|
7f86810f62
|
remove things again not needed
|
2016-03-12 11:53:12 +11:00 |
|
|
Connor Turland
|
a78312f90c
|
Merge branch 'feature/pundit' into feature/api.pundit
|
2016-03-12 11:49:41 +11:00 |
|
|
Connor Turland
|
bc505a1361
|
pundit: now updating maps actually works
|
2016-03-12 11:47:40 +11:00 |
|
|
Connor Turland
|
5d179ae5ec
|
pundit: policy didn't exist
|
2016-03-12 11:47:32 +11:00 |
|
|
Connor Turland
|
d0aecc0b31
|
pundit: make it work
|
2016-03-12 11:47:24 +11:00 |
|
|
Connor Turland
|
dc6ccd2022
|
pundit: fixing up topics and synapses
|
2016-03-12 11:47:05 +11:00 |
|
|
Connor Turland
|
1cf3182e75
|
pundit: exclude topic action
|
2016-03-12 11:46:52 +11:00 |
|
|
Connor Turland
|
bd3afff069
|
pundit: fix queries
|
2016-03-12 11:46:31 +11:00 |
|
|
Connor Turland
|
5f3f5212c5
|
pundit: syntax error
|
2016-03-12 11:46:18 +11:00 |
|
|
Connor Turland
|
2d53922f1c
|
can load maps
|
2016-03-12 11:46:01 +11:00 |
|
|
Connor Turland
|
d8c328468e
|
changess for pundit
|
2016-03-12 11:45:39 +11:00 |
|
|
Connor Turland
|
d0fd676aa0
|
pundit: now updating maps actually works
|
2016-03-12 11:35:03 +11:00 |
|
|
Connor Turland
|
fdd9351378
|
pundit: policy didn't exist
|
2016-03-12 11:24:49 +11:00 |
|
|
Connor Turland
|
cb79f2deae
|
pundit: make it work
|
2016-03-12 11:16:46 +11:00 |
|
|
Connor Turland
|
4ed00240eb
|
api: revert silly js change
|
2016-03-12 11:15:14 +11:00 |
|
|
Connor Turland
|
bef21341c6
|
pundit: fixing up topics and synapses
|
2016-03-12 11:10:30 +11:00 |
|
|
Connor Turland
|
09a7b336bf
|
pundit: exclude topic action
|
2016-03-12 10:13:22 +11:00 |
|
|
Connor Turland
|
c7075dab48
|
pundit: fix queries
|
2016-03-12 10:10:31 +11:00 |
|
|
Connor Turland
|
0095a8daf4
|
pundit: syntax error
|
2016-03-12 10:06:00 +11:00 |
|
|
Connor Turland
|
fc1a7fd23d
|
api: adjust serializers
|
2016-03-12 10:05:42 +11:00 |
|
|
Connor Turland
|
623b3c7ad7
|
can load maps
|
2016-03-12 09:54:23 +11:00 |
|
|
Connor Turland
|
77d39d6649
|
redid so they won't interfere
|
2016-03-12 09:48:07 +11:00 |
|
|
Connor Turland
|
450db5eb8d
|
changes for pundit
|
2016-03-12 09:37:32 +11:00 |
|
|
Connor Turland
|
669b337d04
|
changes for api
|
2016-03-12 09:37:18 +11:00 |
|
|
Connor Turland
|
e6017c4129
|
Merge remote-tracking branch 'origin/feature/pundit' into feature/api.pundit
|
2016-03-12 07:19:19 +11:00 |
|
|
Devin Howard
|
eb56755068
|
implement five policies into their controllers
|
2016-03-11 22:10:31 +08:00 |
|
|
Devin Howard
|
7395811ba5
|
handle unauthorized with baaaaad 403
|
2016-03-11 21:35:48 +08:00 |
|
|
Devin Howard
|
73b82801cc
|
consistent permissions
|
2016-03-11 21:32:18 +08:00 |
|
|
Devin Howard
|
615eaf580e
|
mapping policy
|
2016-03-11 21:30:54 +08:00 |
|
|
Devin Howard
|
d8cc588efb
|
basics of admin_override policy function
|
2016-03-11 21:25:24 +08:00 |
|
|
Connor Turland
|
ccfba03fdb
|
clean up duplicate code
|
2016-03-11 17:26:54 +11:00 |
|
|
Connor Turland
|
059591b78b
|
first pass at important API endpoints, token auth
|
2016-03-11 17:16:04 +11:00 |
|
|
Connor Turland
|
ef60aefe88
|
fix js bug
|
2016-03-11 07:59:22 +11:00 |
|
|
Connor Turland
|
616dc9ed0e
|
messages weren't being displayed in order
|
2016-03-01 12:55:00 +13:00 |
|
|
Connor Turland
|
26025d6ee9
|
store the right number of mappers in conversation
|
2016-03-01 12:30:49 +13:00 |
|
|
Connor Turland
|
bd5c88fb0b
|
display initial state of call to new mapper
|
2016-03-01 12:25:38 +13:00 |
|
|
Connor Turland
|
4e92d4c2c5
|
change video border width
|
2016-02-29 17:05:36 +13:00 |
|
|
Connor Turland
|
d50923b6bd
|
fix js bug
|
2016-02-29 17:05:11 +13: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
|
ef5d85c2bf
|
before_filter => before_action
|
2016-02-28 17:48:35 +08:00 |
|
|
Devin Howard
|
36c5ddab1f
|
before_filter => before_action
|
2016-02-28 17:48:18 +08:00 |
|
|
Devin Howard
|
155eac41d8
|
@ symbols unneeded
|
2016-02-28 17:24:00 +08:00 |
|
|
Devin Howard
|
895b872bda
|
remove unneeded https stuff
|
2016-02-28 17:15:09 +08:00 |
|
|
Devin Howard
|
25774d9f16
|
remove unneeded https stuff
|
2016-02-28 16:57:25 +08:00 |
|
|
Devin Howard
|
cbb6b648be
|
implement main_policy (headless). also remove all @current references
|
2016-02-28 16:53:59 +08:00 |
|
|
Devin Howard
|
3ed6ffbdba
|
@record/@user in topic/synapse policy
|
2016-02-28 13:29:33 +08:00 |
|
|
Devin Howard
|
1e01ff8bc9
|
map policy
|
2016-02-28 13:28:28 +08:00 |
|
|
Devin Howard
|
bc7db85c8c
|
update map index views
|
2016-02-28 13:14:34 +08:00 |
|
|
Devin Howard
|
8ef847bd6d
|
factor maps#index into 4 separate functions
|
2016-02-28 12:30:41 +08:00 |
|
|
Devin Howard
|
baca4aac83
|
synapse policy
|
2016-02-28 12:30:41 +08:00 |
|
|
Devin Howard
|
52facb9c1d
|
topic policy
|
2016-02-28 12:30:41 +08:00 |
|
|
Devin Howard
|
66f1d2ec0b
|
install pundit
|
2016-02-28 12:30:41 +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 |
|
|
Connor Turland
|
f9b23499dc
|
styling. add self to participants
|
2016-02-26 12:43:27 +13: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
|
e1b2ddde7d
|
add another TODO...
|
2016-02-23 19:04:39 +08:00 |
|
|
Devin Howard
|
09ceb8ceec
|
move 4 global variables into Metamaps namespace
|
2016-02-23 19:04:30 +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
|
b385efafa9
|
don't need xloc or yloc for Synapse mappings
|
2016-02-21 17:25:39 +08:00 |
|
|
Devin Howard
|
40a833b069
|
Merge pull request #473 from metamaps/feature/fix-invite-link
fix get_invite_link function. fixes #471
|
2016-02-21 15:22:34 +08:00 |
|
|
Devin Howard
|
e629a9bf71
|
fix get_invite_link function. fixes #471
|
2016-02-19 18:09:46 +08:00 |
|
|
Devin Howard
|
7b9c6459e3
|
allow embedding
|
2016-02-19 09:23:39 +08:00 |
|
|
Connor Turland
|
2f4b3b3761
|
call was ending in wrong situation
|
2016-02-17 13:49:48 +13:00 |
|
|
Connor Turland
|
d82288c9f2
|
fixed up call ending/starting events
|
2016-02-17 13:27:22 +13:00 |
|
|
Devin Howard
|
9ff6375e62
|
don't need to create synapse on canvas click
|
2016-02-14 15:19:36 +08:00 |
|
|
Devin Howard
|
dc1aa1e28e
|
document synapse cancellation in cheatsheet
|
2016-02-14 15:19:36 +08:00 |
|
|
Devin Howard
|
9469b08ffa
|
cancel synapse creation with esc, backspace, or delete
|
2016-02-14 15:19:35 +08:00 |
|
|
Devin Howard
|
056ef2b5b6
|
smoother synapse creation with clicks/tabs
|
2016-02-14 15:19:35 +08:00 |
|
|
Devin Howard
|
48863ce246
|
create synapse if you click away from the synapse title form
|
2016-02-14 15:19:35 +08:00 |
|
|
Devin Howard
|
f9bcd33344
|
update synapses specs; all specs pass again. all models/controllers tested
|
2016-02-09 14:25:39 +08:00 |
|
|
Devin Howard
|
7f50db1ae9
|
ok metacode spec done
|
2016-02-09 13:30:49 +08:00 |
|
|
Devin Howard
|
6d0dcec1ba
|
mess with metacode tests
|
2016-02-09 12:43:34 +08:00 |
|
|
Devin Howard
|
43bdda61de
|
maps controller spec passes, 3 pending
|
2016-02-09 11:48:07 +08:00 |
|
|
Devin Howard
|
005250f330
|
typo
|
2016-02-09 11:26:42 +08:00 |
|
|
Devin Howard
|
0b98e446ca
|
fiddle with maps_controller code style
|
2016-02-09 11:20:04 +08:00 |
|
|
Connor Turland
|
e29b683b38
|
new junto images
|
2016-02-09 09:14:33 +13:00 |
|
|
Devin Howard
|
e460899ea3
|
testing simplecov and rcov stuff
|
2016-02-08 11:19:39 +08:00 |
|
|
Devin Howard
|
cc99ed001d
|
fix mapping_controller_spec.rb
|
2016-02-08 11:19:38 +08:00 |
|
|
Devin Howard
|
fa3a725df9
|
mapping spec
|
2016-02-08 11:19:37 +08:00 |
|
|
Devin Howard
|
987cd7f5a0
|
Merge branch 'feature/xls.export' into release/v2.8
|
2016-02-08 09:58:09 +08:00 |
|
|
Devin Howard
|
f42b30e8b5
|
Merge branch 'feature/auto.synapse' into release/v2.8
|
2016-02-08 09:57:58 +08:00 |
|
|
Devin Howard
|
0ae8ea0ca5
|
implement csv/xls export
|
2016-02-07 13:12:18 +08:00 |
|
|
Devin Howard
|
83551e317e
|
create synapse if you click away from the synapse title form
|
2016-02-06 13:03:47 +08:00 |
|
|
Devin Howard
|
786eeae72a
|
Merge branch 'develop' into feature/realtime.video
|
2016-02-06 12:56:23 +08:00 |
|
|
Devin Howard
|
798035107f
|
Merge branch 'master' into develop
|
2016-02-06 10:11:55 +08:00 |
|
|
Devin Howard
|
67da49c1be
|
max height on search results so they scroll
|
2016-02-05 22:13:23 +08:00 |
|
|
Devin Howard
|
57a8b654ba
|
smoother 'added by me' filtering
|
2016-02-05 21:25:20 +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
|
6b9aa52224
|
well, the loading icon mostly works now too
|
2016-02-05 20:09:00 +08:00 |
|
|
Devin Howard
|
5f90843da2
|
gross, but it works. checkboxes in search results work
|
2016-02-05 20:02:57 +08:00 |
|
|
Devin Howard
|
c427e7fd7e
|
mess with typeahead(val) calls. looks like the header is being destroyed during suggestion rendering, need a variable
|
2016-02-05 19:54:38 +08:00 |
|
|
Devin Howard
|
353872001f
|
vertical align no results
|
2016-02-05 19:21:09 +08:00 |
|
|
Devin Howard
|
aabdaaf21b
|
nicer icon positioning
|
2016-02-05 19:19:16 +08:00 |
|
|
Devin Howard
|
f1f56f9286
|
centre topic icons if there are results
|
2016-02-05 19:11:19 +08:00 |
|
|
Devin Howard
|
461b62628d
|
fix minimizing search results
|
2016-02-05 19:06:57 +08:00 |
|
|
Devin Howard
|
3405bf5942
|
fix the problem where it always closes on you
|
2016-02-05 18:56:16 +08:00 |
|
|
Devin Howard
|
a05fe70eda
|
topic headers on resultnoresults
|
2016-02-05 18:35:45 +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
|
8e07c10ecc
|
make sure the chat pane is closed for opening the next map
|
2016-01-26 15:29:32 +13:00 |
|
|
Connor Turland
|
1fa84e0d29
|
chat only displays on maps
|
2016-01-26 14:46:26 +13:00 |
|
|
Connor Turland
|
74d372b942
|
fix the scrolling in the chat messages box
|
2016-01-22 16:49:50 +13: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 |
|
|
Connor Turland
|
11fc7a01f3
|
fixes the issue where video feeds go black after first call
|
2016-01-09 16:11:28 +13:00 |
|
|
Devin Howard
|
4842856358
|
merge develop into rspec-tests
|
2016-01-07 16:04:23 +08:00 |
|
|
Devin Howard
|
4469b29ec2
|
in user model
|
2016-01-07 15:32:19 +08:00 |
|
|
Devin Howard
|
bf21dcc3e6
|
merge develop into rspec tests
|
2016-01-06 23:03:34 +08:00 |
|
|
Devin Howard
|
3cdab531a6
|
move more config into .example-env
|
2016-01-06 22:57:01 +08:00 |
|
|
Devin Howard
|
844a52fc52
|
Merge pull request #450 from metamaps/feature/fix-searchbox
fix searchbox
|
2015-12-24 15:44:12 +08:00 |
|
|
Devin Howard
|
40561c629a
|
fix handleResultClick on search box
|
2015-12-24 15:42:51 +08:00 |
|
|
Devin Howard
|
a45d0f7791
|
fix search box on authenticated homepage
|
2015-12-24 15:19:03 +08:00 |
|
|
Connor Turland
|
6db91ea703
|
broken funnnnnction
|
2015-12-23 11:34:52 +08:00 |
|
|
Connor Turland
|
26bc04262a
|
broken funnnnnction
|
2015-12-22 22:28:03 -05:00 |
|
|
Connor Turland
|
5ad1504494
|
handle socketio reconnect situation
|
2015-12-22 18:05:13 -05:00 |
|
|
Connor Turland
|
64283850e3
|
add junto spinner for call in progress
|
2015-12-22 17:46:19 -05:00 |
|
|
Connor Turland
|
dfc94b4079
|
fix up styling on chat text input
|
2015-12-22 16:34:30 -05:00 |
|
|
Connor Turland
|
49dd2f2e92
|
merge develop
|
2015-12-22 13:16:03 -05:00 |
|
|
Connor Turland
|
8d85f8d308
|
videos positioning decently. chats loading more smoothly
|
2015-12-22 12:43:50 -05:00 |
|
|
Devin Howard
|
8394e0ce86
|
re-add regular uservoice code
|
2015-12-22 07:13:26 +08:00 |
|
|
Devin Howard
|
c58b2c805e
|
syntax error
|
2015-12-21 21:38:02 +08:00 |
|
|
Devin Howard
|
d96e991de3
|
don't use // for heroku either
|
2015-12-21 21:29:15 +08:00 |
|
|
Devin Howard
|
6e10b4c508
|
make use of realtime.metamaps.cc server
|
2015-12-21 21:28:18 +08:00 |
|
|
Devin Howard
|
603b9dc52e
|
remove uservoice code
|
2015-12-21 10:16:51 +08:00 |
|
|
Devin Howard
|
9a7ef25afc
|
Merge branch 'develop' into feature/https-preparation
|
2015-12-20 22:28:43 +08:00 |
|
|
Devin Howard
|
888edae6f6
|
finish remove asset_path_icon whoops
|
2015-12-20 22:28:05 +08:00 |
|
|
Devin Howard
|
c79a5f0072
|
Merge branch 'develop' into feature/https-preparation
|
2015-12-20 22:24:47 +08:00 |
|
|
Devin Howard
|
96ec672779
|
Merge branch 'develop' into feature/rspec-tests
|
2015-12-20 22:24:39 +08:00 |
|
|
Devin Howard
|
df485002b1
|
remove redundant asset_path_icon function
|
2015-12-20 22:22:01 +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 |
|
|
Devin Howard
|
c4be57e525
|
topic and synapse validate permission
|
2015-12-18 09:25:54 +08:00 |
|
|
Devin Howard
|
006acac6b5
|
remove redundant authorize_to_view function
|
2015-12-17 23:20:19 +08:00 |
|
|
Devin Howard
|
d5f66487b7
|
update map spec - add authorize_to_delete. TODO: add other map authorize specs
|
2015-12-17 09:44:48 +08:00 |
|
|
Devin Howard
|
9e4a7b821f
|
cleanup topic model a bit
|
2015-12-17 09:34:49 +08:00 |
|
|
Devin Howard
|
696bac17e6
|
map spec
|
2015-12-17 09:16:02 +08:00 |
|
|
Devin Howard
|
2525a6fb65
|
add permission service, refactor map model a bit, add validations
|
2015-12-17 09:10:52 +08:00 |
|
|
Devin Howard
|
bfd4e4f228
|
add permission service, add validations to map.rb
|
2015-12-17 09:03:51 +08:00 |
|
|
Devin Howard
|
4dbff85443
|
default value if no request.env in application controller passes the rspec test woot. Only 80 more tests to implement
|
2015-12-16 22:36:12 +08:00 |
|
|
Devin Howard
|
ae1117338a
|
set up devise authentication more srsly. Still doesn't pass the test though haha
|
2015-12-16 22:16:02 +08:00 |
|
|
Devin Howard
|
be3924aa54
|
setup bare minimum devise authentication in tests
|
2015-12-16 21:32:50 +08:00 |
|
|
Devin Howard
|
6148f55e1c
|
handle nil unsafe_uri in app conttroller function
|
2015-12-16 21:05:18 +08:00 |
|
|
Devin Howard
|
b2aa2074a7
|
update generation calcuation code, incl. fix user signup bug
|
2015-12-15 12:33:22 +08:00 |
|
|
Connor Turland
|
a905094d4d
|
inviting, joining, and leaving conversations
|
2015-12-14 02:28:13 -05:00 |
|
|
Connor Turland
|
8b090be0b3
|
convert to something more 'call' style
|
2015-12-12 19:00:51 -05:00 |
|
|
Connor Turland
|
be2997d7e4
|
fix bad tooltip placement
|
2015-12-12 11:31:54 -05:00 |
|
|
Connor Turland
|
eec7dcb9c3
|
make the messages box fill up all available space
|
2015-12-11 19:18:53 -05:00 |
|
|
Connor Turland
|
56e3fc753a
|
use asset_path for link to sound files
|
2015-12-11 19:15:18 -05:00 |
|
|
Connor Turland
|
20aa78208e
|
rename junto to erb file
|
2015-12-11 18:49:22 -05:00 |
|
|
Connor Turland
|
6c7ba76937
|
update to https for sockets
|
2015-12-11 18:45:51 -05:00 |
|
|
Connor Turland
|
5f1ef5f5c8
|
remove extra code
|
2015-12-11 18:10:38 -05:00 |
|
|
Connor Turland
|
3c9d722945
|
accept or reject video offers
|
2015-12-11 17:29:17 -05:00 |
|
|
Connor Turland
|
089528c46d
|
great progress
|
2015-12-11 14:23:41 -05:00 |
|
|
Devin Howard
|
b037c84f15
|
fix small error in user model
need to use the parent's generation to calculate generation!
|
2015-12-07 11:44:08 +08:00 |
|
|
Connor Turland
|
2929547736
|
position the chat box, and remove the old junto panel
|
2015-12-03 17:15:15 -05:00 |
|
|
Connor Turland
|
75554d58bf
|
temp
|
2015-12-03 17:15:15 -05:00 |
|
|
Devin Howard
|
519342a468
|
fix filter bug
|
2015-12-03 16:58:21 -05:00 |
|
|
Devin Howard
|
31fceab45d
|
search box css fixes
|
2015-12-03 16:58:21 -05:00 |
|
|
Devin Howard
|
47a7e161ee
|
fix error with mapper search rendering
|
2015-12-03 16:58:21 -05:00 |
|
|
Devin Howard
|
7336c262e3
|
fix up user model json output function
|
2015-12-03 16:58:21 -05:00 |
|
|
Devin Howard
|
48ea29b13e
|
refactor search css into scss for clearer organization, plus do some fixes to the typeahead css
|
2015-12-03 16:58:20 -05:00 |
|
|
Devin Howard
|
38662fcda8
|
split search css out into its own file
|
2015-12-03 16:58:20 -05:00 |
|
|
Devin Howard
|
7db75b8d6d
|
more fixes
|
2015-12-03 16:57:30 -05:00 |
|
|
Devin Howard
|
43624caf88
|
get autocomplete working again with new typeahead.js, but not the CSS
|
2015-12-03 16:57:30 -05:00 |
|
|
Devin Howard
|
4139c2c84a
|
syntax error
|
2015-12-03 16:57:30 -05:00 |
|