Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,830 Commits 1 Branch 0 Tags
69321b4497bda00b03e84483706d0e7e4860ea46
Commit Graph

73 Commits

Author SHA1 Message Date
Calen Pennington
69321b4497 Display the appropriate type of error message depending on the type of the incoming request 2012-05-16 13:45:00 -04:00
Isaac Chuang
8989605cba Moving in Ike's new files, touches of multicourse 2012-05-13 20:33:29 -04:00
Isaac Chuang
c92f6dc903 Added beautifulsoup to requirements; merged more of Ike's settings.py 2012-05-11 14:23:30 -04:00
ichuang
1494cbbd85 Merged root URL prefix from Ike. Errors should be attributed to pmitros. 2012-05-10 23:17:34 -04:00
Calen Pennington
6b10c0760b Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/student/views.py
 2012-05-08 13:54:57 -04:00
Prem Sichanugrist
2c37950472 Add Jasmine to do a JavaScript unit test 2012-05-07 18:01:21 -04:00
pmitros
236b52cb04 Merge pull request #30 from MITx/cp-remove-csrf-domain 
Remove the csrf domain from the default settings because we don't need i...
 2012-05-07 06:57:47 -07:00
Piotr Mitros
6b6ef01cf0 Masquerading works 2012-05-04 16:29:44 -04:00
Calen Pennington
fefcd8570f Remove the csrf domain from the default settings because we don't need it (we don't have requests going between multiple servers in the same domain). This will make it so that we can test servers from any url, rather than just a single url 2012-05-04 14:52:24 -04:00
Calen Pennington
0871d95f98 Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository 2012-04-30 15:18:47 -04:00
David Ormsbee
a476571e52 apparently ASKBOT_CLOSED_FORUM_MODE doesn't work outside LIVESETTINGS either... 2012-04-18 21:23:46 -04:00
David Ormsbee
81e9a39a89 add askbot closed forum mode to settings.py (not just inside LIVESETTINGS) 2012-04-18 21:05:44 -04:00
David Ormsbee
a71340d3a7 enable mathjax in askbot 2012-04-12 18:57:20 -04:00
David Ormsbee
6238f431b1 commenting out the use of S3 for static JS assets 2012-04-09 12:23:48 -04:00
Bridger Maxwell
202659cb1b Merged in master branch 2012-04-05 14:50:36 -04:00
Monitor Machine
0c69e00932 Settings has a default sqlite database 2012-03-30 18:22:44 -04:00
David Ormsbee
bc604fca34 disabled mail_admins handler for error messages 2012-03-29 09:29:47 -04:00
Bridger Maxwell
3ed5b161ec Moved simplewiki autosuggest js (it didn't get migrated). Fixed a minor typo in settings.py (it suggested the wrong override location for the static js files) 2012-03-25 20:08:03 -07:00
Calen Pennington
009f951483 Don't execute the site-specific settings file if it doesn't exist 2012-03-22 12:37:07 -04:00
David Ormsbee
4758ed10b3 raise karma limits on certain actions, disable askbot-wiki 2012-03-20 17:32:52 -04:00
Calen Pennington
317542ad19 Updating pointers to new merged repo locations 2012-03-19 11:10:44 -04:00
David Ormsbee
f4625003a7 change config to not cache by default, unless overridden by server-specific settings.py 
--HG--
branch : cache_separation
 2012-03-15 15:21:39 -04:00
Piotr Mitros
a2c4010b8f Removed caching for dev machines 2012-03-10 20:13:03 -05:00
David Ormsbee
ccacc90ca7 Don't allow posting before logging in. 2012-03-06 11:44:26 -05:00
David Ormsbee
299e1ae905 fixed it so staff can immediately accept answers 2012-03-06 10:55:45 -05:00
Piotr Mitros
385a87c767 info files now referenced explicitly instead of symlink 2012-03-03 18:02:14 -05:00
David Ormsbee
04ebd38368 update tracking log to use pids 2012-03-03 15:06:33 -05:00
David Ormsbee
60312d927b switch tracking logs to go to local file 2012-03-03 14:56:28 -05:00
David Ormsbee
638ff966ec Added LOGGING_ENV so that syslog can more easily split our logs. 2012-02-27 18:37:38 -05:00
Bridger Maxwell
f7ac370f67 Updated askbot karma point requirements 2012-02-26 01:15:55 -05:00
David Ormsbee
bd34843036 Add caching for User objects (again) 2012-02-23 14:30:36 -05:00
Piotr Mitros
49f86241ed Maximum tracking event is now 10k. We were losing ends of event on the main server with big sessions 2012-02-22 21:21:44 -05:00
David Ormsbee
7e79e9f34a emergency move of askbot settings back into settings.py so staging doesn't blow up 2012-02-21 15:09:45 -05:00
David Ormsbee
2a5ba5d0c7 Force askbot config to draw all config values from askbotsettings.py, and not hit the database 2012-02-21 14:43:05 -05:00
Piotr Mitros
34affdabde Merge with new settings 
--HG--
rename : settings_new_askbot.py => settings.py
 2012-02-20 12:14:48 -05:00
Piotr Mitros
7bd509b7ed Beginning to merge new settings file 
--HG--
branch : pmitros-dormsbee-settings2
rename : settings_new_askbot.py => settings.py
 2012-02-20 11:29:12 -05:00
Piotr Mitros
fd8b1e50c2 Staging new Askbot, some work on completion framework 2012-01-26 14:26:44 -05:00
Piotr Mitros
94a5c75088 Stage still needs old Askbot. Broken schema migrations. 2012-01-24 11:55:51 -05:00
Piotr Mitros
150fbc80bb Fully qualified path in import. Attempting to debug staging problem 2012-01-23 22:57:56 -05:00
Piotr Mitros
7ebdd04d57 Stupid infrastructure for benchmarking 2012-01-23 22:37:35 -05:00
Piotr Mitros
747f5ac290 Switching to new Askbot 2012-01-23 12:35:37 -05:00
Piotr Mitros
8539b9264f Profile page uses lxml 2012-01-21 09:20:24 -05:00
David Ormsbee
7de2c6fab1 update settings to remove server split between askbot and courseware 2012-01-20 10:56:20 -05:00
Piotr Mitros
4bc58c5611 Option for new Askbot 
--HG--
rename : settings.py => settings_old_askbot.py
 2012-01-19 16:31:40 -05:00
Bridger Maxwell
d47d95edf2 Removed simplewiki's custom 404 page so urls work better, and it uses global 404 page. Set bad debug setting to false 2012-01-18 21:43:23 -05:00
Bridger Maxwell
5c11bcd0c9 Merge 2012-01-17 19:03:05 -05:00
Bridger Maxwell
eb532d0d51 The 'not found' wiki page now has a working 'create article' link 2012-01-17 19:02:43 -05:00
Piotr Mitros
9682aea995 Stupid typo in settings.py 2012-01-16 21:34:16 -05:00
Piotr Mitros
5859f466ec Run without courseware with --settings 2012-01-16 20:39:50 -05:00
Piotr Mitros
851bf3e692 Fixed revery in settings.py 2012-01-16 18:19:27 -05:00