Devin Howard
|
3fe93be987
|
Merge branch 'master' into develop
|
2016-02-05 20:21:31 +08:00 |
|
Devin Howard
|
ef307f1d46
|
Merge pull request #459 from metamaps/fix/searchbox
searchbox fixes for master
|
2016-02-05 20:20:13 +08:00 |
|
Devin Howard
|
cd10ee97ee
|
typo
|
2016-02-05 20:17:40 +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
|
27e5830c4f
|
move configure.sh into bin folder
|
2016-02-05 18:12:25 +08:00 |
|
Devin Howard
|
ed88445c6b
|
update configure.sh
|
2016-02-05 18:12:00 +08:00 |
|
Devin Howard
|
821966c5db
|
update schema.rb
|
2016-02-05 18:11:35 +08:00 |
|
Devin Howard
|
9a68a2d3c1
|
jenkins ruby versioning smarter
|
2016-02-05 18:02:30 +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
|
a1d2ef70b9
|
Merge pull request #451 from metamaps/feature/contributing.md.updates
Update CONTRIBUTING.md
|
2016-02-05 11:35:42 +08:00 |
|
Devin Howard
|
85290d0e70
|
Update CONTRIBUTING.md
|
2016-02-05 11:33:33 +08:00 |
|
Devin Howard
|
b43804bf80
|
Merge pull request #421 from metamaps/develop
Upgrade to Rails 4
|
2016-02-05 11:31:24 +08:00 |
|
Devin Howard
|
e73ade0442
|
tag v2.7
|
2016-02-05 11:29:05 +08:00 |
|
Devin Howard
|
9a548e261b
|
Merge branch 'master' into develop
|
2016-02-04 18:10:07 +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 |
|
Devin Howard
|
5ec77b44cd
|
add develop branch build status badge
|
2016-01-26 18:57:32 +08:00 |
|
Devin Howard
|
38f46bd8c4
|
add jenkins-test.sh script
|
2016-01-26 17:04:32 +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
|
b80fabcbcf
|
was just old copied code not a file in use
|
2016-01-26 14:14:33 +13:00 |
|
Devin Howard
|
c9ebfee968
|
default branch to develop in README.md
|
2016-01-25 17:19:53 +08:00 |
|
Devin Howard
|
8a74118cb1
|
Merge branch 'develop' into feature/realtime.video
|
2016-01-25 11:23:32 +08:00 |
|
Devin Howard
|
79431f8515
|
fix user seeds
|
2016-01-25 11:23:10 +08:00 |
|
Connor Turland
|
74d372b942
|
fix the scrolling in the chat messages box
|
2016-01-22 16:49:50 +13:00 |
|
Connor Turland
|
5d838303a8
|
broken gemfile.lock and pass recent migrations
|
2016-01-22 16:14:35 +13:00 |
|
Connor Turland
|
4557b8e305
|
merge develop
|
2016-01-22 14:59:09 +13:00 |
|
Devin Howard
|
cbd82b92fe
|
Merge branch 'develop' of https://github.com/metamaps/metamaps_gen002 into develop
|
2016-01-20 10:19:03 +08:00 |
|
Devin Howard
|
8a8ac92a8f
|
data safety
|
2016-01-20 10:18:44 +08:00 |
|
Devin Howard
|
0e7690f2af
|
fix metacode asset path update db migration
|
2016-01-20 10:18:22 +08:00 |
|
Devin Howard
|
31f5d464f1
|
S3_BUCKET_NAME in .example-env
|
2016-01-19 22:14:35 +08:00 |
|
Devin Howard
|
3aea952e40
|
Merge branch 'develop' of https://github.com/metamaps/metamaps_gen002 into develop
|
2016-01-19 14:27:33 +08:00 |
|
Devin Howard
|
14a292331b
|
two tweaks to help production deploy
|
2016-01-19 14:27:25 +08:00 |
|
Devin Howard
|
1e010c69c2
|
doc formatting
|
2016-01-17 10:17:02 +08:00 |
|
Devin Howard
|
c2a2fe4997
|
better readme for realtime server
|
2016-01-17 10:14:19 +08:00 |
|
Connor Turland
|
11fc7a01f3
|
fixes the issue where video feeds go black after first call
|
2016-01-09 16:11:28 +13:00 |
|
Connor Turland
|
fe76f340a0
|
change to the db name causes local dev issues
this should just remain similar to what it used to be
|
2016-01-09 12:10:33 +13:00 |
|
Devin Howard
|
678ec1bbab
|
Update windows installer docs
|
2016-01-08 08:21:28 +08:00 |
|