Commits · 157bd19e20b66fb0c89970914cf321477ce040c2 · edx / edx-platform · GitLab

12 Jan, 2016 5 commits
- Clear out the bok choy DB with reset_db, not flush · 157bd19e
  Jesse Zoldak committed Jan 12, 2016
  
  157bd19e Browse Files
- fix for course number display string as none · 0b685d89
  M. Rehan committed Jan 12, 2016
  
  0b685d89 Browse Files
- Fixed POST bookmarks bug when display_name is None. · b4189784
```
Added tests & general message to js when parsing fails.

TNL-3989
```
  muzaffaryousaf committed Jan 12, 2016
  b4189784 Browse Files
- Updated edx-proctoring requirement to fix PHX-242 · 2c00004d
  Douglas Hall committed Jan 12, 2016
  
  2c00004d Browse Files
- Merge pull request #11180 from edx/rc/2016-01-12 · dd6dc019
```
Release Candidate rc/2016-01-12
```
  Mark Sadecki committed Jan 12, 2016
  dd6dc019 Browse Files
11 Jan, 2016 5 commits
- Merge pull request #11191 from edx/revert-10648-edraak/calculator-fixups-rc · aacad7e9
```
@Revert 10648 edraak/calculator fixups
```
  Adam committed Jan 11, 2016
  aacad7e9 Browse Files
- Revert "Calculator layout and help popup fixes" · e4ab6dc2
  Adam committed Jan 11, 2016
  
  e4ab6dc2 Browse Files
- Merge pull request #11183 from edx/ormsbee/fix_atomic_thumbnail_error · 95434f7b
```
Prevent course image thumbnail race condition from causing TransactionManagementError
```
  David Ormsbee committed Jan 11, 2016
  95434f7b Browse Files
- Move test_get_all_courses_by_mobile_available to CourseOverviewTestCase · c4b0c7b4
```
It somehow ended up in CourseOverviewImageSetTestCase (merge artifact?).
```
  David Ormsbee committed Jan 11, 2016
  c4b0c7b4 Browse Files
- Prevent course image thumbnail race condition. · 0e70676b
```
Without this change, we'd throw a TransactionManagementError in the case
where we have a race condition and generate multiple CourseOverviewImageSets
for the same CourseOverview concurrently.
```
  David Ormsbee committed Jan 11, 2016
  0e70676b Browse Files
08 Jan, 2016 9 commits
- Merge pull request #11181 from edx/perf-224-migrations · 936c4310
```
Add the migrations necessary for asset base URL support.
```
  Toby Lawrence committed Jan 08, 2016
  936c4310 Browse Files
- Add the migrations necessary for asset base URL support. · fb984206
  Toby Lawrence committed Jan 08, 2016
  
  fb984206 Browse Files
- Merge pull request #11176 from edx/peter-fogg/revert-enrollment-api-changes · bf2f8ca8
```
Revert "Add options trailing slashes to the Enrollment API."
```
  Peter Fogg committed Jan 08, 2016
  bf2f8ca8 Browse Files
- Merge pull request #11165 from edx/remove-header_extra.html · 80836087
```
Remove unused header_extra.html file
```
  David Baumgold committed Jan 08, 2016
  80836087 Browse Files
- Revert "Add options trailing slashes to the Enrollment API." · 17a69a30
```
This reverts commit 3149aaa3.
```
  Peter Fogg committed Jan 08, 2016
  17a69a30 Browse Files
- Merge pull request #11173 from edx/asadiqbal08/WL-269 · 59c91398
```
WL-269 used gettext(...) in .underscores files.
```
  Matt Drayer committed Jan 08, 2016
  59c91398 Browse Files
- Merge pull request #11124 from mitocw/fix/aq/progress_of_student_ccx · e5943fee
```
Allowed CCX coaches to see individual students progress from grade book
```
  Peter Pinch committed Jan 08, 2016
  e5943fee Browse Files
- Allowed ccx coaches to see individual students progress from grade book · c0a131e5
  Amir Qayyum Khan committed Jan 08, 2016
  
  c0a131e5 Browse Files
- WL-269 used gettext in .underscores · 323b9193
  asadiqbal committed Jan 08, 2016
  
  323b9193 Browse Files
07 Jan, 2016 11 commits
- Merge pull request #11170 from edx/jsa/programs-app-username · 8d3fe518
```
add username to program app config attrs in DOM.
```
  Jim Abramson committed Jan 07, 2016
  8d3fe518 Browse Files
- add username to program app config attrs in DOM. · 5ae8f5be
  jsa committed Jan 07, 2016
  
  5ae8f5be Browse Files
- Merge pull request #10878 from mitocw/refactor/aq/move_code_from_view · 91be959b
```
CCX app refactoring. Moved some code to utils.py from views.py
```
  Peter Pinch committed Jan 07, 2016
  91be959b Browse Files
- Merge pull request #11154 from ovnicraft/patch-2 · 56207946
```
Remove duplicate import
```
  David Baumgold committed Jan 07, 2016
  56207946 Browse Files
- Remove unused header_extra.html file · 032305df
  David Baumgold committed Jan 07, 2016
  
  032305df Browse Files
- Merge pull request #11161 from edx/asadiqbal08/WL-270 · 3d30bb11
```
WL-270 used gettext in javascript files
```
  Matt Drayer committed Jan 07, 2016
  3d30bb11 Browse Files
- Merge pull request #11156 from edx/asadiqbal08/WL-268 · 388a5dc7
```
WL-268 String Internationalization
```
  Matt Drayer committed Jan 07, 2016
  388a5dc7 Browse Files
- Merge pull request #11140 from edx/saleem-latif/SOL-1431 · 4d7be021
```
SOL-1431: Remove no-op translations from devstack.py
```
  Matt Drayer committed Jan 07, 2016
  4d7be021 Browse Files
- Merge pull request #11139 from edx/asadiqbal08/WL-242 · b7b8c745
```
asadiqbal08/WL-242 - Marked strings on shopping cart pages for translations
```
  Matt Drayer committed Jan 07, 2016
  b7b8c745 Browse Files
- WL-270 used gettext in javascript files · 7f38c1a3
  asadiqbal committed Jan 07, 2016
  
  7f38c1a3 Browse Files
- WL-268 String Internationalization · eca0cd11
  asadiqbal committed Jan 07, 2016
  
  eca0cd11 Browse Files
06 Jan, 2016 10 commits
- Remove duplicate import · 37254720
  Cristian Salamea committed Jan 06, 2016
  
  37254720 Browse Files
- Merge pull request #8289 from edx/danielli/pyfs_xblocks · e87fabe4
```
Add setting for pyfs xblock service to devstack.py
```
  Piotr Mitros committed Jan 06, 2016
  e87fabe4 Browse Files
- Moved code to utility from views ccx · 6c01c85b
  Amir Qayyum Khan committed Jan 07, 2016
  
  6c01c85b Browse Files
- Merge pull request #10648 from OmarIthawi/edraak/calculator-fixups · 4c5c8c18
```
Calculator layout and help popup fixes
```
  Adam committed Jan 06, 2016
  4c5c8c18 Browse Files
- Merge pull request #11152 from edx/christina/course-outline · 4d2a8dbb
```
Delete lettuce tests already converted to bok choy.
```
  Christina Roberts committed Jan 06, 2016
  4d2a8dbb Browse Files
- Delete lettuce tests already converted to bok choy. · 85ff219e
```
TNL-3915
```
  cahrens committed Jan 06, 2016
  85ff219e Browse Files
- Merge pull request #11134 from edx/alasdair/ECOM-3319-add-edx-icons-font-to-programs-page · f489662e
```
ECOM-3319 loading edx-icons fonts in studio programming author tool
```
  AlasdairSwan committed Jan 06, 2016
  f489662e Browse Files
- Merge pull request #11150 from edx/release · 083ff7f0
```
2016-01-06 Release
```
  Matt Drayer committed Jan 06, 2016
  083ff7f0 Browse Files
- Merge pull request #11148 from edx/benp/teams-page-flaky-ff42 · 29befd33
```
Fix failing condition for firefox 42.
```
  Ben Patterson committed Jan 06, 2016
  29befd33 Browse Files
- Merge pull request #11133 from edx/rc/2016-01-05 · 69cb40d5
```
Release Candidate rc/2016-01-05
```
  Matt Drayer committed Jan 06, 2016
  69cb40d5 Browse Files