Commit graph

1180 commits

Author SHA1 Message Date
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
92ddbbaf4f remove metacode asset path migration 2015-12-11 18:10:53 -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
Connor Turland
2929547736 position the chat box, and remove the old junto panel 2015-12-03 17:15:15 -05:00
Connor Turland
b958c6ff89 removed precompiled assets 2015-12-03 17:15:15 -05:00
Connor Turland
75554d58bf temp 2015-12-03 17:15:15 -05:00
Devin Howard
fa67ec0444 update Gemfile for rails 4 2015-12-03 17:14:04 -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
d3814708a9 gc tuning 2015-12-03 16:58:20 -05:00
Devin Howard
9575a62e67 add .ruby-gemset file - you may need to reinstall gems if using rvm 2015-12-03 16:58:20 -05:00
Devin Howard
cde6eaa564 Update windows installer docs 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
Connor Turland
53d7ccab56 fix cannot set readonly property highlight 2015-12-03 16:57:30 -05:00
Connor Turland
5b0e7ffcde switching metacode sets was being caught by Metamaps.Router.intercept 2015-12-03 16:57:30 -05:00
Connor Turland
5f14601c74 styling of the vertical tab selectors needed improvement 2015-12-03 16:57:30 -05:00
Connor Turland
1b60927641 had to update because jquery ui version changed 2015-12-03 16:57:30 -05:00
Connor Turland
dcbe24bb7e getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
2015-12-03 16:57:30 -05:00
Devin Howard
67d4a2aa34 sandi metz function simplification 2015-12-03 16:57:30 -05:00
Devin Howard
520fe095bd fix #465, metacode sort problem 2015-12-03 16:57:29 -05:00
Connor Turland
87389a88ed current_user can be nil 2015-12-03 16:57:29 -05:00
Devin Howard
f8814c060f reorganize documentation 2015-12-03 16:57:29 -05:00
Devin Howard
1874c67a66 reorganize metamaps-qa-steps a bit 2015-12-03 16:57:29 -05:00
Devin Howard
75700f06a9 make invite link use REQUEST_URI 2015-12-03 16:57:29 -05:00
Devin Howard
3e03e64845 css fixes for heroku 2015-12-03 16:57:29 -05:00
Devin Howard
f4456d06ef fix devise integration for rails 4 2015-12-03 16:57:29 -05:00
Devin Howard
dfaadc691e update WindowsInstallation.md 2015-12-03 16:57:29 -05:00
Devin Howard
20e698f69d devise locale text 2015-12-03 16:57:29 -05:00
Devin Howard
506f93e144 Gemfile.lock 2015-12-03 16:57:29 -05:00
Devin Howard
6df2f22080 update devise.rb with new changes 2015-12-03 16:57:29 -05:00
Devin Howard
3674aefb04 remove secrets.yml stuff because it doesn't work with heroku 2015-12-03 16:57:29 -05:00
Devin Howard
10b58399a7 ok put ruby back in Gemfile' 2015-12-03 16:57:28 -05:00
Devin Howard
ede4e7a509 fix references to Rails.application.secrets 2015-12-03 16:57:28 -05:00
Devin Howard
570fa931b7 use secrets.yml to allow overriding config variables 2015-12-03 16:57:28 -05:00
Devin Howard
dd02129b0d remove ruby from Gemfile in favour of .ruby-version 2015-12-03 16:57:28 -05:00
Devin Howard
d99ed6b627 migrate metacodes that started with /assets/icons to use amazonaws urls. Remove last migration I made 2015-12-03 16:57:28 -05:00
Connor Turland
d8da2d93fd updated files to use amazon assets 2015-12-03 16:57:28 -05:00