FryMe 9 months ago
Greg Reinbach committed revision
de63566e1d
added |safe to student view of content
FryMe 9 months ago
Greg Reinbach committed revision
19f1050755
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
39fd95eaf9
added 404 template
FryMe 9 months ago
Greg Reinbach committed revision
9cbe40d4e8
updated text of 500 template
FryMe 9 months ago
Ken Cochrane committed revision
553c6e5a0b
added read the docs link
FryMe 9 months ago
Ken Cochrane committed revision
0852c6d77a
couldn't push trying now
FryMe 9 months ago
Greg Reinbach committed revision
e6e31d2dff
reversed procfile changes
FryMe 9 months ago
Greg Reinbach committed revision
aae83e1dca
updated procfile to pull in prod settings directly, and default to pulling in test
FryMe 9 months ago
Ken Cochrane committed revision
3dde66c3ca
more class fun
FryMe 9 months ago
Ken Cochrane committed revision
be72cb8062
fixed RTD issue
FryMe 9 months ago
John Costa committed revision
bdd9e8d308
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Ken Cochrane committed revision
a6415afa67
commenting out slug on clasroom, it wasn't working on heroku
FryMe 9 months ago
John Costa committed revision
49b2c3af7d
remove edit button for classrooms you don't own
FryMe 9 months ago
Greg Reinbach committed revision
fd3a06d693
Student view now updated with each step
FryMe 9 months ago
Ken Cochrane committed revision
88401218f9
Merge branch 'master' of github.com:reinbach/tutorus
FryMe 9 months ago
Ken Cochrane committed revision
aaa054d156
added more docs
FryMe 9 months ago
John Costa committed revision
1b9fb23c8b
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
John Costa committed revision
72d7562bb0
additional docs
FryMe 9 months ago
Ken Cochrane committed revision
029b7f5cda
added a slug check to classroom
FryMe 9 months ago
Greg Reinbach committed revision
06bef21ced
removed next/prev call on subscribe callback
FryMe 9 months ago
Greg Reinbach committed revision
845b9cb379
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
918f323423
added proper hooks for tutor moving through steps
FryMe 9 months ago
Ken Cochrane committed revision
3c701a8482
Merge branch 'master' of github.com:reinbach/tutorus
FryMe 9 months ago
Ken Cochrane committed revision
cb79e9bfc2
added sphinx docs
FryMe 9 months ago
John Costa committed revision
39944be022
add additional readme
FryMe 9 months ago
Greg Reinbach committed revision
1d2f3e4481
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
ada859df3b
added hooks to access next step ajax call
FryMe 9 months ago
John Costa committed revision
240ad90a8e
revert hide edit button
FryMe 9 months ago
John Costa committed revision
f7a4d8ffa0
remove edit if your not the tutor
FryMe 9 months ago
John Costa committed revision
ea698a934e
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
John Costa committed revision
46d6a7e911
users interests are now show in the my classes list
FryMe 9 months ago
Ken Cochrane committed revision
4cf989190f
added suggest a class feature
FryMe 9 months ago
Ken Cochrane committed revision
ca7bc90ec0
Merge branch 'master' of github.com:reinbach/tutorus
FryMe 9 months ago
Ken Cochrane committed revision
cf110dada3
aded a disabled.html template to make it nicer then the orgiinal
FryMe 9 months ago
Greg Reinbach committed revision
1aa28b7754
moved inline js to classroom js file
FryMe 9 months ago
Greg Reinbach committed revision
4e9a9eff1c
added sendgrid settings to prod
FryMe 9 months ago
Ken Cochrane committed revision
daa02a8192
Merge branch 'master' of github.com:reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
f46cad1535
top questions reload had off by 1 count issue
FryMe 9 months ago
Greg Reinbach committed revision
cbbdc3dc98
added answers to student view
FryMe 9 months ago
Greg Reinbach committed revision
cd699e2f54
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
4546abeb35
display scratchpad data when published
FryMe 9 months ago
Ken Cochrane committed revision
b1203b8c19
Merge branch 'master' of github.com:reinbach/tutorus
FryMe 9 months ago
Ken Cochrane committed revision
78538e88c6
got the cancel buttons to work
FryMe 9 months ago
Greg Reinbach committed revision
666ebdfea7
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
a6eb2eeaaa
scratchpad data is now accepts and published, need to display for students still
FryMe 9 months ago
Ken Cochrane committed revision
b3da3fc6f1
Merge branch 'master' of github.com:reinbach/tutorus
FryMe 9 months ago
Ken Cochrane committed revision
304a9e66df
fixed issue with submiting questions
FryMe 9 months ago
Greg Reinbach committed revision
a0773cffec
tweaked display of scratchpad, added it to student view
FryMe 9 months ago
Greg Reinbach committed revision
040c6f8520
removed inline style for step content
FryMe 9 months ago
Greg Reinbach committed revision
5b91f31ec3
tweaked layout and styling of step content when editing class
FryMe 9 months ago
Greg Reinbach committed revision
14325cb53f
removed obsolete code
FryMe 9 months ago
Greg Reinbach committed revision
208c72cb6e
Changed icon in classroom list to button, incase run out of time to sort out heroku and the icons
FryMe 9 months ago
Greg Reinbach committed revision
ce09a98a87
Moved classroom status into separate file and included in tutor/student views
FryMe 9 months ago
Greg Reinbach committed revision
2522457b62
Fixed reference to answered questions element when appending answer
FryMe 9 months ago
Greg Reinbach committed revision
296892b6bf
Moved scratchpad and controls to above row, for cleaner handling of accordian
FryMe 9 months ago
Greg Reinbach committed revision
98a155cc4b
Only show top questions that have status of asked
FryMe 9 months ago
Greg Reinbach committed revision
bea100eb28
Cleanly remove question from top questions when answered
FryMe 9 months ago
Greg Reinbach committed revision
0121d5dbf0
Added answer heading to js part, not very DRY
FryMe 9 months ago
Greg Reinbach committed revision
558569748f
handle questions being answered
FryMe 9 months ago
Greg Reinbach committed revision
d34549648a
Added answer date field to question
FryMe 9 months ago
Greg Reinbach committed revision
760b479569
Added answer field to question
FryMe 9 months ago
Greg Reinbach committed revision
5e2a41aa7e
Added post answer button for tutor on questions
FryMe 9 months ago
John Costa committed revision
6005253eb3
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
John Costa committed revision
f696f8fd5c
tweek unit tests to support unique slug
FryMe 9 months ago
John Costa committed revision
fa26c7d0d4
add unique slugs
FryMe 9 months ago
Greg Reinbach committed revision
1ca4243eab
pMerge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
5848cdc6e8
Added answer question ui interface, moved publishing to channels to central function
FryMe 9 months ago
Greg Reinbach committed revision
31283476bf
updated tutor param to is_tutor
FryMe 9 months ago
Greg Reinbach committed revision
9006d7eec5
removed empty block
FryMe 9 months ago
John Costa committed revision
21aa883f74
slugs are unique across site
FryMe 9 months ago
John Costa committed revision
78df7b01c7
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
John Costa committed revision
7b60433b59
add slug field to models
FryMe 9 months ago
Greg Reinbach committed revision
0b3d6ac22c
added subscribe channel call, tweaked code layout
FryMe 9 months ago
Greg Reinbach committed revision
48bbed6ccd
added top questions js function, broke create question function out for classrooms js
FryMe 9 months ago
Greg Reinbach committed revision
55bf1ff8c6
pass in vote count for top questions and not up vote url
FryMe 9 months ago
Greg Reinbach committed revision
8d2fe5a75c
tweaked code layout
FryMe 9 months ago
Greg Reinbach committed revision
5f03baa81e
Filled in publish_top_question function
FryMe 9 months ago
Greg Reinbach committed revision
4b605b78ff
Added icon to 'new questions'
FryMe 9 months ago
Greg Reinbach committed revision
17cb04ee9b
removed js console log when student connects
FryMe 9 months ago
Greg Reinbach committed revision
14a9c6611a
Added student count info to student classroom view
FryMe 9 months ago
Greg Reinbach committed revision
399ca57615
sorted out increment status count js function
FryMe 9 months ago
Greg Reinbach committed revision
ae2a75ac2e
moved scratchpad section below class steps so not affected by accordian, also cleaned up js
FryMe 9 months ago
Greg Reinbach committed revision
377872f1d8
Added interest column to tutor class list
FryMe 9 months ago
Greg Reinbach committed revision
1ec5f5e965
Added set classroom interest js function
FryMe 9 months ago
Greg Reinbach committed revision
dde5c50a8a
fixed channel name subscribed to for classes in interest view
FryMe 9 months ago
Greg Reinbach committed revision
843a2070ca
added interested badge to class
FryMe 9 months ago
Greg Reinbach committed revision
b286fc3242
Don't show interest link button if marked as interested already
FryMe 9 months ago
Greg Reinbach committed revision
c32384efa5
only show buttons in class list if user authenticated
FryMe 9 months ago
Greg Reinbach committed revision
ea1193b79d
only publish interest if it is newly created
FryMe 9 months ago
Greg Reinbach committed revision
833080c684
src the correct js file in classes list page
FryMe 9 months ago
Greg Reinbach committed revision
086f9a44c5
added ajax call for classroom interest button
FryMe 9 months ago
Greg Reinbach committed revision
dd455dcbcb
added classes js file to handle classes channel subscriptions
FryMe 9 months ago
Greg Reinbach committed revision
57db7e0d01
Pass classroom id when publishing interest in the classroom
FryMe 9 months ago
Greg Reinbach committed revision
89db8d284d
changed function name for classroom channel subscription, no longer set to var which was conflicting
FryMe 9 months ago
Greg Reinbach committed revision
5b203939d1
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
f9c31b6bbe
moved pubnub js connection to separate function
FryMe 9 months ago
John Costa committed revision
1a32d4529e
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
John Costa committed revision
58b66c5ff5
add initial class edit view tests
FryMe 9 months ago
John Costa committed revision
fcd337c7d8
add docs for class take
FryMe 9 months ago
John Costa committed revision
3bc07592e9
initial unit tests for class take view
FryMe 9 months ago
Greg Reinbach committed revision
74986fc718
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
74c8b9dae7
Added framework for student interest in class
FryMe 9 months ago
John Costa committed revision
eda7997719
add intial view tests for class activate
FryMe 9 months ago
John Costa committed revision
eadae3ebf9
add initial redirect test
FryMe 9 months ago
John Costa committed revision
4cb21b82f6
initial create class view test
FryMe 9 months ago
John Costa committed revision
3068f59f6e
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
John Costa committed revision
f6fc25df9f
add initial class_home unit test
FryMe 9 months ago
Greg Reinbach committed revision
2c29e9a072
Added student interest classroom model
FryMe 9 months ago
Greg Reinbach committed revision
3fe6f209a3
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
a8090006e4
Added decision page, if no classes for user and they go to 'My Classes'
FryMe 9 months ago
John Costa committed revision
9616f1caeb
remove boilerplate test file
FryMe 9 months ago
John Costa committed revision
ae51a8b963
refactor base data into a fixture
FryMe 9 months ago
John Costa committed revision
62dff954e2
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
John Costa committed revision
b653cf2633
add intial top questions template tag unit test
FryMe 9 months ago
John Costa committed revision
ce6106ccec
intial latest questions unit test
FryMe 9 months ago
Greg Reinbach committed revision
29c09d7ebe
Added 'My Classes' menu item
FryMe 9 months ago
Greg Reinbach committed revision
f19c2e034a
create class cancel button redirects intellegintly now, well with as much intelligence that I have at the moment
FryMe 9 months ago
Greg Reinbach committed revision
7d65d3bad1
oops forgot to add these files in previous commit
FryMe 9 months ago
Greg Reinbach committed revision
5be9a3e931
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
630b89fc02
Tutor able to view list of own classes
FryMe 9 months ago
Ken Cochrane committed revision
43a36afdfc
Merge branch 'master' of github.com:reinbach/tutorus
FryMe 9 months ago
Ken Cochrane committed revision
f2706e6cc8
added epiceditor on the steps content page
FryMe 9 months ago
Ken Cochrane committed revision
9d8cffc477
added missing image
FryMe 9 months ago
Ken Cochrane committed revision
3110902b88
added epiceditor
FryMe 9 months ago
John Costa committed revision
7da89f0f45
initial top questions unit test
FryMe 9 months ago
John Costa committed revision
e3d6f1f679
patched database migration issue
FryMe 9 months ago
John Costa committed revision
43d88bb32a
unit test for initial unanswered questions with user
FryMe 9 months ago
John Costa committed revision
8dc09aec84
initial questions
FryMe 9 months ago
John Costa committed revision
332a486648
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Ken Cochrane committed revision
9080b1c5be
added form validation for step, class, and question.
FryMe 9 months ago
Ken Cochrane committed revision
33796f6cc5
added js validator script
FryMe 9 months ago
Ken Cochrane committed revision
cbd665cafe
added a bunch of images
FryMe 9 months ago
John Costa committed revision
b719b63ab0
additional testing
FryMe 9 months ago
John Costa committed revision
2854b0f7f8
add test for tutor
FryMe 9 months ago
John Costa committed revision
10e25a6494
initial classroom active test
FryMe 9 months ago
John Costa committed revision
fcfe7d3f0d
add initial tests for steps
FryMe 9 months ago
John Costa committed revision
cfe25a3e05
initial model tests
FryMe 9 months ago
John Costa committed revision
ad6dd43451
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
John Costa committed revision
d4f69009c2
marked code for removal
FryMe 9 months ago
Greg Reinbach committed revision
90815c6188
added dingus lib to requirements
FryMe 9 months ago
John Costa committed revision
68736258a6
Merge branch 'master' of https://github.com/reinbach/tutorus
Conflicts:
tutorus/classroom/models.py
tutorus/classroom/templatetags/classroom_tags.py
FryMe 9 months ago
John Costa committed revision
85a77e1450
start building out unit tests
FryMe 9 months ago
Greg Reinbach committed revision
055e66f110
styled accordian headers
FryMe 9 months ago
Greg Reinbach committed revision
be1719e51f
Added vote count method to questions
FryMe 9 months ago
Greg Reinbach committed revision
3545a9cdf9
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
3df0f9b9b6
Top questions now show for class
FryMe 9 months ago
Greg Reinbach committed revision
f2f0fac7b1
Added top questions count to settings
FryMe 9 months ago
John Costa committed revision
48720ed81f
run unit tests from test file
FryMe 9 months ago
Greg Reinbach committed revision
26611115c5
updated readme slightly
FryMe 9 months ago
Greg Reinbach committed revision
82d80f705b
added hook to travis-ci
FryMe 9 months ago
Greg Reinbach committed revision
6110c55307
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
b2338a51f1
removed socketio.js file no longer needed
FryMe 9 months ago
Greg Reinbach committed revision
b8896cd2bb
changed status url to s3
FryMe 9 months ago
John Costa committed revision
d3f666a77d
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
John Costa committed revision
fe1af95d00
quick and dirty form save
FryMe 9 months ago
Greg Reinbach committed revision
06cc66012f
when new questions being added, remove extra/older questions
FryMe 9 months ago
Greg Reinbach committed revision
c514b3ed09
New questions are added to interface dynamically now
FryMe 9 months ago
Greg Reinbach committed revision
35ccae93be
moved upvote js code to js file
FryMe 9 months ago
Greg Reinbach committed revision
3e1ddd752d
handle success properly when upvoting question
FryMe 9 months ago
Greg Reinbach committed revision
80a7f872f1
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months ago
Greg Reinbach committed revision
b024aa78c3
moved latest questions template to templatetag callback to better handle removing questions voted for by the user already
FryMe 9 months ago
John Costa committed revision
75c6cf7bbe
simple button to save scratchpad
FryMe 9 months, 1 week ago
John Costa committed revision
cba23a0a08
simple scratchpad form on the tutor view
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
26c440980e
pass in latest question count to classroom
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
57efd17834
Added ks ajax call for question up vote
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
80b707508c
Added question vote functionality
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
99b323463a
Changed vote count to separate table to track who voted as well
FryMe 9 months, 1 week ago
John Costa committed revision
3b421b7aa4
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
923620b15f
Added vote count field to questions
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
ec95176614
added up vote badge to latest questions
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
a30404e2e1
styled display of questions
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
3cc90cd2f0
Changed the count for latest questions to 5 from 10
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
b33ec92c06
Moved question max latest count to base settings
FryMe 9 months, 1 week ago
John Costa committed revision
86c6b4d83d
serve static locally
FryMe 9 months, 1 week ago
John Costa committed revision
1556617126
add migration dependencies
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
47e3d113f4
actually set the classroom when saving the question
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
770cf45c98
display latest unanswered questions in student view
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
8c583ede88
added created field to questions model
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
fc62232b8a
checked message handling to case statement, added initial hooks for student count increment and adding question
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
d4f4f87578
Publishing new question passes in type now
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
f9260752c1
Cleaned up pubnub channel handling
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
0bf8f6e704
user now passed to class
also passed to channel subscribe function
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
8f285e2616
tweaked code layout
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
850bea7956
pubnub js wrapped in function for channel subscription, now connects properly, test code still in place... time for lunch
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
8f4a67c832
moved page js to bottom of html body
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
42dc3e3242
Properly handle ask question post, pub to all subscribers
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
c387131242
Added ask question form to student view, able to post. response needs to be sorted out
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
f554c9881f
Ask question form passed to student classroom view
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
904eb2958b
Added ask question form
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
5e0c8a6f45
Added pubnub wrapper
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
c6eec620db
Added student field to questions
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
2092163f5c
added pubnub settings
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
5279876f77
Merge branch 'master' of https://github.com/reinbach/tutorus
Conflicts:
tutorus/classroom/templates/classroom/take.html
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
618cd3b6f5
tweaked code layout
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
a50c506091
added pubnub hooks
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
c8ff078344
fixed take class so it works for both tutor and student
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
e859584151
added font awesome, and started using some of the icons
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
e198556299
prettied up the take class tutor page some more
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
1a9d029705
added ability to delete a step
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
81ac3929e9
added ability to edit class, and added icons to class page
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
7480eb542b
added controls to the take class page to toggle steps
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
9cbf97d458
added student view of class
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
e9cc794201
added holders for scratchpad and controls in tutor view
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
e6b94cf858
added logging to console
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
e03c03c11f
Added tutor side bar info
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
add508eb53
Basic classroom info shown on take class page
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
e63f414bd1
added take class framework
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
58db0b9411
Added is_active and is_tutor methods to classroom model
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
8593bc5b86
added tutor_only decorator and take class view
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
bdc27796d2
Added title block to base template
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
cd292db45f
Added abitlity to activate class
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
10a0bf884e
tweaked code layout
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
fb4ebcbedf
Added model to explain first step
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
5172d75a3b
updated url names to be consistant
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
90e836a589
tweaked code layout
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
b360ea526e
Removed uneeded import in main urls file
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
5256c6a738
static files served from app for now
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
791f9f4507
cleaned up some things, merged other things, and then tied together some other things. basically late night cleanup before I call it a night. hopefully everything is good for the morning shift
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
b46ff4bf99
merged and fixed conflicts
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
3625c8f9bf
first pass at getting classes, and steps created. still rough, but workable for now
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
b645709220
Started tying in classroom with interface
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
1b4e0a4949
Modified static root path
FryMe 9 months, 1 week ago
John Costa committed revision
c278d801df
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months, 1 week ago
John Costa committed revision
61aa070dc9
add classroom connections
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
2d2decebae
added step app
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
3c33c94454
updated path to manage.py in Procfile
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
8eb7bd19bb
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
6dcde998fa
added gunicorn to run on heroku
FryMe 9 months, 1 week ago
John Costa committed revision
0fa791251f
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
58575918d9
Merge branch 'master' of github.com:reinbach/tutorus
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
f5227288cb
added new classroom app
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
94db80079c
added django-extentions and django-model-utils to requirements
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
3dbf349dde
added dj-database-url to requirements
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
4f349a3d2d
removed currentenv.py
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
42c36ff0ac
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months, 1 week ago
John Costa committed revision
a8f17e8d7a
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
768e6dc4a1
added db settings
FryMe 9 months, 1 week ago
John Costa committed revision
5be9deb74d
fix import error
FryMe 9 months, 1 week ago
John Costa committed revision
b175705b83
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months, 1 week ago
John Costa committed revision
5493bdeb69
break constants into their own file
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
dae96d5257
merge
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
be4382f93a
little tweaks here and there for the django-usera to work
FryMe 9 months, 1 week ago
John Costa committed revision
5f688434d1
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months, 1 week ago
John Costa committed revision
f5dd514308
initial version of questions
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
2f14de7ec3
added __init__.py to root in the hopes this helps heroku
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
2046ce5820
Added settings for heroku
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
452c738002
added south migration for user
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
74fc4f847d
added ANONYMOUS_USER_ID to settings to satisfy guardian
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
6533705ec5
added missing django-userea requirement
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
992455cc08
fixed merge issue
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
9ec41d0a55
tried to ignore currentenv.py don't think it worked
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
9669743334
Merge branch 'master' of https://github.com/reinbach/tutorus
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
645573cf7b
merge
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
e79a7c6ee4
updated personal links
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
6b1390acbc
Added initial static media, need to come back and add to it, and clean up later
FryMe 9 months, 1 week ago
John Costa committed revision
7f70bde4cb
moved core to project apps
FryMe 9 months, 1 week ago
John Costa committed revision
ba96d4046d
Merge branch 'master' of https://github.com/reinbach/tutorus
Conflicts:
tutorus/settings/base.py
FryMe 9 months, 1 week ago
John Costa committed revision
4f32f70e24
add south and initial models
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
07fd0d30d5
added some content to fill in the home page, links are dead
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
166b2f3b6e
Merge branch 'master' of github.com:reinbach/tutorus
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
d9e7985302
Added missing templates
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
70a905b46a
Added initial templates, just stubbed out, need to make look better, and work later
FryMe 9 months, 1 week ago
John Costa committed revision
69fb21e40b
initial scratchpad model and simple unit test
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
9ae3cbf28d
merge
FryMe 9 months, 1 week ago
Ken Cochrane committed revision
e5148ff55c
initial commit of django-userea
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
0a8f63b465
Added core app and bootstrap for styling
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
aa4812e581
fixed file extension of requirements file
FryMe 9 months, 1 week ago
Greg Reinbach committed revision
8e8ae96ad1
added requirements file
John Costa johncosta
Ken Cochrane kencochrane
Greg Reinbach reinbach