Commits · 1457c21f41e77a800c5a5a32fa51835f5ab7bdc7 · edx / edx-platform · GitLab

19 Mar, 2012 13 commits
- Merge remote-tracking branch '3rdParty/master' into pmitros-name-change · 1457c21f
  Calen Pennington committed Mar 19, 2012
  
  1457c21f Browse Files
- Merge remote-tracking branch 'templates/pmitros-name-change' into pmitros-name-change · 7954f9d4
  Calen Pennington committed Mar 19, 2012
  
  7954f9d4 Browse Files
- Merge remote-tracking branch 'static/master' into pmitros-name-change · 6c9b8e72
  Calen Pennington committed Mar 19, 2012
  
  6c9b8e72 Browse Files
- Move to subdirectory in prepartion for merge · 2f0b3918
  Calen Pennington committed Mar 19, 2012
  
  2f0b3918 Browse Files
- Copying hgignore to gitignore · d094d8c1
  Calen Pennington committed Mar 19, 2012
  
  d094d8c1 Browse Files
- Fix up the symlinks to point to the right place · fc687771
  Calen Pennington committed Mar 19, 2012
  
  fc687771 Browse Files
- Updating pointers to new merged repo locations · 816edd19
  Calen Pennington committed Mar 19, 2012
  
  816edd19 Browse Files
- Splitting files into subdirectories in preparation for merge · 6dc7fd6e
  Calen Pennington committed Mar 19, 2012
  
  6dc7fd6e Browse Files
- Remove file in 3rdParty · 4f65c6e6
  Calen Pennington committed Mar 19, 2012
  
  4f65c6e6 Browse Files
- Move to subdirectory in preparation for merge · 799816a3
  Calen Pennington committed Mar 19, 2012
  
  799816a3 Browse Files
- Import from hg · 70832c7d
  Calen Pennington committed Mar 19, 2012
  
  70832c7d Browse Files
- Unknown changes/pre-git transition · 0702a845
```
--HG--
branch : pmitros-name-change
rename : activation_email.txt => emails/activation_email.txt
rename : activation_email_subject.txt => emails/activation_email_subject.txt
```
  Piotr Mitros committed Mar 19, 2012
  0702a845 Browse Files
- Unknown changes/pre-git transition · 9882b30c
```
--HG--
branch : pmitros-name-change
```
  Piotr Mitros committed Mar 19, 2012
  9882b30c Browse Files
15 Mar, 2012 4 commits
- Non-working code; Cale needs a commit/push · 7c73d7ef
```
--HG--
branch : pmitros-name-change
```
  Piotr Mitros committed Mar 15, 2012
  7c73d7ef Browse Files
- Fixed the layout of the graph gradebook · 269334a8
  Reda Lemeden committed Mar 15, 2012
  
  269334a8 Browse Files
- Migration · cbfeb79e
```
--HG--
branch : pmitros-name-change
```
  Piotr Mitros committed Mar 14, 2012
  cbfeb79e Browse Files
- Adding name and e-mail changes · 0ea176f6
```
--HG--
branch : pmitros-name-change
```
  Piotr Mitros committed Mar 14, 2012
  0ea176f6 Browse Files
14 Mar, 2012 8 commits
- Merged css · 98a4b48e
  Kyle Fiedler committed Mar 14, 2012
  
  98a4b48e Browse Files
- New sass generated css · d2b8a2c8
  Kyle Fiedler committed Mar 14, 2012
  
  d2b8a2c8 Browse Files
- Added new styles for pages that are not inside the app or marketing · b4f15d7c
  Kyle Fiedler committed Mar 14, 2012
  
  b4f15d7c Browse Files
- Added some more markup and added styles for the email and profile changes · b2765395
```
--HG--
branch : pmitros-name-change
```
  Kyle Fiedler committed Mar 14, 2012
  b2765395 Browse Files
- Edited html for the name, email and unenroll modal windows · 7c6a41b5
```
--HG--
branch : pmitros-name-change
```
  Kyle Fiedler committed Mar 14, 2012
  7c6a41b5 Browse Files
- Minor update · f4a71d94
```
--HG--
branch : pmitros-name-change
```
  Piotr Mitros committed Mar 14, 2012
  f4a71d94 Browse Files
- Dialogs for name changes, etc. (non-working) · f0cbbcea
```
--HG--
branch : pmitros-name-change
```
  Piotr Mitros committed Mar 14, 2012
  f0cbbcea Browse Files
- Name change branch created · 7281cc50
```
--HG--
branch : pmitros-name-change
```
  Piotr Mitros committed Mar 14, 2012
  7281cc50 Browse Files
13 Mar, 2012 4 commits
- Minor change -- disable caching on DEV machines · 11f48207
  Piotr Mitros committed Mar 13, 2012
  
  11f48207 Browse Files
- Make warnings show in IE 9 · 3966a068
  Kyle Fiedler committed Mar 13, 2012
  
  3966a068 Browse Files
- Merged heads · 2fc4477e
  Kyle Fiedler committed Mar 13, 2012
  
  2fc4477e Browse Files
- Added some fixes to bugs in the updates, refactored the cream color to a sass… · 731ca112
```
Added some fixes to bugs in the updates, refactored the cream color to a sass variable and highlighted latest update
```
  Kyle Fiedler committed Mar 13, 2012
  731ca112 Browse Files
12 Mar, 2012 5 commits
- Merged in gradebook · da866520
  Piotr Mitros committed Mar 12, 2012
  
  da866520 Browse Files
- Fixed askbot layout bug · ec4c1786
  Reda Lemeden committed Mar 12, 2012
  
  ec4c1786 Browse Files
- Fixed id conflict in Askbot · d3c4c2ee
  Reda Lemeden committed Mar 12, 2012
  
  d3c4c2ee Browse Files
- Restyled the gradebook · 3654c033
```
--HG--
branch : rl-gradebook
```
  Reda Lemeden committed Mar 12, 2012
  3654c033 Browse Files
- Extract complete user info into a json file · 12c3c4cc
  Piotr Mitros committed Mar 11, 2012
  
  12c3c4cc Browse Files
11 Mar, 2012 6 commits
- merge · 4f4f3a75
  Ernie Park committed Mar 11, 2012
  
  4f4f3a75 Browse Files
- Added pi · 7812b4a2
  Piotr Mitros committed Mar 11, 2012
  
  7812b4a2 Browse Files
- Better error messages · 909aec43
  Piotr Mitros committed Mar 10, 2012
  
  909aec43 Browse Files
- Better error message · e8c7e552
  Piotr Mitros committed Mar 10, 2012
  
  e8c7e552 Browse Files
- Basic gradebook · e2995a9e
  Piotr Mitros committed Mar 10, 2012
  
  e2995a9e Browse Files
- Basic gradebook · 837b9c90
  Piotr Mitros committed Mar 10, 2012
  
  837b9c90 Browse Files