Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,093 Commits 1 Branch 0 Tags
799e2bb4e4957dd3a2d2e77c92fcf787c19a6060
Commit Graph

200 Commits

Author SHA1 Message Date
Kyle Fiedler
032f5fc928 Added style for the tooltip 2012-04-04 10:26:13 -04:00
Kyle Fiedler
26c6fe29c1 Added tooltip for time on video 2012-04-04 10:26:13 -04:00
Kyle Fiedler
1016843ae2 Added style and js for speed picker and hover for scrubber 2012-04-04 10:26:13 -04:00
Kyle Fiedler
ca69dc632f Added styles for the captions and video bar 2012-04-04 10:26:13 -04:00
Kyle Fiedler
77bd47f749 Added some styles to make videos more cohesive 2012-04-04 10:26:12 -04:00
Kyle Fiedler
ceb8d4bf5b fix some small css bugs in askbot 2012-04-03 16:48:00 -04:00
Kyle Fiedler
3111bdd3a0 Added specificity to the input styles for password reset 2012-04-03 16:18:15 -04:00
David Ormsbee
98ff3d5bfb Merge branch 'master' into move_settings 
Conflicts:
	djangoapps/student/views.py
	urls.py
 2012-04-02 14:26:05 -04:00
Bridger Maxwell
d390e9983b Changed CodeMirror back to use a monospaced font, which is important. 2012-03-31 16:59:39 -04:00
Bridger Maxwell
26c0a24a0f Added generated css files. 2012-03-31 15:43:49 -04:00
Bridger Maxwell
183774f637 Fixed codemirror arrowkey navigation bug. 2012-03-29 22:27:55 -07:00
Bridger Maxwell
d7383bf3c4 Small cleanups in codemirror. 2012-03-29 18:21:25 -07:00
Bridger Maxwell
d283bb5794 Moved bug fix to minified leanModal 2012-03-29 18:00:42 -07:00
Bridger Maxwell
4938fb63da Set size of wiki circuits 2012-03-29 16:39:06 -07:00
Bridger Maxwell
d51341301d Changed some css properties for proper sizing of elements. 2012-03-29 15:56:21 -07:00
Kyle Fiedler
162fa59441 Merge branch 'master' into pmitros/name-change 
Conflicts:
	static/css/application.css
	static/css/marketing.css
 2012-03-29 11:08:41 -04:00
Kyle Fiedler
393044fba9 cleaned up some css 2012-03-29 10:45:52 -04:00
Bridger Maxwell
b2fbf537e4 Properly escaping the schematic html attributes. 2012-03-29 00:16:03 -07:00
Bridger Maxwell
f62a43965b Fixed bug for selecting lines with non-integer heights. It put up a fight... 2012-03-28 22:50:23 -07:00
Bridger Maxwell
bb15d92381 Fixed leanModal bug that caused lots of overlays to be added. 2012-03-28 14:20:08 -07:00
Bridger Maxwell
f95aa496fa Better compatibility with the Codemirror editor and the markdown circuit extension. 2012-03-28 14:09:21 -07:00
Kyle Fiedler
7d3caf58e2 Fixed buttons for most sequnces 2012-03-28 15:48:30 -04:00
Kyle Fiedler
b288ec50f3 Fixed bug with the calculator 2012-03-28 15:09:05 -04:00
Kyle Fiedler
230ea1e650 Added fix for sequence nav bug 2012-03-28 14:56:32 -04:00
Bridger Maxwell
99b8a51101 Removed debug comments. 2012-03-28 01:00:33 -07:00
Bridger Maxwell
3c015bb0a9 Another codemirror fix. 2012-03-28 00:56:44 -07:00
Bridger Maxwell
32384c8eb9 Fixed a lot of bugs with selection in codemirror. Seems to work pretty solidly now\! 2012-03-28 00:36:06 -07:00
Bridger Maxwell
43318b7213 Fixing deletion / insertion bugs and inconsistencies 2012-03-27 14:33:24 -07:00
Kyle Fiedler
d3771b16a8 Removed deactive and unenroll 2012-03-27 13:59:24 -04:00
Kyle Fiedler
e99e5b3679 Added the highlight back to the updates 2012-03-27 13:54:49 -04:00
Bridger Maxwell
952b754966 New method works without line wrapping too 2012-03-26 17:15:45 -07:00
Bridger Maxwell
5580c62ee4 Wiki editor now has wrapped lines. 2012-03-26 13:48:11 -07:00
Bridger Maxwell
8fce7066da You can now edit a circuit directly on the edit page of the wiki. These edits show up in the history. This hasn't been tested much. 2012-03-25 20:39:21 -07:00
Bridger Maxwell
3ed5b161ec Moved simplewiki autosuggest js (it didn't get migrated). Fixed a minor typo in settings.py (it suggested the wrong override location for the static js files) 2012-03-25 20:08:03 -07:00
Bridger Maxwell
2f15424acc Merged in master branch 2012-03-25 15:05:37 -04:00
Kyle Fiedler
3512df424e Added image for info 2012-03-22 16:37:36 -04:00
Kyle Fiedler
813fc488c6 Spead up animation and added diferent wording 2012-03-22 16:37:36 -04:00
Kyle Fiedler
6627153e1c Added styles for the calc hint 2012-03-22 16:37:36 -04:00
Kyle Fiedler
1be8d198ab Added a fake deactivate and unenroll links and some style for profile 2012-03-22 15:32:31 -04:00
David Ormsbee
e36f309bb8 update symlinks to keep references to static assets in wiki happy 2012-03-22 13:36:18 -04:00
David Ormsbee
e3e8edcf81 Update location of JS assets for local debugging (most envs use S3), remove old link to 3rdParty repo (which is no longer used) 2012-03-22 10:48:40 -04:00
Kyle Fiedler
84ac8a1d2a Added some styles for name and email change 2012-03-21 17:06:37 -04:00
Kyle Fiedler
3fadf0e16c Added styles for new calc and updated bourbon 2012-03-20 14:11:25 -04:00
Kyle Fiedler
a3eb345bb1 added fixes for info updates 2012-03-19 16:19:15 -04:00
Calen Pennington
71cc49184b Merge remote-tracking branch '3rdParty/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
562418504a Merge remote-tracking branch '3rdParty/master' into bridger-grades 2012-03-19 11:10:48 -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
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
Calen Pennington
70832c7db3 Import from hg 2012-03-19 11:05:25 -04:00