Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 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
Calen Pennington
d094d8c1dd Copying hgignore to gitignore 2012-03-19 11:10:44 -04:00
Calen Pennington
317542ad19 Updating pointers to new merged repo locations 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
816edd1904 Updating pointers to new merged repo locations 2012-03-19 11:10:44 -04:00
Calen Pennington
1bc3835fe6 Splitting files into subdirectories in preparation for merge 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
6dc7fd6ea5 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
Calen Pennington
70832c7db3 Import from hg 2012-03-19 11:05:25 -04:00
Piotr Mitros
0702a84587 Unknown changes/pre-git transition 
--HG--
branch : pmitros-name-change
rename : activation_email.txt => emails/activation_email.txt
rename : activation_email_subject.txt => emails/activation_email_subject.txt
 2012-03-19 09:26:16 -04:00
Piotr Mitros
9882b30c83 Unknown changes/pre-git transition 
--HG--
branch : pmitros-name-change
 2012-03-19 09:25:42 -04:00
Kyle Fiedler
5ceb79df9c Merged kf-titles 2012-03-15 16:48:31 -04:00
Kyle Fiedler
ea7e006a38 merged default 
--HG--
branch : kf-titles
 2012-03-15 16:47:59 -04:00
Kyle Fiedler
3a84bafa48 merged in kf-links 2012-03-15 16:33:30 -04:00
Kyle Fiedler
057185f69e Merged in default 
--HG--
branch : kf-links
 2012-03-15 16:32:55 -04:00
Kyle Fiedler
3da8b8133f Added minor ui changes 2012-03-15 16:28:36 -04:00
Piotr Mitros
7c73d7ef41 Non-working code; Cale needs a commit/push 
--HG--
branch : pmitros-name-change
 2012-03-15 15:50:15 -04:00
David Ormsbee
8949c5e6bf merged in session cache separation 2012-03-15 15:30:41 -04:00
David Ormsbee
d9253a0c0f remove unnecessary settings import 
--HG--
branch : cache_separation
 2012-03-15 15:25:39 -04:00
David Ormsbee
f4625003a7 change config to not cache by default, unless overridden by server-specific settings.py 
--HG--
branch : cache_separation
 2012-03-15 15:21:39 -04:00
David Ormsbee
e37eb49065 Shift wiki and course.xml caching to use newly defined 'general' cache, separate from sessions left in 'default' 
--HG--
branch : cache_separation
 2012-03-15 14:45:27 -04:00
Reda Lemeden
269334a839 Fixed the layout of the graph gradebook 2012-03-15 10:58:39 -04:00
Reda Lemeden
99f4f7324d Fixed the layout of the graph gradebook 
--HG--
branch : bridger-grades
 2012-03-15 10:57:59 -04:00
Piotr Mitros
cbfeb79eb6 Migration 
--HG--
branch : pmitros-name-change
 2012-03-14 23:04:56 -04:00
Piotr Mitros
0ea176f665 Adding name and e-mail changes 
--HG--
branch : pmitros-name-change
 2012-03-14 22:56:20 -04:00
Bridger Maxwell
d8b596148c Removed some accidental typing from gradebook.html 
--HG--
branch : bridger-grades
 2012-03-14 18:09:40 -04:00
Bridger Maxwell
a1f630470f Merged in default branch. Gradebook is now graphs with standard header/footer 
--HG--
branch : bridger-grades
 2012-03-14 18:03:46 -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
Kyle Fiedler
e09310e9c9 added fix for error pages and for password reset page 2012-03-14 17:32:05 -04:00
Kyle Fiedler
b2765395b1 Added some more markup and added styles for the email and profile changes 
--HG--
branch : pmitros-name-change
 2012-03-14 16:24:26 -04:00
Kyle Fiedler
7c6a41b542 Edited html for the name, email and unenroll modal windows 
--HG--
branch : pmitros-name-change
 2012-03-14 14:14:48 -04:00
Piotr Mitros
f4a71d9447 Minor update 
--HG--
branch : pmitros-name-change
 2012-03-14 12:28:10 -04:00
Piotr Mitros
f0cbbceaed Dialogs for name changes, etc. (non-working) 
--HG--
branch : pmitros-name-change
 2012-03-14 12:27:12 -04:00
Piotr Mitros
7281cc50ed Name change branch created 
--HG--
branch : pmitros-name-change
 2012-03-14 11:03:32 -04:00
Piotr Mitros
11f4820704 Minor change -- disable caching on DEV machines 2012-03-13 15:46:57 -04:00
Kyle Fiedler
3966a06888 Make warnings show in IE 9 2012-03-13 10:00:03 -04:00
Kyle Fiedler
2fc4477e44 Merged heads 2012-03-13 09:22:13 -04:00
Kyle Fiedler
731ca112bc Added some fixes to bugs in the updates, refactored the cream color to a sass variable and highlighted latest update 2012-03-13 09:21:34 -04:00
Piotr Mitros
da8665204b Merged in gradebook 2012-03-12 18:52:04 -04:00
Bridger Maxwell
3be5423b07 Small refactor on the grades. Also made the gradebook render a graph for each student 
--HG--
branch : bridger-grades
 2012-03-12 18:10:37 -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
Kyle Fiedler
aac7cb090d AMerged default 
--HG--
branch : kf-titles
 2012-03-12 17:26:35 -04:00
Kyle Fiedler
d4a26f62f8 Added titles to the rest of the pages 
--HG--
branch : kf-titles
 2012-03-12 17:26:15 -04:00
Kyle Fiedler
4f1aedba0b Added titles to most of the pages 
--HG--
branch : kf-titles
 2012-03-12 17:20:13 -04:00
Reda Lemeden
d3c4c2eeeb Fixed id conflict in Askbot 2012-03-12 17:16:26 -04:00
Kyle Fiedler
0c783d19c3 Merged with default 
--HG--
branch : kf-links
 2012-03-12 17:05:12 -04:00