Calen Pennington
|
c04d49385c
|
Merge remote-tracking branch 'static/master' into bridger-grades
|
2012-03-19 11:10:48 -04:00 |
|
Calen Pennington
|
efb96251f8
|
Copying hgignore to gitignore
|
2012-03-19 11:10:44 -04:00 |
|
Calen Pennington
|
fc68777119
|
Fix up the symlinks to point to the right place
|
2012-03-19 11:10:44 -04:00 |
|
Calen Pennington
|
ceffe4a875
|
Updating pointers to new merged repo locations
|
2012-03-19 11:10:44 -04:00 |
|
Calen Pennington
|
a20b01c081
|
Splitting files into subdirectories in preparation for merge
|
2012-03-19 11:10:44 -04:00 |
|
Calen Pennington
|
4f65c6e67a
|
Remove file in 3rdParty
|
2012-03-19 11:10:43 -04:00 |
|
Calen Pennington
|
799816a31d
|
Move to subdirectory in preparation for merge
|
2012-03-19 11:10:43 -04:00 |
|
Reda Lemeden
|
269334a839
|
Fixed the layout of the graph gradebook
|
2012-03-15 10:58:39 -04:00 |
|
Kyle Fiedler
|
98a4b48e3d
|
Merged css
|
2012-03-14 17:43:20 -04:00 |
|
Kyle Fiedler
|
d2b8a2c8ad
|
New sass generated css
|
2012-03-14 17:42:39 -04:00 |
|
Kyle Fiedler
|
b4f15d7c79
|
Added new styles for pages that are not inside the app or marketing
|
2012-03-14 17:33:01 -04:00 |
|
Bridger Maxwell
|
5b46112911
|
Small refactor on the grades. Also made the gradebook render a graph for each student
--HG--
branch : bridger-grades
|
2012-03-12 18:10:16 -04:00 |
|
Reda Lemeden
|
ec4c1786cf
|
Fixed askbot layout bug
|
2012-03-12 17:33:51 -04:00 |
|
Piotr Mitros
|
12c3c4cc2d
|
Extract complete user info into a json file
|
2012-03-11 20:26:57 -04:00 |
|
Ernie Park
|
4f4f3a75b5
|
merge
|
2012-03-11 17:45:56 -04:00 |
|
Piotr Mitros
|
909aec4379
|
Better error messages
|
2012-03-10 22:45:00 -05:00 |
|
Piotr Mitros
|
e8c7e5521b
|
Better error message
|
2012-03-10 22:42:32 -05:00 |
|
Piotr Mitros
|
837b9c9075
|
Basic gradebook
|
2012-03-10 22:31:40 -05:00 |
|
Piotr Mitros
|
af815abe3b
|
Beginning refactoring grades out of profile view for use in gradebook
|
2012-03-10 21:17:22 -05:00 |
|
Piotr Mitros
|
2461669e6c
|
Merged in functionality to show grades by student
|
2012-03-10 20:41:25 -05:00 |
|
Piotr Mitros
|
f1ad393f18
|
Course admins can now access student grades by going to profile/[userid]
--HG--
branch : visible-grades
|
2012-03-10 20:34:13 -05:00 |
|
Piotr Mitros
|
c7c71c9458
|
Merge
--HG--
branch : visible-grades
|
2012-03-10 20:17:13 -05:00 |
|
Piotr Mitros
|
cde9ab284b
|
Need to merge
--HG--
branch : visible-grades
|
2012-03-10 20:17:04 -05:00 |
|
Piotr Mitros
|
a2c4010b8f
|
Removed caching for dev machines
|
2012-03-10 20:13:03 -05:00 |
|
Piotr Mitros
|
a8c2c3c5b4
|
More helpers
|
2012-03-10 19:38:51 -05:00 |
|
Piotr Mitros
|
6561cac242
|
User counts
|
2012-03-10 17:41:54 -05:00 |
|
Piotr Mitros
|
52dd6361e7
|
Helper methods for managing users
|
2012-03-10 17:33:20 -05:00 |
|
Piotr Mitros
|
a995ef0f0f
|
Instructors can see grades -- syncing machines -- nonworking code
--HG--
branch : visible-grades
|
2012-03-10 17:11:49 -05:00 |
|
Piotr Mitros
|
547bf5d52e
|
Added book viewer
|
2012-03-10 17:10:49 -05:00 |
|
Piotr Mitros
|
c8f261efc7
|
Work-around for not finding XML for sections in section files. Note: Requires data push
|
2012-03-09 20:20:02 -05:00 |
|
Piotr Mitros
|
f8e706399f
|
Feedback form includes email and browser
|
2012-03-09 17:37:45 -05:00 |
|
Kyle Fiedler
|
96fedc0cb6
|
Added image for sliders and styles for sliders
|
2012-03-08 16:04:14 -05:00 |
|
Ernie Park
|
e8656c2d9e
|
merge
|
2012-03-08 14:49:40 -05:00 |
|
Ernie Park
|
513d811aec
|
remove console.log lines
|
2012-03-08 14:49:28 -05:00 |
|
Kyle Fiedler
|
d9479bd33d
|
Added images for real this time and fixed merge conflicts
|
2012-03-08 14:36:32 -05:00 |
|
Kyle Fiedler
|
16fdcd5700
|
Added images and css for social links in footer
|
2012-03-08 14:35:25 -05:00 |
|
David Ormsbee
|
814f743c37
|
merge away detritus from static's default
|
2012-03-08 13:30:02 -05:00 |
|
Piotr Mitros
|
c991190c02
|
Merge
|
2012-03-07 15:30:48 -05:00 |
|
Piotr Mitros
|
5db419d211
|
Used cookies to store speed
--HG--
branch : ernie-static-video-fixes
|
2012-03-07 15:27:47 -05:00 |
|
Ernie Park
|
90a70e661f
|
include kyles changes to bold the video speed
--HG--
branch : ernie-static-video-fixes
|
2012-03-07 14:52:01 -05:00 |
|
Ernie Park
|
40e52cb96e
|
update video player to accommodate remembering video speeds when switching in sequences and fix bug where play button gets out of sync when switching speeds
--HG--
branch : ernie-static-video-fixes
|
2012-03-07 02:25:33 -05:00 |
|
Reda Lemeden
|
174f50c575
|
Small visual adjustment for official badges
|
2012-03-06 17:15:59 -05:00 |
|
Reda Lemeden
|
5baddf5366
|
Made the official comment style apply to question comments as well
|
2012-03-06 16:21:26 -05:00 |
|
Reda Lemeden
|
dfc96ba273
|
Merge and resolve conflict
|
2012-03-06 16:07:10 -05:00 |
|
Reda Lemeden
|
97b2a05f1b
|
Added official badge styling for Askbot
|
2012-03-06 16:01:15 -05:00 |
|
Bridger Maxwell
|
7e640e3965
|
Merge
|
2012-03-06 15:47:46 -05:00 |
|
Bridger Maxwell
|
84471d176e
|
Added revision feed, which shows latest edits across the wiki. Also brought down wiki queries using select_related and caching article slugs
--HG--
branch : bridger-dev
|
2012-03-06 15:26:34 -05:00 |
|
Kyle Fiedler
|
6926bb9309
|
Merged heads and resolved conflict
|
2012-03-06 14:44:19 -05:00 |
|
Kyle Fiedler
|
2081680588
|
Added styles for the admin code in courseware
|
2012-03-06 14:42:56 -05:00 |
|
Bridger Maxwell
|
f58f08edbe
|
Changed hoverling labels of profile graph to give real name of homework or lab section
--HG--
branch : bridger-dev
|
2012-03-06 12:53:39 -05:00 |
|