Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,669 Commits 1 Branch 0 Tags
8d0bc488e12e5b300636b8f3cd6dea8255e2564b
Commit Graph

32669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christine Lytwynec
8d0bc488e1 Merge pull request #9664 from edx/clytwynec/AC-166 
Remove unicode quotes in courseware html attrs
 2015-09-09 09:43:37 -04:00
Muzaffar yousaf
4aa38330b8 Merge pull request #9622 from edx/muzaffar/upgrade-django-sekizai 
Upgrading django-sekizai
 2015-09-09 15:41:20 +05:00
muzaffaryousaf
e33d1dc563 Upgrading django-sekizai 
TNL-2811
 2015-09-09 14:33:13 +05:00
Muzaffar yousaf
d17bff1cbb Merge pull request #9645 from edx/muzaffar/upgrade-django-ses 
Upgrading django-ses
 2015-09-09 14:19:40 +05:00
muzaffaryousaf
86553c2f13 Upgrading django-ses 
TNL-2811
 2015-09-09 12:56:44 +05:00
Muzaffar yousaf
0ee2112b78 Merge pull request #9573 from edx/muzaffar/upgrade-mock-django 
Upgrade mock-django in platform & released version for edx-search.
 2015-09-09 12:40:50 +05:00
Ahsan Ulhaq
de6d49701b Merge pull request #9447 from edx/ahsan/ECOM-2118-Credit-Eligible-Assessments-Appear-in-Incorrect-Order 
Credit-Eligible Assessments Appearing in Incorrect Order
 2015-09-09 12:28:54 +05:00
muzaffaryousaf
0ed729b0ca Upgrading edx-search version in platform 
TNL-3136
 2015-09-09 11:49:15 +05:00
muzaffaryousaf
6be65f6595 Upgrade mock-django to 0.6.9. 2015-09-09 11:49:12 +05:00
Muzaffar yousaf
4c2dc816bb Merge pull request #9617 from edx/muzaffar/django-upgrade-simple-history 
Upgrading django-simple-history to 1.6.3
 2015-09-09 11:38:23 +05:00
Brian Beggs
bc685451ea Merge pull request #9568 from edx/bbeggs/lettuce-1.8-upgrade 
Update lettuce to work with Django 1.4 - 1.8
 2015-09-08 20:30:52 -04:00
Andy Armstrong
a08fe9fb06 Merge pull request #9059 from edx/andya/faster-update-assets 
Don't package or optimize assets on devstack
 2015-09-08 16:48:11 -04:00
Kevin Falcone
ee7d47c7ec Merge pull request #9640 from edx/jibsheet/lti-consumer-default-token 
Use the oauth provider utils to ship a generated key/secret
 2015-09-08 16:15:59 -04:00
Christine Lytwynec
9a45e831ac Merge pull request #9497 from edx/clytwynec/AC-155 
Add role="presentation" to .course-wrapper to prevent table
 2015-09-08 15:43:46 -04:00
Brian Beggs
b7006533a2 updating lettuce to work with Django 1.4 - 1.8 2015-09-08 15:42:11 -04:00
Christine Lytwynec
3aff77021a Remove unicode quotes in courseware html attrs 2015-09-08 15:41:31 -04:00
Diana Huang
0b78ffdf83 Merge pull request #9632 from edx/diana/teams-changed-event 
Add events for tracking when teams are edited.
 2015-09-08 15:21:49 -04:00
Brian Beggs
c45b8a1720 Merge pull request #9657 from edx/ammar/remove-django-robots-from-requiremtns.txt 
Remove django-robots from docs/shared/requirements.txt
 2015-09-08 14:52:58 -04:00
Brian Beggs
ef032e9ab4 Merge pull request #9652 from edx/ammar/remove-django-kombu 
Remove django-kombu
 2015-09-08 14:38:23 -04:00
Brian Beggs
2557e4714b Merge pull request #9644 from edx/ammar/remove-django-masquerade 
Remove django-masquerade
 2015-09-08 14:36:11 -04:00
Brian Beggs
c430422fca Merge pull request #9643 from edx/ammar/remove-django-settings-context-processor 
Remove django-settings-context-processor
 2015-09-08 14:30:14 -04:00
Brian Beggs
be55e36d65 Merge pull request #9620 from edx/ammar/update-django-ratelimit-backend 
update django-ratelimit-backend
 2015-09-08 14:17:06 -04:00
chrisndodge
815a3d6cf3 Merge pull request #9646 from edx/muhhshoaib/SOL-1171-return-display-string-from-backbone-view 
SOL-1171
 2015-09-08 14:09:06 -04:00
Sarina Canelake
3015c4a51d Merge pull request #9638 from jolyonb/fixspace 
Fixing spacing in tooltip
 2015-09-08 13:00:05 -04:00
Jesse Zoldak
19b705ac73 Merge pull request #9659 from edx/zoldak/SOL-1183 
Flag test as flaky SOL-1183
 2015-09-08 11:57:27 -04:00
Jesse Zoldak
89ea9885c5 Merge pull request #9662 from edx/zoldak/edx-lint-027 
Update edx-lint to v0.2.7
 2015-09-08 11:54:34 -04:00
Muhammad Shoaib
1b861b9d81 SOL-1171 
passed the display string to the underscore template so that the word "proctored" is not hard coded in the underscore file.

updated the git tag for proctoring repo
 2015-09-08 11:47:33 -04:00
Ned Batchelder
3415b94aa8 Merge pull request #9655 from edx/ned/disable-pip-version-check 
Disable the pip version check message
 2015-09-08 11:39:04 -04:00
Kevin Falcone
bb285f9f3c Use the oauth provider utils to suggest a key/secret 
You can still edit this to meet your needs, but you won't need to
manually generate one.
 2015-09-08 11:28:28 -04:00
Jesse Zoldak
0ce72adbf1 Update edx-lint to v0.2.7 2015-09-08 11:15:33 -04:00
Jesse Zoldak
baa7bbdd94 Flag test as flaky SOL-1183 2015-09-08 10:36:10 -04:00
Matt Drayer
3949242c43 Merge pull request #9656 from edx/saleem-latif/authors 
Updated AUTHORS File
 2015-09-08 09:55:12 -04:00
muhammad-ammar
19c89a3c84 remove django-robots from docs/shared/requirements.txt 2015-09-08 18:06:55 +05:00
Saleem Latif
d0aff223ad updated AUTHORS file 2015-09-08 17:36:43 +05:00
Zubair Afzal
dae0285af8 Merge pull request #9473 from edx/zub/story/ecom-2044-login-registration-requirejs 
use the standard syntax to load JavaScript dependencies on logistrati…
 2015-09-08 17:30:33 +05:00
Matt Drayer
bd3dfee911 Merge pull request #9629 from edx/asadiqbal08/SOL-1159 
SOL-1159 Remove hash cert asset file name
 2015-09-08 08:10:01 -04:00
Ned Batchelder
0dea5605c0 Disable the pip version check message 
This message is being shown to people who should not be deciding whether
to upgrade pip, so it is just confusing and alarming noise.

Before:

---> pavelib.prereqs.install_prereqs
---> pavelib.prereqs.install_ruby_prereqs
Ruby prereqs unchanged, skipping...
---> pavelib.prereqs.install_node_prereqs
Node prereqs unchanged, skipping...
---> pavelib.prereqs.install_python_prereqs
pip install -q --exists-action w -r requirements/edx/pre.txt
You are using pip version 6.0.8, however version 7.1.2 is available.
You should consider upgrading via the 'pip install --upgrade pip' command.
pip install -q --exists-action w -r requirements/edx/github.txt
You are using pip version 6.0.8, however version 7.1.2 is available.
You should consider upgrading via the 'pip install --upgrade pip' command.
Could not find a tag or branch '96e1922348bfe6d99201b9512a9ed946c87b7e0b', assuming commit.
Could not find a tag or branch 'b0686a76f1ce3532088c4aee6e76b9abe61cc808', assuming commit.
Could not find a tag or branch '88ec8a011e481918fdc9d2682d4017c835acd8be', assuming commit.

After:

---> pavelib.prereqs.install_prereqs
---> pavelib.prereqs.install_ruby_prereqs
Ruby prereqs unchanged, skipping...
---> pavelib.prereqs.install_node_prereqs
Node prereqs unchanged, skipping...
---> pavelib.prereqs.install_python_prereqs
pip install -q --disable-pip-version-check --exists-action w -r requirements/edx/pre.txt
pip install -q --disable-pip-version-check --exists-action w -r requirements/edx/github.txt
Could not find a tag or branch '96e1922348bfe6d99201b9512a9ed946c87b7e0b', assuming commit.
Could not find a tag or branch 'b0686a76f1ce3532088c4aee6e76b9abe61cc808', assuming commit.
Could not find a tag or branch '88ec8a011e481918fdc9d2682d4017c835acd8be', assuming commit.
 2015-09-08 07:18:15 -04:00
muhammad-ammar
5858d62b53 remove django-kombu 2015-09-08 15:09:37 +05:00
muhammad-ammar
6163d2e071 Remove django-masquerade 
TNL-2811
 2015-09-08 14:22:30 +05:00
Muhammad Ammar
9aba4a72f4 Merge pull request #9621 from edx/ammar/update-django-robots 
update django-robots
 2015-09-08 14:17:52 +05:00
muhammad-ammar
1fcdc9de2e update django-ratelimit-backend 2015-09-08 14:09:57 +05:00
Ahsan Ulhaq
ea40c2f1c6 Credit-Eligible Assessments Appearing in Incorrect Order 
ECOM-2118
 2015-09-08 14:00:13 +05:00
Muhammad Shoaib
f495c135d6 Merge pull request #9458 from edx/muhhshoaib/PHX-update-dialog-box-css 
PHX-120
 2015-09-08 12:41:12 +05:00
zubair-arbi
d2a4790855 use the standard syntax to load JavaScript dependencies on logistration js files 
ECOM-2044
 2015-09-07 18:19:56 +05:00
asadiqbal
17f10d21d0 SOL-1159 2015-09-07 16:24:09 +05:00
Afeef Janjua
3ac27a5d6b Merge pull request #9625 from edx/afeef/bugfix/tnl-3094-unit-ribbon-courseware-z-index-fix 
pushed the unit ribbon in lms courseware to back which brought the us…
 2015-09-07 16:04:10 +05:00
muhammad-ammar
044788dbf2 Remove django-settings-context-processor 
TNL-2811
 2015-09-07 14:38:51 +05:00
Jolyon Bloomfield
8e04f92167 Fixing spacing in tooltip 2015-09-06 15:37:19 -04:00
Diana Huang
8c1bf2cd3a Add events for tracking when teams are edited. 
TNL-3190
 2015-09-04 15:27:40 -04:00
Peter Fogg
1ba4200a84 Merge pull request #9624 from edx/peter-fogg/forum-teams-events 
Update discussion events to include team_id when appropriate.
 2015-09-04 13:58:43 -04:00