Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
66,833 Commits 1 Branch 0 Tags
ecdf774e75dbb0f0fe84494de18dfdf946c14552
Commit Graph

66833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Piotr Mitros
9812fda559 Minor bug when restarting server with custom tags 
This patch has limited testing w.r.t. whether the bug is completely
gone, but it appears to have no negative side effects, and fix at
least one case.
 2012-02-20 15:46:31 -05:00
Kyle Fiedler
e844a6f006 Added styles for the profile page in askbot 2012-02-20 15:25:34 -05:00
Kyle Fiedler
02174ff62e Merged heads 2012-02-20 15:24:54 -05:00
Kyle Fiedler
576643da7e Added base styles for the askbot profile page 2012-02-20 15:24:35 -05:00
Reda Lemeden
b2d0b9b621 Merge with Head 2012-02-20 14:29:26 -05:00
Reda Lemeden
01ab182a8e Fixed bugs in the answer and question editing forms 2012-02-20 14:28:30 -05:00
Piotr Mitros
c94d68683e Merge 2012-02-20 13:26:39 -05:00
Piotr Mitros
0b3c9dc975 Integrate with mod-template (custom tags dir) 2012-02-20 13:25:34 -05:00
Piotr Mitros
349230c1fa Merge with capa fixed 2012-02-20 13:24:33 -05:00
Piotr Mitros
0888eed906 Post-merge cleanup 2012-02-20 13:06:13 -05:00
Piotr Mitros
34affdabde Merge with new settings 
--HG--
rename : settings_new_askbot.py => settings.py
 2012-02-20 12:14:48 -05:00
Piotr Mitros
8dec0aa7cd Merging with fixes to Capa 2012-02-20 12:06:19 -05:00
Piotr Mitros
c16ac4fb4e Merge with local template paths 2012-02-20 12:03:59 -05:00
Reda Lemeden
f6434f906c Merge with Head 2012-02-20 11:38:20 -05:00
Reda Lemeden
b8dcbaf36c Fixed visual bugs on the main question list + restyled author info in answer view 2012-02-20 11:37:39 -05:00
Piotr Mitros
7bd509b7ed Beginning to merge new settings file 
--HG--
branch : pmitros-dormsbee-settings2
rename : settings_new_askbot.py => settings.py
 2012-02-20 11:29:12 -05:00
Kyle Fiedler
93c50f0aeb Added styles for the bottom navigation on the textbook: 2012-02-20 11:19:37 -05:00
Kyle Fiedler
bf632da06f Add textbook nav on the bottom of the page too 2012-02-20 11:18:58 -05:00
Kyle Fiedler
d83a4d22f3 Added messaging for users with javascript diabled 2012-02-20 10:51:39 -05:00
Kyle Fiedler
48a3133714 merged heads 2012-02-20 10:44:07 -05:00
Kyle Fiedler
db9ca0772f Fix ie enrollment issues by hiding form 2012-02-20 10:43:46 -05:00
Kyle Fiedler
c7e72c28e0 merged heads 2012-02-20 09:54:13 -05:00
Kyle Fiedler
c423e17cc3 Added style to remove enrollment form for IE7 and below and added a paragraph explainaing why 2012-02-20 09:53:40 -05:00
Piotr Mitros
e57fc19045 Including namespace for sections 
--HG--
branch : pmitros-mod-template
 2012-02-20 07:16:22 -05:00
Piotr Mitros
2501b58305 Removed unnecessary symlinks. WARNING: Must update and push data before deploying 
--HG--
branch : pmitros-mod-template
 2012-02-20 07:13:16 -05:00
Piotr Mitros
47b0ca5564 Merge 
--HG--
branch : pmitros-mod-template
 2012-02-20 07:11:05 -05:00
Piotr Mitros
1befa20b12 Last commit tested and debugged 
--HG--
branch : pmitros-mod-template
 2012-02-20 07:08:22 -05:00
Piotr Mitros
0d9a24e4f4 Templates broken into namespaces 
--HG--
branch : pmitros-mod-template
 2012-02-19 20:12:34 -05:00
Piotr Mitros
5fe68e3a43 Merge to default for next developments 
--HG--
branch : pmitros-mod-template
 2012-02-19 19:34:36 -05:00
Piotr Mitros
622c4e3427 Eliminated save button where not relevant 
--HG--
branch : pmitros-capa-fixes
 2012-02-19 17:27:21 -05:00
Piotr Mitros
cb27c471ff Capa problems handle case sensitivity and give better errors 
--HG--
branch : pmitros-capa-fixes
 2012-02-19 17:03:46 -05:00
Piotr Mitros
73322a5e6a Capa problems handle case sensitivity and give better errors 
--HG--
branch : pmitros-capa-fixes
 2012-02-19 17:03:29 -05:00
Piotr Mitros
0807cf8160 Updated FAQ 2012-02-19 14:03:12 -05:00
Piotr Mitros
ab0f07ebd1 Code cleaned up to be slighlty more explicit 
--HG--
branch : profile-cache
 2012-02-19 12:30:08 -05:00
Piotr Mitros
7bea938246 Handling case of response not in cache explicitly 
--HG--
branch : profile-cache
 2012-02-19 12:21:57 -05:00
Piotr Mitros
88adbc9593 Merge 
--HG--
branch : profile-cache
 2012-02-19 12:18:34 -05:00
Piotr Mitros
b2f3a75d86 Working on case where id not in cache. Committing to merge with mainline 
--HG--
branch : profile-cache
 2012-02-19 12:18:19 -05:00
Piotr Mitros
3ef3c055af Profile page fixed 2012-02-19 10:39:18 -05:00
Piotr Mitros
47cd903cc2 Changed jpg to png, new TOC, correct starting/eding pages 2012-02-19 10:29:32 -05:00
cjt
9025ea34c8 clean up old versions of schematic tool from static/js 2012-02-18 15:07:14 -05:00
David Ormsbee
ffba3c59a5 Merge AB testing branch I should have pulled in a week ago. 2012-02-17 15:26:58 -05:00
Kyle Fiedler
a4258d29de Added to the Sass readme 2012-02-17 14:21:42 -05:00
Kyle Fiedler
b9d72ebbe2 fix footer for mobile styles 2012-02-17 14:04:23 -05:00
Kyle Fiedler
fd6214ab02 Merged heads 2012-02-17 13:52:23 -05:00
Kyle Fiedler
92afb78c54 Mobile styles 2012-02-17 13:43:04 -05:00
Bridger Maxwell
6498c8862c Generated css 2012-02-17 00:46:30 -05:00
Bridger Maxwell
2c634d35cd Merge 2012-02-17 00:40:27 -05:00
Bridger Maxwell
c4b05e28d9 Merge 2012-02-17 00:38:04 -05:00
Bridger Maxwell
67047cd151 Some changes for code review 
--HG--
branch : bridger-dev
 2012-02-17 00:37:45 -05:00
Bridger Maxwell
6dfaf2a6a4 Added flot library to static (moved from 3rdparty) 2012-02-17 00:30:03 -05:00