Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
24,365 Commits 1 Branch 0 Tags
2c83dc3f09b49d740407daaffe05ab8fd549ed8a
Commit Graph

24365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Price
6d87443a39 Update discussion tab sidebar header 
The home button is removed, the search box is always displayed, and many
visual adjustments are made, along with a large amount of refactoring.

Originally reviewed in #4211
 2014-07-02 16:58:34 -04:00
Greg Price
05d8eeecd7 Improve forum sorting and cohort filtering UX 
Thread entries now show an activity count that includes the original
post, and only one of the vote count and activity count is displayed
based on the user's selected sort. The sorting and filtering options now
both use a select and are somewhat more verbose, and the visual styling
of the sort/filter bar is updated.

Originally reviewed in #4165 with a bugfix in #4211
 2014-07-02 16:58:34 -04:00
Greg Price
e049cfaf3b Make "load more" in forums not appear incorrectly 
The rendering of the link happens in an event handler, and the
collection's attributes were not getting set properly before the reset
event triggering the rendering occurred.

Originally reviewed in #4072
 2014-07-02 16:58:34 -04:00
Greg Price
551cea9379 Add labels to forum thread list 
A thread will be labeled if it is pinned, if the user is following it,
or if it was authored by a staff member or community TA. This also
slightly changes the color used for community TA labels.

Originally reviewed in #4072
 2014-07-02 16:58:33 -04:00
Greg Price
89ba90a695 Re-design forum thread list 
Use larger and lighter title font, decrease padding, and use lighter
solid backgrounds instead of gradients. Also, refactor SASS code to
conform better to our new style, including using more specific class
names.

Originally reviewed in #4072
 2014-07-02 15:31:55 -04:00
Greg Price
1a0d8827f5 Refactor global var setup for forum Jasmine tests 
Originally reviewed in #4072
 2014-07-02 15:31:35 -04:00
Andy Armstrong
220a028b82 Merge pull request #4282 from louyihua/fix-name-in-studio 
Misuse of 'gettext' in mako templates
 2014-07-02 14:43:32 -04:00
Calen Pennington
3893a9aee6 Merge pull request #4258 from cpennington/studio-deprecated-urls 
Make Studio able to handle deprecated key formats in urls
 2014-07-02 14:26:46 -04:00
David Baumgold
0765fbb434 Merge pull request #4269 from Stanford-Online/giulio/fix-css-typo 
stupid simple css typo fix
 2014-07-02 14:25:39 -04:00
Will Daly
28cb25a1e4 Revert "ORA2 release-2014-06-30T13.39; update EASE to bump the NLTK version to 2.0.4" 
This reverts commit f40834fa2f.
 2014-07-02 14:21:29 -04:00
Giulio Gratta
1935187cf5 stupid simple css typo fix 2014-07-02 09:50:03 -07:00
Adam
ad43c25c78 Merge pull request #4188 from edx/adam/fix-skiptests 
Explicitly skip tests in common unless we know we're running the LMS unittest suite
 2014-07-02 12:43:16 -04:00
clytwynec
c4a5299e55 Merge pull request #4283 from edx/clytwynec/lms_cms_joint_bokchoy_test 
add lms_base and cms_base urls to bokchoy envs
 2014-07-02 12:42:49 -04:00
Mark Hoeber
cf3d777468 Merge pull request #4272 from edx/markhoeber/documentation/doc-298 
Updated Course End Date info
 2014-07-02 11:49:37 -04:00
Mark Hoeber
8c2a922ce8 Updated Course End Date info 2014-07-02 11:49:06 -04:00
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
louyihua
94faa6b836 Misuse of 'gettext' into mako templates 
To translate strings in mako templates, the pattern of ```${_()}``` should be used instead of ```gettext``` even if the strings to be translated is located in a ```script``` block.
 2014-07-02 20:59:18 +08:00
Will Daly
9322714d9e Merge pull request #4281 from edx/usman/lms6634-support-page-url-matching 
Fixed urlpatterns regex for support views in dashboard app.
 2014-07-02 08:45:01 -04:00
Usman Khalid
c201d78c43 Fixed urlpatterns regex for support views in dashboard app. 
LMS-6634
 2014-07-02 16:01:25 +05:00
Jay Zoldak
3515212196 Merge pull request #4266 from edx/revert-4050-linkedin-email 
Revert "Make LinkedIn auth provider request email by default."
 2014-07-01 14:36:50 -04:00
Jim Abramson
96c77a7ffc Merge pull request #4271 from edx/jsa/fix-new-post-view-spec 
update NewPostViewSpec to correctly initialize NewPostView
 2014-07-01 13:58:04 -04:00
jsa
59e2a6ddde update NewPostViewSpec to correctly initialize NewPostView 2014-07-01 13:43:54 -04:00
Usman Khalid
a278697506 Merge pull request #4268 from edx/usman/lms6631-certificate-mode 
Moved GeneratedCertificates.MODES back inside model.
 2014-07-01 22:32:03 +05:00
Christina Roberts
3f2a6d1edf Merge pull request #4241 from louyihua/fix-name-in-studio 
Change 'Course Name' to 'Course Run' in "Schedule & Details" page
 2014-07-01 11:53:20 -04:00
Usman Khalid
446270c0ff Moved GeneratedCertificates.MODES back inside model. 
LMS-6631
 2014-07-01 19:46:51 +05:00
Adam
653d6f21dd Merge pull request #4171 from edx/adam/fix-lms-2773 
Prevents students from accidentally changing their enrollment on login (...
 2014-07-01 10:38:50 -04:00
David Baumgold
ca7d895350 Revert "Make LinkedIn auth provider request email by default." 2014-07-01 10:05:01 -04:00
Anton Stupak
8201c9906a Merge pull request #4038 from edx/anton/redirect-on-error 
Add 401 error handler.
 2014-07-01 17:03:09 +03:00
Usman Khalid
1fad1d73d9 Merge pull request #4262 from edx/usman/lms2920-no-refund-if-given-certificate 
Do not refund student if a certificate entry already exists for them.
 2014-07-01 17:38:04 +05:00
Mark Hoeber
b989ec149a Merge pull request #4222 from edx/ahodges/documentation/DOC158 
Ahodges/documentation/doc158
 2014-07-01 08:26:31 -04:00
Usman Khalid
6a3d5eb079 Do not refund student if a certificate entry already exists for them. 
LMS-2920
 2014-07-01 16:29:07 +05:00
Clinton Blackburn
d118fb8cb2 Get active student count from new analytics data API 
Disabled by default.
 2014-07-01 07:18:04 -04:00
Christina Roberts
57f364d90e Merge pull request #4259 from edx/benmcmorran/fix-xblock-visibility 
Uses ModuleStoreEnum in is_xblock_visible_to_students
 2014-06-30 20:03:51 -04:00
Adam Palay
536b9dbe31 in some cases we do want that redirect url 2014-06-30 17:05:48 -04:00
Carlos Andrés Rocha
9261a3e6b9 Merge pull request #4234 from rocha/rocha/analytics-active-count 
Get active student count from new analytics data API
 2014-06-30 16:53:56 -04:00
Adam Palay
92f53236cf fix 400s from change_enrollment causing 404s (LMS-6625) 2014-06-30 16:22:14 -04:00
Ben McMorran
d00e2b7477 Uses ModuleStoreEnum in is_xblock_visible_to_students 2014-06-30 15:47:11 -04:00
Ben McMorran
f670ff74e4 Uses ModuleStoreEnum in is_xblock_visible_to_students 2014-06-30 15:34:39 -04:00
Clinton Blackburn
36cfe7ab9e Get active student count from new analytics data API 
Disabled by default.
 2014-06-30 15:16:30 -04:00
Jim Abramson
5d37ea83f7 Merge pull request #4216 from edx/jsa/new-post-redesign 
consolidate new post form variants into single client-side template/view
 2014-06-30 14:39:46 -04:00
David Baumgold
ded1a752a8 Merge pull request #4210 from bdero/bdero/fix-sysadmin-dashboard-gitlog-timezone 
Make sysadmin dashboard gitlog date timezone-aware
 2014-06-30 14:33:01 -04:00
David Baumgold
b817e02602 Merge pull request #4050 from mtyaka/linkedin-email 
Make LinkedIn auth provider request email by default.
 2014-06-30 14:31:53 -04:00
Calen Pennington
1c882da397 Make Studio able to handle deprecated key formats in urls 2014-06-30 14:29:10 -04:00
Ben McMorran
09908bde4c Merge pull request #4229 from edx/studio/uses-mixed-modulestore-xblock-visibility 
Adds is_xblock_visible_to_students
 2014-06-30 12:00:52 -04:00
Will Daly
46469209b4 Merge pull request #4252 from edx/will/ora2-release-2014-06-30T13.39 
ORA2 release-2014-06-30T13.39
 2014-06-30 10:42:08 -04:00
Waheed Ahmed
cb3355b9e7 Merge pull request #4215 from edx/waheed/lms2892-ie-security-warning-fixed 
Fixed IE security warning on course page.
 2014-06-30 18:49:54 +05:00
Will Daly
f40834fa2f ORA2 release-2014-06-30T13.39; update EASE to bump the NLTK version to 2.0.4 2014-06-30 09:41:55 -04:00
Nimisha Asthagiri
91f102c778 Merge pull request #4232 from edx/nimisha/modulestore-enum-constants 
ModulestoreEnum class.
 2014-06-30 08:58:03 -04:00
Waheed Ahmed
68a0f4e45c Fixed IE security warning on course page. 
LMS-2892
 2014-06-30 13:56:08 +05:00
jsa
994ccd1110 consolidate new post form variants into single client-side template/view 2014-06-29 20:45:22 -04:00