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

8844 Commits

Author SHA1 Message Date
John Jarvis
453528f999 updating handlers list to conditionally include syslogger-remote 2014-08-04 11:36:52 -04:00
John Jarvis
669e31c68e allow rsyslog to be none 2014-08-04 11:31:13 -04:00
Julia Hansbrough
7b1fce9e3f Merge pull request #4641 from edx/reruns/server-side-handlers 
Basic notifications handling.
 2014-08-01 17:30:54 -04:00
Jesse Zoldak
17841fcdd4 Revert "allow rsyslog to be none" 2014-08-01 16:33:07 -04:00
Diana Huang
69f900dd90 Basic notifications handling. 
LMS-11163
 2014-08-01 19:50:37 +00:00
Anton Stupak
1ae5901062 Merge pull request #4606 from edx/anton/remove-group-configurations 
Add possibility to remove group configurations.
 2014-08-01 22:18:35 +03:00
John Jarvis
8d849f8087 allow rsyslog to be none 2014-08-01 13:55:15 -04:00
polesye
27013e74f4 BLD-1049: Remove Group Configurations. 2014-08-01 20:45:23 +03:00
Jason Bau
9c52e5d74d Merge pull request #4585 from edx/jbau/ext-auth-fix-password-complexity 
Allow external_auth registrations to bypass PW complexity check
 2014-08-01 10:43:57 -07:00
Dave St.Germain
eb1d046352 Show the enrollment counts for each mode on the instructor dashboard. 2014-08-01 12:17:36 -04:00
Jesse Zoldak
a0b4f8b6c6 Merge pull request #4643 from edx/zoldak/disable-video-handout-tests 
Disable video handout tests
 2014-08-01 07:14:30 -04:00
Anton Stupak
1ebb4c5304 Merge pull request #4629 from edx/anton/disable-css-animations-in-bok-choy 
Disable css3 animations in bok-choy tests.
 2014-08-01 13:23:05 +03:00
Sarina Canelake
0217ef80d7 Merge pull request #4351 from lduarte1991/lduarte-harvardx-pr8 
Annotation Tool: Bug Fix Filtered Personal Annotations on Page Load
 2014-07-31 20:19:23 -04:00
Jesse Zoldak
49e0d6b5f9 Disable video handout tests 2014-07-31 18:44:25 -04:00
lduarte1991
6a281dd80b Annotation Tools: Spacing Issues fixed for catch.js 2014-07-31 15:44:02 -04:00
lduarte1991
df8d51b9b9 Annotation Tool: Bug Fix Filtered Personal Annotations on Page Load 
- Made sure that all highlights were removed.

- Forgot closing parens

- added comments to fix
 2014-07-31 15:44:02 -04:00
polesye
7217dd460d Disable css3 animations in bok-choy tests. 2014-07-31 21:58:07 +03:00
lduarte1991
98446d1c6d Annotation Tools: Code clean-up, formatting, spacing 2014-07-31 14:48:25 -04:00
lduarte1991
9751244e2e Annotation Tools: Fixed Share button to allow selection of text box 2014-07-31 14:48:25 -04:00
lduarte1991
4ce70630b4 Annotation Tools: Fixing Share Indentation, Grep Functions and Equality 2014-07-31 14:48:25 -04:00
lduarte1991
eace1413b7 Image Annotation Tool: Fixed Viewport Timeout Issue 2014-07-31 14:48:25 -04:00
lduarte1991
e80992cc1e Annotation Tool: Fixing Table Share bug (2b) 2014-07-31 14:48:25 -04:00
lduarte1991
28f5ed1cf9 Annotations Tools: Sharing Plugin Fixed with Proper URI 2014-07-31 14:48:25 -04:00
Renzo Lucioni
3c37b9723c Merge pull request #4620 from edx/renzo/fix-instructor-analytics 
Renzo/fix instructor analytics
 2014-07-31 14:12:47 -04:00
Don Mitchell
437a3bf93e Merge pull request #4542 from edx/split/perf_test 
Split/perf test
 2014-07-31 09:14:15 -04:00
Oleg Marshev
36d47dd05e Merge pull request #4527 from edx/oleg/xml-course-transcripts-fix 
Fix transcripts in XML course when no static_asset_path is set.
 2014-07-31 10:35:44 +03:00
Don Mitchell
02e21d8ab7 fixup! Count & compare db hits between old and split mongo LMS-11090 2014-07-30 17:44:45 -04:00
Don Mitchell
4d51906761 fixup! Test both split and old mongo 2014-07-30 17:44:45 -04:00
Don Mitchell
d4776a151b Test both split and old mongo 2014-07-30 17:44:45 -04:00
Don Mitchell
0f0d75fce8 Convert toc test to use mongo not xml ms 
Included adding a general create_toy_course and create_sample_course method for tests
 2014-07-30 17:44:44 -04:00
Don Mitchell
9a90579f02 Move test_path_to_location to mixed testing 2014-07-30 17:44:44 -04:00
Don Mitchell
8268724ee5 check 0 sends means 0 not ignore 2014-07-30 17:44:44 -04:00
Don Mitchell
1c17e05608 Count & compare db hits between old and split mongo 
LMS-11090
 2014-07-30 17:44:44 -04:00
Don Mitchell
37c873db90 Serialize using to_json on fields 2014-07-30 17:44:44 -04:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"" 
This reverts commit 079808ee47.
 2014-07-30 17:01:52 -04:00
Julia Hansbrough
14dc3ce853 Merge branch 'release' 2014-07-30 19:35:51 +00:00
Ben Patterson
47b8d07220 Add test file used for format validation. 2014-07-30 12:19:19 -04:00
clytwynec
9f8104a2f3 Merge pull request #4593 from edx/clytwynec/shard_out_bokchoy_tests 
Clytwynec/shard out bokchoy tests
 2014-07-30 11:48:49 -04:00
Christine Lytwynec
c5a311dbd1 adding discussion tests to shard_1 2014-07-30 11:09:35 -04:00
Christine Lytwynec
c0264ca81d add shard_1 flags to cms bok-choy tests 2014-07-30 11:09:34 -04:00
Minh-Tue Vo
063b9b9ab2 Merge pull request #4595 from edx/mvo/update_acceptance_db_caches 
Updating acceptance (lettuce) db cache
 2014-07-30 10:57:29 -04:00
jmclaus
58ca939ba6 Merge pull request #4292 from terman/jsinput 
Supply initial_state attribute for jsinput tag
 2014-07-30 16:56:45 +02:00
Oleg Marshev
ac5f8d94f7 Merge pull request #4382 from edx/oleg/cdn-log-level-fix 
Log CDN request timeout with level INFO.
 2014-07-30 16:06:47 +03:00
Nimisha Asthagiri
fe4bce8bba clone_course: Add fields parameter to support new display_name. 2014-07-29 15:03:36 -04:00
Nimisha Asthagiri
538bec92a7 LMS-11137 Course Action State Django models. 2014-07-29 15:03:36 -04:00
Julia Hansbrough
079808ee47 Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul" 
This reverts commit 252038c376, reversing
changes made to 7caf8c53b1.
 2014-07-29 17:41:46 +00:00
Minh Tue Vo
81a3e67a62 Updating acceptance (lettuce) db cache 2014-07-29 11:18:17 -04:00
jmclaus
69ee9d92d6 BLD-1104: List units that use group configuration. 2014-07-29 16:16:31 +02:00
Anton Stupak
54d60fc1b1 Merge pull request #4555 from edx/anton/remove-experiments-from-advanced-settings 
Remove user_partitions from advanced settings
 2014-07-29 09:03:45 +03:00
Mathew Peterson
df14d8e49d Merge pull request #4513 from edx/split/auto_publish 
Split/auto publish
 2014-07-28 17:31:49 -04:00