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

1364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Piotr Mitros
2e905dc70c More of e-mail change process works 2012-03-19 21:24:21 -04:00
Calen Pennington
1457c21f41 Merge remote-tracking branch '3rdParty/master' into pmitros-name-change 2012-03-19 11:10:48 -04:00
Calen Pennington
7954f9d482 Merge remote-tracking branch 'templates/pmitros-name-change' into pmitros-name-change 2012-03-19 11:10:48 -04:00
Calen Pennington
6c9b8e727e Merge remote-tracking branch 'static/master' into pmitros-name-change 2012-03-19 11:10:48 -04:00
Calen Pennington
2f0b39189a Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
d094d8c1dd 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
816edd1904 Updating pointers to new merged repo locations 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
Piotr Mitros
7c73d7ef41 Non-working code; Cale needs a commit/push 
--HG--
branch : pmitros-name-change
 2012-03-15 15:50:15 -04:00
Reda Lemeden
269334a839 Fixed the layout of the graph gradebook 2012-03-15 10:58:39 -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
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
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
Reda Lemeden
ec4c1786cf Fixed askbot layout bug 2012-03-12 17:33:51 -04:00
Reda Lemeden
d3c4c2eeeb Fixed id conflict in Askbot 2012-03-12 17:16:26 -04:00
Reda Lemeden
3654c0339e Restyled the gradebook 
--HG--
branch : rl-gradebook
 2012-03-12 16:46:10 -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
7812b4a2c4 Added pi 2012-03-11 16:50:14 -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
e2995a9e60 Basic gradebook 2012-03-10 22:31:58 -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