Devin Howard
|
846d04dd0d
|
rubocop style updates
|
2015-12-16 22:19:58 +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
|
235d4f6c24
|
remove unneeded NEW tests, fix test.rb environment
|
2015-12-15 22:33:48 +08:00 |
|
Devin Howard
|
229b7d2cc5
|
Merge branch 'develop' into feature/rspec-tests
|
2015-12-15 22:12:30 +08:00 |
|
Devin Howard
|
b2aa2074a7
|
update generation calcuation code, incl. fix user signup bug
|
2015-12-15 12:33:22 +08:00 |
|
Devin Howard
|
1597665be5
|
merge develop with rails4 stuff
|
2015-12-07 13:58:42 +08: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
|
3b89a2a13f
|
Merge pull request #440 from metamaps/feature/fix.fork.filter.bug
fix filter bug
|
2015-11-30 11:10:57 -05:00 |
|
Devin Howard
|
8425e72101
|
fix filter bug
|
2015-11-30 10:01:33 +08:00 |
|
Devin Howard
|
8505d26182
|
search box css fixes
|
2015-11-28 23:03:48 +08:00 |
|
Devin Howard
|
6b6ad1b660
|
fix error with mapper search rendering
|
2015-11-28 22:07:57 +08:00 |
|
Devin Howard
|
3aaf501b03
|
fix up user model json output function
|
2015-11-28 21:51:28 +08:00 |
|
Devin Howard
|
9afc8bc7c4
|
refactor search css into scss for clearer organization, plus do some fixes to the typeahead css
|
2015-11-28 21:40:09 +08:00 |
|
Devin Howard
|
98e11c0a7d
|
split search css out into its own file
|
2015-11-28 20:17:14 +08:00 |
|
Devin Howard
|
45e09a27bd
|
gc tuning
|
2015-11-25 11:59:56 +08:00 |
|
Devin Howard
|
d3d0c97e7e
|
add .ruby-gemset file - you may need to reinstall gems if using rvm
|
2015-11-23 18:22:34 +08:00 |
|
Devin Howard
|
94412b21d2
|
merge documentation changes
|
2015-11-23 09:54:36 +08:00 |
|
Devin Howard
|
f58412b715
|
Update windows installer docs
|
2015-11-20 14:34:05 +08:00 |
|
Devin Howard
|
1f82238362
|
more fixes
|
2015-11-08 23:14:53 +08:00 |
|
Devin Howard
|
7136f46ec3
|
get autocomplete working again with new typeahead.js, but not the CSS
|
2015-11-08 22:53:34 +08:00 |
|
Devin Howard
|
fe0d38ec67
|
syntax error
|
2015-11-07 01:34:08 +08:00 |
|
Connor Turland
|
53de063bfc
|
fix cannot set readonly property highlight
|
2015-11-07 01:33:18 +08:00 |
|
Connor Turland
|
03ab04050d
|
switching metacode sets was being caught by Metamaps.Router.intercept
|
2015-11-07 01:33:18 +08:00 |
|
Connor Turland
|
3216106660
|
styling of the vertical tab selectors needed improvement
|
2015-11-07 01:33:18 +08:00 |
|
Connor Turland
|
e29ab4bca3
|
had to update because jquery ui version changed
|
2015-11-07 01:33:18 +08:00 |
|
Connor Turland
|
1bbaa47b80
|
getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
|
2015-11-07 01:33:18 +08:00 |
|
Devin Howard
|
fa017a8559
|
sandi metz function simplification
|
2015-11-06 17:08:42 +08:00 |
|
Devin Howard
|
7ec7f9f892
|
fix #465, metacode sort problem
|
2015-11-04 17:22:46 +08:00 |
|
Connor Turland
|
86c467b2f1
|
current_user can be nil
|
2015-11-04 00:14:14 -05:00 |
|
Devin Howard
|
3eff850336
|
reorganize documentation
|
2015-11-04 11:41:04 +08:00 |
|
Devin Howard
|
6f8c18cd46
|
reorganize metamaps-qa-steps a bit
|
2015-11-04 11:40:52 +08:00 |
|
Devin Howard
|
660ee52292
|
make invite link use REQUEST_URI
|
2015-11-03 22:22:53 +08:00 |
|
Devin Howard
|
8b456f5a31
|
css fixes for heroku
|
2015-11-03 21:10:05 +08:00 |
|
Devin Howard
|
62ae38e70d
|
fix devise integration for rails 4
|
2015-11-03 20:56:50 +08:00 |
|
Devin Howard
|
d9133b1e29
|
update WindowsInstallation.md
|
2015-11-03 19:10:21 +08:00 |
|
Devin Howard
|
9613145e99
|
devise locale text
|
2015-11-02 00:07:52 +08:00 |
|
Devin Howard
|
5b4bd9724b
|
Gemfile.lock
|
2015-11-02 00:06:12 +08:00 |
|
Devin Howard
|
c86422dc68
|
update devise.rb with new changes
|
2015-11-02 00:05:57 +08:00 |
|
Devin Howard
|
6487202e6f
|
remove secrets.yml stuff because it doesn't work with heroku
|
2015-10-30 14:30:24 +08:00 |
|
Devin Howard
|
8e19083035
|
ok put ruby back in Gemfile'
|
2015-10-30 14:21:47 +08:00 |
|
Devin Howard
|
e2a8e0331d
|
fix references to Rails.application.secrets
|
2015-10-30 14:18:50 +08:00 |
|
Devin Howard
|
8e1ae0a1fc
|
use secrets.yml to allow overriding config variables
|
2015-10-29 16:23:41 +08:00 |
|
Devin Howard
|
cda76a4bae
|
remove ruby from Gemfile in favour of .ruby-version
|
2015-10-29 16:18:06 +08:00 |
|
Devin Howard
|
ddce6ad95c
|
migrate metacodes that started with /assets/icons to use amazonaws urls. Remove last migration I made
|
2015-10-28 14:24:52 +08:00 |
|
Connor Turland
|
6e79b58e16
|
updated files to use amazon assets
|
2015-10-27 21:46:07 -07:00 |
|
Devin Howard
|
6f518be51d
|
rspec tests rails4 Gemfile.lock
|
2015-10-27 18:23:25 +08:00 |
|
Devin Howard
|
6c4620afa6
|
more qa
|
2015-10-27 18:21:46 +08:00 |
|
Devin Howard
|
5c813beafe
|
merge
|
2015-10-27 18:20:12 +08:00 |
|