Commit Graph

539 Commits

Author SHA1 Message Date
Zach Wily 5020f92dd4 make the default quotas configurable, and start conversion to bytes
This is the first step in a 2-step process to change the storage_quota column
to be in bytes instead of MB. After this commit is deployed, we can deploy a
second commit that will do the following:

  * Run a migration that multiplies all non-null storage_quota columns by
    1024 * 1024 (if they are < 1024 * 1024).
  * Removes the code that special cases quotas under 1MB.

Change-Id: I3fbf3fb85fbaae59e65edf86d9e94de1b51c2b6a
Reviewed-on: https://gerrit.instructure.com/4267
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-06-20 15:37:46 -06:00
Cody Cutrer 4e5b426f4c destroy "protected" pseudonyms when removing a user from an account
fixes #4915

Change-Id: Id7543f859b42c4df1f366bbb4eb086bddf84a609
Reviewed-on: https://gerrit.instructure.com/4296
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-06-20 14:15:55 -06:00
Jon Jensen b90efd5bab Merge remote-tracking branch 'origin/master' into dev/conversations
Change-Id: I583f201dbdcb6d01910f110fffaa36808d39b27f
2011-06-10 16:11:41 -06:00
JT Olds 2bf5c22c5f allow admins to search for names in other fields
closes #4450, #4762, refs #4497

course.name_like now searches name, sis_source_id, and course_code
user.name_like now searches user.name, user.short_name, pseudonym.sis_user_id,
  pseudonym.unique_id

Change-Id: If15255b3745139553a68fa2b6e768b4755394214
Reviewed-on: https://gerrit.instructure.com/4078
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-06-09 10:35:08 -06:00
Brian Palmer 50c4687c84 oauth 2 requests via access tokens
Added support for oauth 2 API requests.  HTTP Basic
only works for Canvas-auth and LDAP accounts, but
oauth 2 will also work with SSO accounts.  Also added
ability for users to create access tokens from the
profile page.

Change-Id: I13581b4e77bfa77bf11dbb732900012dd1e50ede
Reviewed-on: https://gerrit.instructure.com/3775
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-06-02 09:15:11 -06:00
Cody Cutrer b60e645b0d import and support ssha passwords from sis. fixes #4573
Change-Id: I703730644f0094d7cb85d8def322969267de3ce5
Reviewed-on: https://gerrit.instructure.com/3755
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-23 08:40:35 -06:00
Brian Whitmer 70e984bff6 grading standards improvements
- can attach a grading standard to a course
- interface for managing standards at the course
  and account level
- added final grade to gradebook page
- added final grade to student grades page
- added final grade to gradebook csv export

fixes #3868

Change-Id: I555b9f66b621d8967e893e50a671748267da9373
Reviewed-on: https://gerrit.instructure.com/3025
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-21 19:20:34 -06:00
Jon Jensen 7e9183b256 models and controllers for new messaging, refs #3977
Change-Id: Ida82491d0161f13516baf55625ccce71d1b4036c
2011-05-19 16:21:32 -06:00
Brian Palmer 8d76be0b8c hiding stream items on the dashboard, closes #4387
This is permanent, if a stream item is updated it doesn't re-appear on
the dashboard. This is done by marking the stream item instance as
hidden, which means adding the hidden field to the two indexes.

Change-Id: Ifa544cef4ea2d46f4214e8317af4c9e3baed76eb
Reviewed-on: https://gerrit.instructure.com/3603
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-17 07:57:01 -06:00
Brian Palmer ace397540a support sis ids in the canvas apis, closes #4386
Change-Id: I2ae2a447f3950d09257b9ff6498326ec89c8bed8
Reviewed-on: https://gerrit.instructure.com/3621
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-05-16 13:25:07 -06:00
Zach Wily cc7910d03e purge remaining traces of Facebooker
Change-Id: Id629e221007ae0a7ec9ae6bebd68a83ed3f9379f
Reviewed-on: https://gerrit.instructure.com/3662
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-14 23:10:04 -06:00
Zach Wily 5a895d66c6 Merge branch 'dev/ssl'
Conflicts:
	app/controllers/files_controller.rb
	app/controllers/users_controller.rb
	app/views/files/show.html.erb
	config/environments/development.rb
	lib/kaltura/kaltura_client_v3.rb
	public/javascripts/full_files.js
	public/javascripts/instructure.js
	public/javascripts/media_comments.js
	public/javascripts/speed_grader.js
	public/javascripts/tool_inline.js
	vendor/plugins/ssl_requirement/lib/ssl_requirement.rb

Change-Id: I987cc015d43cffd4b6738030d893a27de7c434ba
2011-05-07 08:03:22 -06:00
Cody Cutrer 5438cda25b avoid an extra db write for every user and enrollment created
refs #3752

Change-Id: Ie382a08245705df171d1e3056ff7a8fa4ff7b33b
Reviewed-on: https://gerrit.instructure.com/3506
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-05 16:15:50 -06:00
JT Olds 24749e39b8 fix user root account removal. fixes #4458
Change-Id: Id6a2eb9efc796227ebe7a497731e6f9101a0340f
Reviewed-on: https://gerrit.instructure.com/3489
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-05 10:50:31 -06:00
Brian Whitmer e8c3410404 opt-in for grades in emails
Students can now opt-in to receiving actual scores
in email/sms/facebook notifications about homework
grades.  This ability can be manually disabled at
the root account level if necessary.

fixes #4479

Change-Id: I1b769bef140719578fa345ca519999a2834b00f8
Reviewed-on: https://gerrit.instructure.com/3473
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-04 22:57:14 -06:00
Zach Wily 7beaf4d764 fix update_account_associations job getting created for every imported user
Change-Id: Ia7dc8ca3912510114d88035e264e59ebb54fe086
Reviewed-on: https://gerrit.instructure.com/3446
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-03 14:26:18 -06:00
Cody Cutrer 39588b17be include account_users in user_account_associations. fixes #4451
Change-Id: I9a24ab4f5612a66fc2c59c28211de28a88b61dad
Reviewed-on: https://gerrit.instructure.com/3427
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-03 12:27:09 -06:00
Zach Wily d824af19e9 update user account associations with non-cross listed courses too
Change-Id: Ie14f19289b00bcc3f0fe8384c489de4eb61e3e16
Reviewed-on: https://gerrit.instructure.com/3191
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-04-22 07:06:20 -06:00
Zach Wily f4c2a814a5 always use course section and course when building account associations; fixes #4277
Given the decoupling of sections from courses and accounts, it's
possible for a course section and course to have different account
associations. We should now use both when building associations for a user.

Change-Id: Ifbc9faa26ae0b5c1afb8e2c1f36c208c0e5c42f0
Reviewed-on: https://gerrit.instructure.com/3130
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-18 10:21:48 -06:00
Zach Wily df3d4c6351 use something more secure than UUID for our unique tokens; fixes #4264
Change-Id: I407b50b98e44eab4e341b596ebefe9f35af3dc37
Reviewed-on: https://gerrit.instructure.com/3097
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-04-15 10:54:47 -06:00
Zach Wily a92fea17cb don't return a deleted pseudonym for users
Change-Id: I9706803f6002ce9ceb727c6cf7a623f84b1eb73c
Reviewed-on: https://gerrit.instructure.com/3094
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-14 15:07:15 -06:00
JT Olds 3a171d27d2 renaming final_grade to final_score in relevant places. adding computed_final_grade
Change-Id: I09cfecc6ec075b1b45e872a6a1f2efa7e4bd63b9
Reviewed-on: https://gerrit.instructure.com/3034
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-12 12:58:28 -06:00
Jon Jensen c6b7a45ad8 string validations/fixes, closes #4154. wiki fixes, closes #3973, #4168
proactively found and fixed varchar(255)'s where we relied on mysql's
silent truncation. added validations for places where we want to
enforce these limits

made it so you can reuse titles/urls of deleted wiki pages, and added
validations to ensure sane urls and prevent orphaned pages

Change-Id: I15bcc0c7a751efba1a0f7548e9989ad2ea1792bf
Reviewed-on: https://gerrit.instructure.com/2935
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-05 11:22:50 -06:00
Brian Whitmer 9d131ea836 basic lti support
- external tools can be added on the course/account
  settings page
- external tools can be linked to from within modules
- clicking a tool in a module will load a new page
  with the tool embedded in an iframe
- see context_external_tools for standard procedures
  on retrieving settings for a specific link

fixes #4013

Change-Id: I8aa1934f8deac9af26d74036162b34fd1c4242e1
Reviewed-on: https://gerrit.instructure.com/2601
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-23 16:58:11 -06:00
Jon Jensen f745f40073 Merge branch 'master' into dev/postgres
Conflicts:
	app/models/user.rb
	config/initializers/active_record.rb

Change-Id: Idc3b52dad873146efbb9268ecac28cac840f115e
2011-03-22 16:23:04 -06:00
Zach Wily 8c2b31e0f4 manually touch the user model when updating preferences
This is because ActiveRecord only does a shallow check for changed attributes
when deciding whether to update updated_at or not.

Change-Id: I5eb468ec02b490df9f9dcec55c5c24d72f661ff3
Reviewed-on: https://gerrit.instructure.com/2695
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-18 14:43:48 -06:00
Jon Jensen 4ea607cea4 postgres support and misc bugfixes, fixes #3574, #3943
Change-Id: I16aa188175a588b02dd6460baa83daae805aec9f
Reviewed-on: https://gerrit.instructure.com/2474
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-11 18:01:02 -07:00
Paul Strong 17e8f969f9 Fix user account associations not being updated properly on rare occasions.
User account associations were not being updated properly when updating pseudonym accounts multiple times.

Without this fix user account association updating breaks when the pseudonym account gets updated multiple times in a row
For ex.

    pseudonym.account = account1
    pseudonym.save
    pseudonym.account = account2
    pseudonym.save

 After running the code above the update_user_assocations code would update the user association to point to the first account instead of the second account.

Change-Id: I0f2666458cd9b1e54afb52d26e2b4ec858dccd26
Reviewed-on: https://gerrit.instructure.com/2589
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-09 16:34:08 -07:00
Zach Wily 9077560f50 make urls protocol-relative for ssl; refs #3761
Change-Id: I54ddf3a00a0e88caab3cfd5e1cae632b8942ee55
2011-03-08 15:17:35 -07:00
Brian Palmer faaf0f6eb7 optimize group policy checking on /dashboard
This is super performance sensitive, so we're throwing best practices
out the window a bit here. Hopefully someday we can integrate this into
our security framework better and remove this duplication of logic.

Change-Id: I845db50ffab02769d91272fdc0ce3825d9a670c1
Reviewed-on: https://gerrit.instructure.com/2488
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-01 14:59:44 -07:00
Brian Whitmer 98c6d03cc9 speed improvements for files page
there's was a lot of unnecessary database calls going
on, should be a little faster now.

fixes #3939

Change-Id: I9a43e0d801bc632d16248ad92b7c9ff16d1673eb
Reviewed-on: https://gerrit.instructure.com/2484
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-01 13:21:03 -07:00
Bracken Mosbacker 52aa6fb4a8 don't show feedback for deleted assignments
closes #2993

Change-Id: I896f32b6b84419fe839b8c2b576119b0cd23aeff
Reviewed-on: https://gerrit.instructure.com/2361
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-02-28 10:50:23 -07:00
Zach Wily bad6e8480c make sure we set the updated_at attribute
Change-Id: I1064523c3028f39311c10f4435237910cd2a52fd
Reviewed-on: https://gerrit.instructure.com/2351
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-18 14:55:22 -07:00
Brian Whitmer eee2627610 invalidate caches for account alerts
there's still going to be up to a 3 minute delay on alerts
showing up on a user's dashboard, since we don't touch all
the users for an account when an alert changes, but if a
user closes the alert it should go away forever like it's
supposed to now.

Change-Id: I6461836ad126c4646a496734e84c89305f873f2d
Reviewed-on: https://gerrit.instructure.com/2344
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-18 09:59:31 -07:00
Brian Whitmer 23404fe1c1 account-level notifications
account admins can create "Alerts" from the account
settings page that show up as sticky messages on the
user dashboards.  The alerts stay until the end_at
date, or until the user clicks the "close" link.  If
you add an alert to the site_admin account then it's
considered a global alert and will go to all root
accounts.

fixes #3738

Change-Id: I47e6eaf717145af24d847d4387e0ad5c36800094
Reviewed-on: https://gerrit.instructure.com/2293
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-16 21:34:05 -07:00
Brian Whitmer 89f5934bae quiz moderation
- added a moderation link on the quiz page
- moderators can see current quiz results for students
- moderators can add time to a current quiz attempt
- moderators can manually unlock a quiz for a student,
  which means the student can take the quiz even if
  it's locked for everyone else
- moderators can give a student extra time for every
  subsequent attempt of a quiz
- moderators can give a student extra attempts on a quiz
- moderators can also update these settings for multiple
  students at the same time

Change-Id: I31c34097fc6e19d8c6e377a6059568e591ffbab8
Reviewed-on: https://gerrit.instructure.com/2166
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-02-11 22:08:42 -07:00
Ryan Shaw 8a57e6891b only require name and email for new teacher reg
more can be handled in a plugin.

Change-Id: Ie8525625f8846c2312d15fab352850a6901744b6
Reviewed-on: https://gerrit.instructure.com/2142
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-02-03 13:11:03 -07:00
Zach Wily af5511b953 remove unused accessors
Change-Id: Id69b4e47453a11f227ae116427d7bc89edb6628c
Reviewed-on: https://gerrit.instructure.com/2115
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-03 10:40:07 -07:00
Brian Whitmer 8b8173dcc9 Initial commit.
closes #6988138
2011-01-31 18:57:29 -07:00