Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,998 Commits 1 Branch 0 Tags
3efbc369dd0d40d1f170b3b79fffe1e57749877a
Commit Graph

31998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ahsan Ulhaq
3efbc369dd Merge pull request #9236 from edx/ahsan/Update-reverification-block 
Update edx reverification block on plateform
 2015-08-07 23:26:34 +05:00
Ahsan Ulhaq
ac9a291778 Update edx reverification block on plateform 2015-08-07 22:30:15 +05:00
Peter Fogg
9c58489b38 Merge pull request #9223 from edx/peter-fogg/discussion-admin-delete 
Ensure that discussion admins can delete team posts.
 2015-08-07 11:03:50 -04:00
Sarina Canelake
e09f9ac434 Merge pull request #9230 from edx/sarina/20150807-update-translations 
Update translations (autogenerated message)
 2015-08-07 10:35:34 -04:00
Christina Roberts
dbe74ea340 Merge pull request #9221 from edx/christina/less-assets 
Christina/less assets
 2015-08-07 10:34:20 -04:00
Sarina Canelake
19b44b477f Update translations (autogenerated message) 2015-08-07 09:54:08 -04:00
Waheed Ahmed
32b0dc1989 Merge pull request #8871 from edx/aj/tnl2669-invalid-display-name-export-not-working 
Slashes in Asset Displayname cause `export` to fail
 2015-08-07 18:51:24 +05:00
Bill DeRusha
69a460fdca Merge pull request #9206 from edx/bderusha/teams-full-country-language-names 
Add Full Country & Language Names to Teams
 2015-08-07 09:49:48 -04:00
Peter Fogg
90d8774745 Test that discussion admins can delete team posts. 2015-08-07 09:46:12 -04:00
Jesse Zoldak
f37860d36c Merge pull request #9220 from jzoldak/zoldak/circle-noprereq 
No need to install prereqs twice on circleci.com
 2015-08-07 09:20:50 -04:00
cahrens
fd31c68404 Include coffee dependency files in discussion_js. 2015-08-07 09:14:11 -04:00
cahrens
e95e23faf1 Allow discussion vendor files to be bundled. 
Improve client-side performance.
 2015-08-07 09:14:11 -04:00
cahrens
68645db38b Reduce dependency on courseware_js. 
TNL-2945
 2015-08-07 09:14:06 -04:00
Awais Jibran
7bf81195ad Strip aways slashes from the asset 'displayname' as they cause export to fail. 
TNL-2669
 2015-08-07 18:10:26 +05:00
Peter Fogg
24bca27b46 Merge pull request #9219 from edx/peter-fogg/url-routing-bok-choy 
Add Bok Choy tests for URL routing on teams page.
 2015-08-06 15:47:35 -04:00
Matt Drayer
65a9c05adb Merge pull request #9213 from edx/ziafazal/SOL-1075 
sol-1075: On click of Edit of a Live certificate, the system must display a warning message dialog
 2015-08-06 15:04:58 -04:00
cahrens
a7c06fd296 Allow image files to be cached. 2015-08-06 14:56:28 -04:00
Zia Fazal
97c3bd1cfd on clicking Edit of certificate config show prompt 2015-08-06 13:48:28 -04:00
Peter Fogg
e0e895a531 Add Bok Choy tests for teams page URL routing. 2015-08-06 13:32:48 -04:00
Bill DeRusha
2398824bba Add Full Country & Language Names to Teams [TNL-2891] 2015-08-06 13:17:01 -04:00
Jesse Zoldak
f8766891f0 No need to install prereqs twice on circleci.com 2015-08-06 13:09:06 -04:00
Ned Batchelder
117bc4a94e Merge pull request #9216 from edx/ned/speed-i18n-extract 
Ignore more directories to speed up extracting i18n strings.
 2015-08-06 12:37:12 -04:00
Andy Armstrong
1a251a4900 Merge pull request #9105 from edx/andya/team-discussion-component 
Show discussion component on Team view
 2015-08-06 12:21:27 -04:00
Matt Drayer
3570d08856 Merge pull request #9197 from edx/ziafazal/SOL-1077-fix 
SOL-1077: certificate config edit/delete is only allowed if user is edX PM or for those certificate configs not active
 2015-08-06 11:36:03 -04:00
Peter Fogg
2f7fa6fd8b Enforce discussions permissions in teams UI. 
Adds a read-only mode to the discussion module which disables any
controls for updating the discussion (votes, follows, replies,
etc). This mode is enabled for users who are not a member of the team,
and are also not moderators, admins, or community TAs.
 2015-08-06 11:15:56 -04:00
Daniel Friedman
f5840489a0 Allow editing of own post in team discussion 2015-08-06 11:15:55 -04:00
Marco Morales
dd67f8aa72 updated inline discussion styling to account for lack of expand / show message (which was being relied on for layout) and also removed issues of generic pagination styling impacting the older inline discussion pagination pattern with a class renaming 2015-08-06 11:15:55 -04:00
cahrens
41173fefee Only verify course access for threads with course context. 2015-08-06 11:15:55 -04:00
Andy Armstrong
63da1907eb Show inline discussion component on Team view 
TNL-2515
 2015-08-06 11:15:55 -04:00
Ned Batchelder
2300f382cf Ignore more directories to speed up extracting i18n strings. 
Also, remove the one use of _() in a test feature, since there's no
point.
 2015-08-06 10:39:04 -04:00
David Baumgold
df936837ae Merge pull request #9210 from edx/dont-click-here 
Should never just link the word 'here'
 2015-08-06 10:10:43 -04:00
Ben Patterson
c4eed7bbc2 Merge pull request #9196 from edx/benp/bok-choy-shard-7 
Benp/bok choy shard 7
 2015-08-06 07:27:56 -04:00
Syed Hasan raza
486aa58fe7 Merge pull request #8889 from edx/shr/bug/TNL-2686-library-export-then-import-error 
Test library failed to export after import
 2015-08-06 02:09:05 -07:00
David Baumgold
668c7fdca3 Should never just link the word 'here' 2015-08-05 15:53:51 -04:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00
Jesse Zoldak
4c9b66376a Merge pull request #9205 from edx/zoldak/script-cleanup-2 
Clean up unused CI scripts
 2015-08-05 15:21:33 -04:00
Ben Patterson
92c9c1d529 New bok-choy shard (#7). 2015-08-05 13:52:39 -04:00
Jesse Zoldak
a147857a43 Merge pull request #9091 from jzoldak/zoldak/test-circle 
Configure for unit tests to run on circleci
 2015-08-05 13:27:56 -04:00
Jesse Zoldak
8672455fda Get circleci configuration working for forks 2015-08-05 13:25:30 -04:00
Matt Drayer
f7594ecdcb Merge pull request #9149 from edx/ziafazal/SOL-1088 
ziafazal/SOL-1088: Show Certificate function only when advanced setting is true
 2015-08-05 12:38:37 -04:00
Nimisha Asthagiri
73810f6a23 Merge pull request #8888 from edx/mobile/MA-977-supports 
MA-977 Use "supports" decorator on XBlocks for multi-device support
 2015-08-05 12:29:25 -04:00
Nimisha Asthagiri
5a44f391b0 MA-977 Use "supports" decorator on XBlocks for multi-device support 2015-08-05 11:37:33 -04:00
Jesse Zoldak
7713bed48f Clean up unused CI scripts 
Most of these were originally created under TE-465 for
aggregating results in Solano. See PR #5672.
 2015-08-05 11:32:15 -04:00
Clinton Blackburn
5c8f79c067 Merge pull request #9203 from edx/release 
ECOM Patch 2015-08-04
 2015-08-05 11:31:48 -04:00
Clinton Blackburn
09405a758e Merge pull request #9193 from edx/patch/2015-08-04 
ECOM Patch
 2015-08-05 10:08:18 -04:00
Muhammad Ammar
205f341730 Merge pull request #9075 from edx/ammar/tnl1899-create-new-team 
Create new team
 2015-08-05 18:44:00 +05:00
muhammad-ammar
69450fce47 create a new team 
TNL-1899
 2015-08-05 17:55:26 +05:00
Matt Drayer
70d4d885e7 Merge pull request #9185 from edx/asadiqbal08/SOL-1035 
asadiqbal08/SOL-1035: Signatory fields should use placeholders and not text values
 2015-08-05 08:31:30 -04:00
Zia Fazal
e11c1d120c certificate edit/delete is only allowed if user is edX PM or certificate is not active 
removed org helper
 2015-08-05 13:45:43 +05:00
John Eskew
56da28526e Merge pull request #9155 from edx/jeskew/csm_api_events_to_datadog 
Add DataDog histogram events to DjangoXBlockUserStateClient class.
 2015-08-04 18:19:55 -04:00