Skip to content
This repository has been archived by the owner on Mar 15, 2018. It is now read-only.

Running Diff of Prod #126

Open
wants to merge 645 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
645 commits
Select commit Hold shift + click to select a range
d1ab6f0
changing assignment_steps
jasonewang Apr 18, 2015
f5237ec
all tests for submissions pass
jasonewang Apr 18, 2015
ed2d1ea
formatting
jasonewang Apr 18, 2015
16a8b75
Fix steps to select by text
scampos1030 Apr 18, 2015
95dd6e5
formatting
jasonewang Apr 18, 2015
319aa13
Clean up assignment steps
scampos1030 Apr 18, 2015
17b2eb4
Error fix
scampos1030 Apr 18, 2015
74eac49
Error fix
scampos1030 Apr 18, 2015
abcd219
A simple queryparms method to find projects in the projects controller
cycomachead Apr 18, 2015
92588b3
NOW API calls for projects actually work...wooo.
cycomachead Apr 18, 2015
a3e4800
sorta renders a 404 JSON, but the status is wrong...
cycomachead Apr 18, 2015
78bd086
:boom: 404 pages in the app layout work
cycomachead Apr 18, 2015
68d0970
:sparkles: Fix Find Method for API users controller to pass rspec
cycomachead Apr 18, 2015
5427777
A Bunch of whitespace cleanup (rspec)
cycomachead Apr 18, 2015
c6f4dff
ok, I cant fix this test....
cycomachead Apr 18, 2015
1d936ec
try to update travis build
cycomachead Apr 18, 2015
3f954d3
HOLY :shit: :fu: :boy: :gun: :boom: TRAVIS WASNT WORKING BECAUSE OF A…
cycomachead Apr 18, 2015
f178193
Merge branch 'master' of github.com:snap-cloud/snap-cloud
cycomachead Apr 18, 2015
2625452
[skip ci] removing clutter
cycomachead Apr 18, 2015
3ea100f
:sparkles: fix the projects test.
cycomachead Apr 18, 2015
6bc0ae3
rename file for consistency [ci skip]
cycomachead Apr 18, 2015
de3538b
cleanup...
cycomachead Apr 18, 2015
ddd55eb
Add some better exception handling methods
cycomachead Apr 18, 2015
01bd682
error handling and serious refactoring!
cycomachead Apr 18, 2015
bad4665
:sparkles: fix project edit feature for 404s
cycomachead Apr 18, 2015
e8d3f20
Damn. HipChat room IDs be weird.
cycomachead Apr 18, 2015
9b3301c
Some initial cleanup of projects API controller
cycomachead Apr 18, 2015
46f1fd0
pure content div
cycomachead Apr 18, 2015
18de34b
view stuff
cycomachead Apr 18, 2015
ed4e054
WARNING: I am messing with the schema (Assignments table might be nam…
cycomachead Apr 21, 2015
ea821b1
WARNING: hand-edited migrations...tryyyyyy to normalize all table names
cycomachead Apr 22, 2015
97f9bd3
SKETCHY :shit: -- manually removing index from schema
cycomachead Apr 22, 2015
3688d00
donwt require debuggers....
cycomachead Apr 22, 2015
b8f44cf
kill require statements
cycomachead Apr 22, 2015
8d93831
god damn comma
cycomachead Apr 22, 2015
8dd3116
god damn comma
cycomachead Apr 22, 2015
ede3fb4
delete some more aws stuff from dev....
cycomachead Apr 22, 2015
93edd2a
lol im spreading my seed
arjunbaokar Apr 22, 2015
f1c98c1
i needed to fix my user so i can log into him
arjunbaokar Apr 22, 2015
eafb7f6
lol more spreading my seed
arjunbaokar Apr 22, 2015
deb0ba0
Fix so projects doesnt 404 when it shouldnt
cycomachead Apr 22, 2015
21e0605
cleanup debugger code...oops
cycomachead Apr 22, 2015
9699cbd
added cucumber steps for user stories 4-1
arjunbaokar Apr 22, 2015
ea43592
Merge branch 'master' of github.com:snap-cloud/snap-cloud
arjunbaokar Apr 22, 2015
1042cd0
tests pass
cycomachead Apr 22, 2015
74cfbf3
resolve test warning [ci skip]
cycomachead Apr 22, 2015
705946d
consistency in code style..ish [ci skip]
cycomachead Apr 22, 2015
fbb0266
update rspec rails in gemfile
cycomachead Apr 22, 2015
79fae96
Merge branch 'master' of github.com:snap-cloud/snap-cloud
cycomachead Apr 22, 2015
f22af85
mv file for rspec 3 migration
cycomachead Apr 22, 2015
6db5e85
update to rspec 3 pt 2 - new rails_helper
cycomachead Apr 22, 2015
4e0910f
new require statements for specs
cycomachead Apr 22, 2015
7c629ce
rspec 3 upgrade progress, user api controller passing
cycomachead Apr 22, 2015
506c83b
wring the code dry
cycomachead Apr 22, 2015
9aa6d1e
synatx formatting and minor cleanup
cycomachead Apr 22, 2015
463e725
Tests Pass by not verifying doubles -- problems for Rspec 4
cycomachead Apr 22, 2015
5ad164b
fix gemfile typo
cycomachead Apr 22, 2015
1e55726
Fix a deprecation warning, only 1 left...but bed time.
cycomachead Apr 22, 2015
d2d1898
Merge pull request #43 from snap-cloud/rspec-update
cycomachead Apr 22, 2015
dd0d04a
added search feature file
alecguertin Apr 22, 2015
c7b84e8
Add assignment validation feature test
scampos1030 Apr 22, 2015
78a92f7
add a search feature
cycomachead Apr 22, 2015
6c23978
Merge branch 'master' of github.com:snap-cloud/snap-cloud
cycomachead Apr 22, 2015
c43238b
cleanup files
cycomachead Apr 22, 2015
cccf70e
Rewrite feature for assignment validation, forgot to make it late
scampos1030 Apr 22, 2015
8f52c95
rename file
cycomachead Apr 22, 2015
5aed323
Merge branch 'master' of github.com:snap-cloud/snap-cloud
cycomachead Apr 22, 2015
cd84256
Fix typo...
cycomachead Apr 23, 2015
02082cf
codeclimate please pass me
jasonewang Apr 24, 2015
5c312ae
resolving merge conflicts yay
jasonewang Apr 24, 2015
09f0ee2
more refactoring filters
jasonewang Apr 24, 2015
06d2af9
codeclimate please don't say courses_controller#update is too complex
jasonewang Apr 24, 2015
a19bb0c
trying to merge cuke test results into coveralls
jasonewang Apr 24, 2015
b0fac29
fix coveralls badge
cycomachead Apr 25, 2015
9981c4b
Minor style fixes for about and help pages
cycomachead Apr 26, 2015
54fcbb2
fixing a step feature
arjunbaokar Apr 26, 2015
726020e
added another test, passing it
arjunbaokar Apr 26, 2015
ed52d6e
fixed test so it expects 404 for unauthorized access -- I hope this b…
arjunbaokar Apr 26, 2015
9398a8d
edited 401 page slightly
arjunbaokar Apr 26, 2015
521f7cd
added words to buttons project view page
arjunbaokar Apr 26, 2015
1679931
fixing some errors in project view
arjunbaokar Apr 26, 2015
e9b7280
made buttons not look like absolute shit but still pretty shitty
arjunbaokar Apr 26, 2015
6f38460
got rid of the weird gray block around project details
arjunbaokar Apr 26, 2015
53fe4eb
fixed the centering issues with priv/pub project, but now background …
arjunbaokar Apr 26, 2015
7ee0bf9
these links dont wanna be styled
arjunbaokar Apr 26, 2015
9bc4309
Some CSS tweaks, but things arent centered anymore...
cycomachead Apr 26, 2015
59d707b
added some more tests to project_view
arjunbaokar Apr 27, 2015
8af83c4
Fix the login so it looks ok
cycomachead Apr 27, 2015
0561fbf
Some styling tweaks...things are a bit better
cycomachead Apr 27, 2015
593e3a8
move login to haml...
cycomachead Apr 27, 2015
e1d49da
login page is kinda but not really tolerable
cycomachead Apr 27, 2015
a92b40b
Merge branch 'master' into page-layouts
cycomachead Apr 27, 2015
fa465f7
Fix capitalization issue...
cycomachead Apr 27, 2015
c635a35
Merge pull request #46 from snap-cloud/page-layouts
cycomachead Apr 27, 2015
c6bce57
add a hound style config file.
cycomachead Apr 27, 2015
6c72f5b
Rubocop for style linting
cycomachead Apr 27, 2015
7154fd9
make a handful of style tweaks
cycomachead Apr 27, 2015
00f8b44
Reorg the gemfile and add dev tools
cycomachead Apr 27, 2015
ceae683
Metric rake
cycomachead Apr 27, 2015
8a9cf03
code comments and readme tweaks
cycomachead Apr 27, 2015
0efcf45
deps update
cycomachead Apr 28, 2015
f136401
Merge pull request #47 from snap-cloud/dev-tweaks
cycomachead Apr 28, 2015
63bb9e8
add some pure classes to the course pages
cycomachead Apr 30, 2015
e93c4c4
OMG what is going on..the app css is better but this is a bad fix
cycomachead Apr 30, 2015
ab4bb42
Fix the tabbing in course files and use https for pure
cycomachead Apr 30, 2015
c9792aa
fix the tab errors... :/
cycomachead Apr 30, 2015
cea00ce
Assingment pages render properly w/ app changes now
cycomachead Apr 30, 2015
57298f7
Submissions pure template fix as well
cycomachead Apr 30, 2015
df40e43
Fix the loading of assets so dev mode compiles them like production
cycomachead Apr 30, 2015
c19726b
wth is going on....
cycomachead May 1, 2015
47e8cfc
fixed buttons on user profile page. will someone tell me how to fix t…
arjunbaokar May 1, 2015
3a977fc
but it's hard to tell if it's getting better looking cuz CSS/assets m…
arjunbaokar May 1, 2015
bcfe317
STOP FUCKING CHANGING FIELDNAMES ON PAGES. I fixed the cuke login iss…
arjunbaokar May 1, 2015
34f9b8d
i can't believe i can figure out what i did with my commit messages. …
arjunbaokar May 1, 2015
c7600fd
Merge pull request #56 from snap-cloud/bringingSexyBack
alecguertin May 1, 2015
bd34ff7
got basic search working
alecguertin Apr 30, 2015
0e2277a
search works with usernames and project titles and notes and is sorta…
alecguertin Apr 30, 2015
dec52c7
removed emacs backups
alecguertin Apr 30, 2015
b0aa38c
some cuke working
alecguertin Apr 30, 2015
74862e8
layout search bar works
alecguertin May 1, 2015
cd037f3
search is prettier and cleaned up code
alecguertin May 1, 2015
e05eb38
added file to project
alecguertin May 1, 2015
10b402c
cherrypicking done
alecguertin May 1, 2015
9e49ed6
fix failing cuke for search
alecguertin May 1, 2015
d74bf2b
Merge pull request #57 from snap-cloud/fuckingassets
alecguertin May 1, 2015
a57d53d
cuke passing for search
alecguertin May 1, 2015
8367bca
Merge branch 'fuckingassets'
alecguertin May 1, 2015
231ffde
added test for sort
alecguertin May 1, 2015
75d945c
fixed cuke test for home.feature
alecguertin May 1, 2015
91c3356
Currently downloads the snap file from S3 and reuploads it attached t…
jasonewang May 1, 2015
7487143
fixed typo
jasonewang May 1, 2015
99d2283
userpage is no longer butternut squash
arjunbaokar May 1, 2015
d701f52
adding xml validation for project files
jasonewang May 1, 2015
2fa8ec2
Merge pull request #58 from snap-cloud/submission-branch
jasonewang May 1, 2015
02c4dd7
Assignment validation and feature overhall
scampos1030 May 2, 2015
e426d85
Additional feature for empty field creation
scampos1030 May 2, 2015
3ced913
additional assignment steps
scampos1030 May 2, 2015
06e70b2
Display error messages in new assignment view
scampos1030 May 2, 2015
6ec79ec
Additional scenario, additional steps
scampos1030 May 2, 2015
5be8254
prettied up profile edit pages
alecguertin May 2, 2015
b8c2c25
fixed merge conflict in profile html
alecguertin May 2, 2015
713933f
delete fa2
alecguertin May 2, 2015
3d98d47
trying to shine up a turd
arjunbaokar May 2, 2015
1273694
Merge branch 'master' of github.com:snap-cloud/snap-cloud
arjunbaokar May 2, 2015
09348a4
fixed cuke test
alecguertin May 2, 2015
a58e145
Merge branch 'master' of https://github.com/snap-cloud/snap-cloud
alecguertin May 2, 2015
b506d3b
fixed dash cuke
alecguertin May 2, 2015
f6b557d
fixed text on splash page
alecguertin May 2, 2015
8bded85
changed username to be link in search results
alecguertin May 2, 2015
26771f2
Dont load dev gems in rake file if env if prod
cycomachead May 2, 2015
d5ee100
More steps, edit view shows errors now, text editor error
scampos1030 May 2, 2015
03dfa89
Merge branch 'master' of https://github.com/snap-cloud/snap-cloud
scampos1030 May 2, 2015
3452131
Merge pull request #61 from snap-cloud/rake-fix
cycomachead May 2, 2015
351b981
Merge branch 'master' of https://github.com/snap-cloud/snap-cloud
scampos1030 May 2, 2015
8468652
Fix text editor issue
scampos1030 May 2, 2015
b2cdb5f
fixed sorting for project search results
alecguertin May 2, 2015
1bbfe49
Merge branch 'master' of https://github.com/snap-cloud/snap-cloud
alecguertin May 2, 2015
f2c3621
made user column less ugly - search
alecguertin May 2, 2015
522e411
Try to fix sql injection possibility
scampos1030 May 2, 2015
70cd0a6
Merge branch 'master' of https://github.com/snap-cloud/snap-cloud
scampos1030 May 2, 2015
bc7393a
Try to get simplecov working again
scampos1030 May 2, 2015
eea1059
add coveralls stuff
cycomachead May 2, 2015
5947a6c
Merge branch 'master' of github.com:snap-cloud/snap-cloud
cycomachead May 2, 2015
59bc7b5
coveralls file
cycomachead May 2, 2015
2ff76c2
Try to have test coverage reported
cycomachead May 2, 2015
fa933a3
fucking around with project-view, so broken
arjunbaokar May 2, 2015
82ae3e4
Merge branch 'master' of github.com:snap-cloud/snap-cloud
arjunbaokar May 2, 2015
abc497a
Fix CSS so that things should work on dev
cycomachead May 2, 2015
efb0c9d
Add bower deps
cycomachead May 2, 2015
b703d22
add files to bower and require them in app css
cycomachead May 2, 2015
3ddfc39
Merge pull request #62 from snap-cloud/css
cycomachead May 2, 2015
9cbe832
fuck it all
arjunbaokar May 2, 2015
879392c
Revert "Fix CSS so that things should work on dev"
arjunbaokar May 2, 2015
f3857ce
Merge pull request #63 from snap-cloud/revert-62-css
arjunbaokar May 2, 2015
52d7a46
Merge branch 'master' of github.com:snap-cloud/snap-cloud
arjunbaokar May 2, 2015
7845194
forced to inline all my style cuz our assets is dumbfucks
arjunbaokar May 2, 2015
147fb79
Fix travis ignoring cucumber coverage
scampos1030 May 2, 2015
bb6470b
add deps to bower
cycomachead May 2, 2015
906e892
more shitty in-line changes cuz css
arjunbaokar May 2, 2015
d4e9a67
made a gold box for priv/pub
arjunbaokar May 2, 2015
3b3b9ab
Merge branch 'master' of github.com:snap-cloud/snap-cloud
arjunbaokar May 2, 2015
b65c579
Add pretty route for usernames
scampos1030 May 2, 2015
c53d0b7
Merge branch 'master' of github.com:snap-cloud/snap-cloud into css2
cycomachead May 2, 2015
eec39eb
Fix the CSS problems
cycomachead May 2, 2015
a6a64e2
Merge branch 'prettyurl'
scampos1030 May 2, 2015
50f3c40
Pretty username url feature
scampos1030 May 2, 2015
74524c1
sad path for pretty urls
scampos1030 May 2, 2015
6f5cdcc
sad path for pretty urls fix
scampos1030 May 2, 2015
c5e43ae
use icono framework in app.css
cycomachead May 2, 2015
bbbcfe0
Dont load icons on project page
cycomachead May 2, 2015
ea09a52
spacing...
cycomachead May 2, 2015
4058fef
Merge pull request #64 from snap-cloud/css2
cycomachead May 2, 2015
ea34183
Cleanup assignments haml
cycomachead May 2, 2015
8051fa8
Snake case all feature fies
cycomachead May 2, 2015
dfbd62f
Normalize spacing in course haml files
cycomachead May 2, 2015
a0a281c
Formatting tweaks to app file. Add a class for the search bar
cycomachead May 2, 2015
4315fde
Make the search bar rounded
cycomachead May 2, 2015
38e915c
Smaller search button
cycomachead May 2, 2015
461b6b5
Fix $-ujs rails stuff
cycomachead May 2, 2015
c582a1c
Cleanup $-rails gem
cycomachead May 2, 2015
3e461bf
Add gems
cycomachead May 2, 2015
cb1b800
Update gem versions
cycomachead May 2, 2015
528a428
Setup puma for heroku
cycomachead May 2, 2015
7ef1a40
Dont compile assets in dev
cycomachead May 2, 2015
59ab259
move puma file to right location, doh
cycomachead May 2, 2015
58791fa
here goes! Delete the compiled assets
cycomachead May 2, 2015
b1edcb7
Fix the assets pipeline I hope!
cycomachead May 2, 2015
a4da896
Add some more error files
cycomachead May 2, 2015
5fc4424
require sprockets and tweak settings
cycomachead May 2, 2015
177e98b
Fix spacing
scampos1030 May 2, 2015
c476aca
Removed lol_nothing links. Fixes #66
scampos1030 May 2, 2015
b9bc42d
Update test for navigation links
scampos1030 May 2, 2015
4954119
Add years to signup birthdate. Fixes #67
scampos1030 May 2, 2015
b690d8e
Attempt to fix assets compilation
cycomachead May 2, 2015
b52addb
Fix the asset pipleline to not precompile bower files
cycomachead May 2, 2015
bb05c52
Merge branch 'master' into cleanup
cycomachead May 2, 2015
cf5f6b8
snake case file name
cycomachead May 2, 2015
e5f8b84
Closure compiler gem
cycomachead May 2, 2015
4d077b2
better env checking in rake file
cycomachead May 2, 2015
40d16ef
try sass css compressor since yui doesnt work
cycomachead May 3, 2015
846487c
Update .gitignore
cycomachead May 3, 2015
fe183e4
Update docs and gems to current build process
cycomachead May 3, 2015
ace8785
Add the multi buildpack setup for heroku
cycomachead May 3, 2015
08e3f40
Remove bower deps from repo!! YAY! And setup heroku to install bower
cycomachead May 3, 2015
43246ec
Try to install bower in travis env
cycomachead May 3, 2015
d743a2e
Show search bar when logged out
cycomachead May 3, 2015
6f5b26e
Lots and lots of CSS cleanup!
cycomachead May 3, 2015
b4a95f0
Better login and signup pages
cycomachead May 3, 2015
9dbd07a
Fix tests to match new snap writing style
cycomachead May 3, 2015
75f04c9
Rename folder to be more clear
cycomachead May 3, 2015
94d3eca
Ughhhh Asset issues reappeared. :/
cycomachead May 3, 2015
65742c7
better screenshots!
cycomachead May 3, 2015
a17f951
RetinaJS library
cycomachead May 3, 2015
8528d31
Gem comments and basic basic project partial
cycomachead May 3, 2015
0a5c296
Code style and error handling cleanup
cycomachead May 3, 2015
990ef8a
More error cleanup
cycomachead May 3, 2015
62a0f51
Html cleanup
cycomachead May 3, 2015
1f1260a
Fix the snap routes issue
cycomachead May 3, 2015
0c5b3f5
Snap link
cycomachead May 3, 2015
d932125
Security warnings...
cycomachead May 3, 2015
35e3d0c
tweak title
cycomachead May 3, 2015
5fc5c5e
Dont show the newer partial because tests fails for assignments?
cycomachead May 3, 2015
e9d632e
dont render busted partial
cycomachead May 3, 2015
35ee310
Merge pull request #65 from snap-cloud/cleanup
cycomachead May 3, 2015
9c1bcff
STYLE: use ruby 1.9 hashes throughout the app
cycomachead May 3, 2015
e8a9281
Merge pull request #77 from snap-cloud/hashes
cycomachead May 3, 2015
44dc01b
marketing css fix on dev
cycomachead May 4, 2015
d1028d0
Cleanup haml code and remove coveralls file because its janky
cycomachead May 5, 2015
cfc6441
Gemfile doesnt need to care about the ruby version
cycomachead May 5, 2015
5f63ec9
screencast ui improvements
cycomachead May 8, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "vendor/bower/"
}
2 changes: 2 additions & 0 deletions .buildpacks
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
https://github.com/heroku/heroku-buildpack-nodejs.git
https://github.com/heroku/heroku-buildpack-ruby.git
30 changes: 15 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
.DS_Store
*~
#*#

*.rbc
capybara-*.html
.rspec
/log
log/
!/log/.keep
/tmp
/db/*.sqlite3
/db/*.sqlite3-journal
/public/system
/coverage/
/spec/tmp
tmp/
db/*.sqlite3
db/*.sqlite3-journal
public/system
public/assets/
coverage/
spec/tmp
**.orig
rerun.txt
pickle-email-*.html


# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
# config/initializers/secret_token.rb
# config/secrets.yml

## Environment normalisation:
## Environment normalization:
/.bundle
/vendor/bundle

# these should all be checked in to normalise the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset
# Assets
node_modules
vendor/bower/
!vendor/bower/.keep

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
*.bowerrc
bower.json
Loading