Commits · 2aafff35f040ddefddfdefe80a2d2b7d62187f59 · edx / edx-platform · GitLab

13 Jul, 2016 12 commits
- more fixes · 2aafff35
  Ehtesham committed Jul 13, 2016
  
  2aafff35 Browse Files
- test fixes · ff999d76
  Ehtesham committed Jul 13, 2016
  
  ff999d76 Browse Files
- conditionally adding response_data in context · 62059b58
  Ehtesham committed Jul 13, 2016
  
  62059b58 Browse Files
- fixing tag · 5058e42e
  Ehtesham committed Jul 13, 2016
  
  5058e42e Browse Files
- reverting inputtype id · 2bd01eb0
  Ehtesham committed Jul 13, 2016
  
  2bd01eb0 Browse Files
- addressing Mark's feedback · 99bc5510
  Ehtesham committed Jul 13, 2016
  
  99bc5510 Browse Files
- wrapping labels according to sample html · fba80629
  Ehtesham committed Jul 13, 2016
  
  fba80629 Browse Files
- assigning legend for inputtypes · 6dccdbe3
  Ehtesham committed Jul 13, 2016
  
  6dccdbe3 Browse Files
- Merge pull request #12912 from edx/ammar/capa-update-templates-and-move-solution-tag · 60f13379
```
remove solution tag from inputtypes and update default templates
```
  Muhammad Ammar committed Jul 13, 2016
  60f13379 Browse Files
- * remove <solution> from inputtypes · ad0a9fe8
```
* update defaults templates

TNL-4822 FEDX-208
```
  muhammad-ammar committed Jul 13, 2016
  ad0a9fe8 Browse Files
- separation based on responsetypes poc · f3baf4cf
```
FEDX-176
```
  muhammad-ammar committed Jul 13, 2016
  f3baf4cf Browse Files
- Merge pull request #12880 from caseylitton/up_logistration_toggle_footer_setting · 0332ebea
```
Add flag allow toggle logistration footer
```
  Douglas Hall committed Jul 12, 2016
  0332ebea Browse Files
12 Jul, 2016 12 commits
- Merge pull request #12953 from edx/clrux/ac-517 · facb1eb8
```
AC-517 fixes `color-contrast` ignores
```
  Chris committed Jul 12, 2016
  facb1eb8 Browse Files
- Add flag allow toggle logistration footer · a6e028c6
  caseylitton committed Jul 12, 2016
  
  a6e028c6 Browse Files
- Add name and email to Authors · 6761be0b
  caseylitton committed Jul 12, 2016
  
  6761be0b Browse Files
- AC-517 fixes `color-contrast` ignores across platform · 4e4c740c
  Chris Rodriguez committed Jul 12, 2016
  
  4e4c740c Browse Files
- Merge pull request #12983 from edx/clrux/safelint-fixup · 3d76f092
```
Safelint violation count
```
  Chris committed Jul 12, 2016
  3d76f092 Browse Files
- Merge pull request #12982 from edx/zoldak/SOL-1811 · e33ddbea
```
Mark test for skipping SOL-1811
```
  Jesse Zoldak committed Jul 12, 2016
  e33ddbea Browse Files
- Safelint violation count · 1b7fe597
  Chris Rodriguez committed Jul 12, 2016
  
  1b7fe597 Browse Files
- Merge pull request #12965 from edx/renzo/catalog-config-model · b1fcc51c
```
Add ConfigurationModel governing integration with the catalog service.
```
  Renzo Lucioni committed Jul 12, 2016
  b1fcc51c Browse Files
- Mark test for skipping SOL-1811 · c6e08137
  Jesse Zoldak committed Jul 12, 2016
  
  c6e08137 Browse Files
- Merge pull request #12750 from edx/clrux/ac-486 · 53c98f10
```
AC-486 updating tabbed_view to use proper accessibility rules
```
  Chris committed Jul 12, 2016
  53c98f10 Browse Files
- AC-486 updating tabbed_view to be accessible · 298f168e
  Chris Rodriguez committed Jul 12, 2016
  
  298f168e Browse Files
- Merge pull request #12968 from edx/asadiqbal08/WL-552 · 7147a694
```
asadiqbal08/WL-552 ID-Verification message is responsive in activate account page
```
  Asad Iqbal committed Jul 12, 2016
  7147a694 Browse Files
11 Jul, 2016 16 commits
- Merge pull request #12939 from edx/sstudent/TNL-4924 · d13e4569
```
moving milestones/gating check to access.py
```
  sanfordstudent committed Jul 11, 2016
  d13e4569 Browse Files
- Merge pull request #12971 from edx/derf/go_away_pycharm · d82292cb
```
Remove pycharm project files and gitignore
```
  Fred Smith committed Jul 11, 2016
  d82292cb Browse Files
- Merge pull request #12954 from edx/renzo/extract-token-generation · e7cdcb9b
```
Unify JWT generation code
```
  Renzo Lucioni committed Jul 11, 2016
  e7cdcb9b Browse Files
- Merge pull request #12901 from edx/douglashall/WL-541 · a873bf7c
```
WL-541 Add recipient key to Zendesk ticket creation API request payload
```
  Douglas Hall committed Jul 11, 2016
  a873bf7c Browse Files
- Add recipient key to Zendesk ticket creation API request payload · c38f2373
  Douglas Hall committed Jul 11, 2016
  
  c38f2373 Browse Files
- Add ConfigurationModel governing integration with the catalog service. · 191a3530
```
This is the first in a series of commits that will retrieve and use data from the catalog API. Part of ECOM-4566.
```
  Renzo Lucioni committed Jul 11, 2016
  191a3530 Browse Files
- moving milestones check to access.py · 5db58c00
  Sanford Student committed Jul 11, 2016
  
  5db58c00 Browse Files
- Merge pull request #12893 from edx/jeskew/control_chars_in_string_fields · 4fca1d9d
```
Update version of XBlock repo.
```
  John Eskew committed Jul 11, 2016
  4fca1d9d Browse Files
- ignore pycharm project files · 6a4f4ca8
  Fred Smith committed Jul 11, 2016
  
  6a4f4ca8 Browse Files
- remove pycharm created files · bbc81fe9
  Fred Smith committed Jul 11, 2016
  
  bbc81fe9 Browse Files
- PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Update git.xml Create conda_packages.xml · e07094bf
  alisan617 committed Jul 11, 2016
  
  e07094bf Browse Files
- PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' · fdd7e46e
  alisan617 committed Jul 11, 2016
  
  fdd7e46e Browse Files
- PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Create IntelliLang.xml, laf.xml,… · 72b6ec82
```
PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Create IntelliLang.xml, laf.xml, ide.general.xml, web-browsers.xml, Default.xml, databaseSettings.xml, diff.xml, git.xml, keymap.xml, debugger.xml, packages.xml
```
  alisan617 committed Jul 11, 2016
  72b6ec82 Browse Files
- PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' · b2b66980
```
Conflicts:
	diff.xml
```
  alisan617 committed Jul 11, 2016
  b2b66980 Browse Files
- Merge pull request #12959 from edx/PERF-346 · 54fa8aeb
```
[PERF-346] Add a second version component to versioned course asset URLs
```
  Toby Lawrence committed Jul 11, 2016
  54fa8aeb Browse Files
- WL-552 · 682fde96
  asadiqbal committed Jul 11, 2016
  
  682fde96 Browse Files