Commit Graph

360 Commits

Author SHA1 Message Date
Zach Wily c17824c1de fix content pane doesn't appear when creating an event; fixes #5072
Change-Id: I22ca6bc770fb13edcca568f2484f42d5bb60d37b
Reviewed-on: https://gerrit.instructure.com/5064
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
2011-08-12 15:06:29 -06:00
Zach Wily 50ac28ff9c hide description from locked assignments on the calendar; fixes #5215
Fixing this required some minor refactoring:

 * A model can now define "filter_hash_for_user" to filter serialized data out
   of the model based on user. In this case, we were sending the assignment to
   the browser in json, and we wanted to strip out the description if the
   assignment was locked for the user.
 * The lock_explanation generator was not i18n'd before. That was fixed, and
   similar code in javascript was also refactored so it can be called by
   anybody. (In this case, by the assignments in the calendar.)

Change-Id: Ia606be2a16df9bd87222306445f548b3a7a78801
Reviewed-on: https://gerrit.instructure.com/5051
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-12 10:14:56 -06:00
Cody Cutrer 6a65bf5b4e add setting for hiding total in grade summary
closes #4623

also fixes the UI for "what-if" score showing when you really can't
use them

Change-Id: I19a5f41512e0d162a78c10b0c7c23f22624b6af0
Reviewed-on: https://gerrit.instructure.com/5030
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-08-11 16:43:56 -06:00
Cody Cutrer deeda330c0 change tooltip to "unset" for multiple answers questions fixes #3025
Change-Id: Ie60ebd4e308642ae6b216bf5c4e03430f341fe30
Reviewed-on: https://gerrit.instructure.com/4996
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-10 15:25:46 -06:00
Cody Cutrer 0dee9d2edf only view rubrics in speedgrader; fixes #4550
technically, you're editing the rubric evaluation, but users don't
get that

Change-Id: I1fafa6223209fd5ecb84a277f84577193e5f1ddb
Reviewed-on: https://gerrit.instructure.com/5008
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-08 15:50:52 -06:00
Cody Cutrer b09cf201ea sort final grades numerically, not lexicographically
fixes #4806, #4603

(this already works correctly in gradebook2)

Change-Id: I0d085ae754f471197c401c0d272db7072eb62673
Reviewed-on: https://gerrit.instructure.com/5007
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-08-08 14:35:02 -06:00
Cody Cutrer fd4af6b0b4 fixes #5221 unpublished quiz explosions
Change-Id: Ic7dfc51d603ce2a4d61a51a207f64fa906de9a8f
Reviewed-on: https://gerrit.instructure.com/4995
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-08-08 10:08:15 -06:00
Zach Wily 9ec09415d2 fix pageless plugin with scrape method
When including a scrape function to pageless, the data after scraping was
being dumped into the DOM incorrectly. This fixes that, and includes a test
for the announcements page.

(The bug was originally seen on the inbox, but rather than write a spec for
code that won't last much longer, I wrote the test for somewhere else.)

Change-Id: If4ca0cbed89dcf6e6e24e814f75824266422cbfa
Reviewed-on: https://gerrit.instructure.com/4992
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
2011-08-07 22:53:49 -06:00
Zach Wily 7b748e51a4 fix disappearing folder names on rename; fixes #5199
Change-Id: I48ce7ddb2c2c4d1d0e313e87dbe784c782b5be1e
Reviewed-on: https://gerrit.instructure.com/4966
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-08-05 13:11:20 -06:00
Cody Cutrer 16fef763ec put localization js bundles in a separate assets file
so developers can run rake i18n:generate_js without having a dirty assets.yml

Have to be magical about merging though two using erb in the real assets.yml.

Also split _core.js into _core_en.js (committed to repo) and everything else
in _core.js (not in repo), for the same reason.

Change-Id: I4749ee5818b9e7d4e1244c6e8295790bb1235e34
Reviewed-on: https://gerrit.instructure.com/4972
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-08-05 12:52:08 -06:00
JT Olds 8bdf016d99 fix file_uploads_progress display
slideUp and slideDown were being used "show" and "hide", but sometimes
they would get called multiple times in a row, making file upload errors
go away obnoxiously quickly and so forth.

with this abstraction, a displayed message will always get at least 3
seconds of user visibility before being hidden

Change-Id: Id3c5749a1778bec2896fa0399df731c6967e4a2d
Reviewed-on: https://gerrit.instructure.com/4817
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-08-05 10:12:12 -06:00
Jacob Fugal 0ddc615286 Merge branch 'dev/datetime' into 'master'
Change-Id: I3f82d19910f490ad3efc9e71be3aee5c9af3298f
2011-08-05 09:37:27 -06:00
Cody Cutrer 64c5c0da0b fix #5043 linking observers to enrollments
Change-Id: I83d92c09c6332696e1faf978e7bfcea458e0ed91
Reviewed-on: https://gerrit.instructure.com/4959
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-08-05 08:39:39 -06:00
Cody Cutrer 07454ec2c0 user lists missed I18n
Change-Id: I8bc2f2096cfce598941a501b05ef91925e61b175
Reviewed-on: https://gerrit.instructure.com/4953
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-08-04 16:54:23 -06:00
JT Olds b895750052 folder_controller optimizations stopped sending filename field
data.filename was not being populated, so the filename field
of the multipart request was empty, causing rack to just throw
it away. NOTE: rack throws away fields if you provide filename=""
with content-disposition file.

fixes #5154

Change-Id: If6f0a3a818aaa2f97ee4aded4bea80063209b12a
Reviewed-on: https://gerrit.instructure.com/4840
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-04 16:49:55 -06:00
Zach Wily 10f8bb16b5 fix uploading profile pictures
also switched to storing profile pictures in a new folder ("profile pictures")
so that users will not see a ton of unrelated pictures.

Change-Id: Ia2fd55e1c090db886349319613a7d5ecb33805ac
Reviewed-on: https://gerrit.instructure.com/4950
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-08-04 16:18:31 -06:00
Jacob Fugal 0a2d17ec12 i18n text in instructure.js and instructure_helper.js
also removed some dead code. still need to do dates and times

Change-Id: Iac2e036d839cb0a2ae7c53c95ee05ff59cb3684f
Reviewed-on: https://gerrit.instructure.com/4924
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-04 14:38:03 -06:00
Cody Cutrer a32bacd960 Files missed i18n
Change-Id: I2d3f2cd40e4fd4a765e0a325e8050329a1e610e3
Reviewed-on: https://gerrit.instructure.com/4945
Reviewed-by: Jon Jensen <jon@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-04 12:26:05 -06:00
Jacob Fugal 7bdbd57547 use a machine-oriented value for role detection
rather than display oriented version. also let's us get more flexible
with casing ("TA" shouldn't be "ta") and sets us up for i18n.

Change-Id: I3bb68ef1ffeae7d03b38cbb41f4c45bcfeee3946
Reviewed-on: https://gerrit.instructure.com/4923
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-08-04 11:09:25 -06:00
Jacob Fugal 15d7a43535 reword "nth of m students" to get rid of ordinal
ordinalization doesn't localize well, and the new version ("student n of
m") will be clearer for translators as well. kill now unused and
problematic $.ordinalize

Change-Id: Ie8f4169d385ffa1e8c4ea5beac18e5f429ea2c59
Reviewed-on: https://gerrit.instructure.com/4922
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-08-04 11:09:20 -06:00
Jacob Fugal 165d79eaaa dead code removal
* referenceOffset was never used, and was the only thing the quiz
   utc_offset was referenced by
 * assignment_due_at_span was read in js, but the js variable was never
   used
 * date_header partial never used
 * render :collection => [] is a no-op
 * assignment's date_sortable field never referenced

Change-Id: Ie6d1deff3efb8f3b6caa01905ec79ac9a4140eb3
Reviewed-on: https://gerrit.instructure.com/4921
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-08-04 11:09:05 -06:00
Ryan Shaw 8209a36844 new gradebook2 features
changes:
 * a little i18n work
 * show only a certain section
 * show attendance
 * include ungraded assigments in score
 * don't wait for first xhr to fire second
 * cool drop down menu thing

Change-Id: Ie93fd06e20aec399710e32441f8d35c686fbbaf2
Reviewed-on: https://gerrit.instructure.com/4868
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-08-03 14:51:56 -06:00
Zach Wily baebb83d6b support general feedback on quiz questions; fixes #4912
Change-Id: Ic50a66c19193a688c62ced0b3c82be238d09ae98
Reviewed-on: https://gerrit.instructure.com/4789
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-08-03 14:39:05 -06:00
Brian Whitmer bdca88a4fe improvements to teacher interactions report
- fixed the link on a teacher page in a course to show the report
  for that teacher for all students in the course
- added days since submitted for each ungraded assignment
- added sorting of columns
- added link to one-click to message a specific student. This link
  will only appear of the current user is a teacher in the course

Change-Id: Ic39ba72fd210411def178dc69ff35006abe96043
Reviewed-on: https://gerrit.instructure.com/4707
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-03 00:11:17 -06:00
Brian Palmer 8df4bc8906 update batch mode sis import documentation
We require a term now, there is not all-terms full batch mode anymore.

Change-Id: I85edd67afcfcf86916c93904a7c1a3cfb1f66dba
Reviewed-on: https://gerrit.instructure.com/4850
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-07-29 10:58:32 -06:00
Ryan Shaw d97df4ef7e enable gradebook2 sorting by name and secondary_id
Change-Id: If0cae6c7c493428f094210552e65636eceb02852
Reviewed-on: https://gerrit.instructure.com/4650
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-07-27 14:28:46 -06:00
Ryan Shaw 91d1bdb43d column reordering/resizing/sorting in gradebook2
if you minimize a column to it's smallest size
it will change it's formatting and show a tooltip
on hovering.  it will also remember you hid it
(per browser/user) and not show it in future.

click a column header to sort.

drag/drop assignment column headers to reorder
(will not be remembered for now)

Change-Id: Ia9d1d8e1bb82ebde85d87fedae80c1d7feb46b6f
Reviewed-on: https://gerrit.instructure.com/4642
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-07-27 14:28:27 -06:00
Ryan Shaw 7b5d34be68 patch jquery.event.drag to handle 'live' better
this was especially needed for the minimizing of
columns in gradebook 2

Change-Id: If6f6bfce25f0dba33c969b2365353b701e7e5429
Reviewed-on: https://gerrit.instructure.com/4639
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-07-27 14:28:20 -06:00
Ryan Shaw c7c7bf4535 use unminified version of jquery.event.drag
Change-Id: Iedb3db6c2ec935e31734ac02bff7a4dcf514643b
Reviewed-on: https://gerrit.instructure.com/4638
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-07-27 14:28:10 -06:00
JT Olds 809107010e don't upload every file twice
we were adding files to the queue, and then calling uploadNext with
that file specifically. when uploadNext got called again it would find
the same file in the queue and try again.

now just add it to the queue and then process the queue

refs #5143

Change-Id: I53476b3170169a9dc60a9e5edf69a119e2795fbd
Reviewed-on: https://gerrit.instructure.com/4818
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-07-27 10:08:49 -06:00
JT Olds f44a815d4e raise uploadify file size limit
refs #5143

Change-Id: Icbfb54358127ea61df1a6c9515fc80b1775d6b1d
Reviewed-on: https://gerrit.instructure.com/4816
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-27 10:08:43 -06:00
Jon Jensen 25169e7523 latest es.yml translations (w/ some manual fixes)
also fixed an importer issue, and removed translated js files from
version control (we'll generate them as part of the deploy)

Change-Id: I10be3ab1f4567a1534774f514424fd9966982c62
Reviewed-on: https://gerrit.instructure.com/4686
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-26 13:28:00 -06:00
Cody Cutrer 3b2f4d132d re-work wiki sidebar fixes #3975
* infini-scroll images tab of wiki side bar
 * load file tree piecemeal in wiki_sidebar
 * load folder tree only if needed

Change-Id: Ib8d5cb567df8a2ee79935ffb3f8678a7ee5427fe
Reviewed-on: https://gerrit.instructure.com/4671
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-25 14:55:10 -06:00
Zach Wily c5f5b00797 fix mini-calendar day highlights; fixes #5129
Change-Id: I69883bdf59eef02f31b38d5633b4d9ad3425d3ae
Reviewed-on: https://gerrit.instructure.com/4758
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-22 08:27:30 -06:00
Brian Whitmer e295e45ae5 can't create graded quiz from assignments more options page
There's a problem where if you start to create a quiz from the
assignments list page and click "more options", you won't be able
to actually save the assignment. The problem is that the form
validation is failing, because the "Submission:" option is set to
"Online Submission" but no submission types are selected.
However, since this option is hidden on quiz type assignments,
the validation error bubble never appears and the form just
won't submit.

fixes #5023

Change-Id: Iecb843980b7e1c56fff313331bd30d2a79eee9d8
Reviewed-on: https://gerrit.instructure.com/4613
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-20 14:05:58 -06:00
Jon Jensen 5e66286c14 locale detection and selection, refs #4994
Change-Id: I0f1e50d912ba7ac81b9ceb3ae95baaba3a12425b
Reviewed-on: https://gerrit.instructure.com/4661
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-07-20 09:24:55 -06:00
Zach Wily 7b96596a33 allow audio comments in speedgrader comments; fixes #5095
Change-Id: Iaf7b81042e839677c3302202ac275ad105b49920
Reviewed-on: https://gerrit.instructure.com/4719
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-07-20 07:12:23 -06:00
Jon Jensen c86d6e9f24 fix 1048576x inflation of storage_quota in ui (and db)
Change-Id: I5c672337dcd31cd72b680eba031ea5a2ab730448
Reviewed-on: https://gerrit.instructure.com/4643
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Zach Wily <zach@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-07-19 09:30:17 -06:00
Zach Wily 1bcae47f1e fix displaying rubric criterion on learning outcomes; fixes #4557
Change-Id: I8629c58f4327301e5413e023439427d4d38974e1
Reviewed-on: https://gerrit.instructure.com/4667
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-18 14:12:10 -06:00
Jon Jensen f2f004188d first batch of es translations
also enabled en fallbacks (this is only needed for things that don't
have an explicit default, like localize calls)

includes auto-generated js translation files

Change-Id: If246a6a96b1e9f6934f84ff6e65e0372a60d247a
Reviewed-on: https://gerrit.instructure.com/4597
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-07-13 11:08:07 -06:00
Jacob Fugal fa2581184c Revert "fix and localize $.parseFromISO, other date stuff"
This reverts commit 7eb99b681f.

Commit wasn't behaving well with 11:59pm dates. Will revisit as part of
my datetime revamp WIP.

Change-Id: I5dc6396f79201349409cc86f7398712469ec9248
Reviewed-on: https://gerrit.instructure.com/4662
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-12 17:10:50 -06:00
Ryan Shaw 1503a7e553 show secondary identifier in gradebook 2
Change-Id: I0dacbc6ba48ec843777eee23887f88e39c1e9fb2
Reviewed-on: https://gerrit.instructure.com/4657
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-12 14:11:36 -06:00
Zach Wily 76b6ac815e fix saving media comments
The Kaltura widget makes javascript callbacks by calling functions on the
current window by name. The i18n scope was hiding those, so we'll put them on
window explicitly.

Change-Id: Ibe3cbac87c56eeb4f971c6e68ea0004d52a75c48
Reviewed-on: https://gerrit.instructure.com/4651
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-12 12:46:30 -06:00
JT Olds 98ffbbc83e allow enrollments through the UI with usernames
also adds enrollments in batches, instead of one at a time via ajax.

closes #4835

Change-Id: Ic2aac24db2c4d5fb4482901daf8627419c548e37
Reviewed-on: https://gerrit.instructure.com/4584
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-07-12 11:54:38 -06:00
JT Olds 45f0fbd370 renaming EmailList to UserList
Change-Id: I35d8f072ed19741baa8598e78813c00d0e54a28a
Reviewed-on: https://gerrit.instructure.com/4585
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-07-12 11:54:30 -06:00
Bracken Mosbacker fd5293ea66 i18n javascript for message_student and prereq lookup
Change-Id: Ifb3e1e601e5aad9abd63560e24754e18aae3a222
Reviewed-on: https://gerrit.instructure.com/4413
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-11 10:10:16 -06:00
Brian Whitmer 1f4f1bd28a fix file storage quota enforcement
Most of this code was actually getting completely
bypassed because of some bad logic.  This now tries
to enforce storage quota limits with exceptions for
things like turning in homework.

Change-Id: Id025bcdcd40c560a22368dc84686a1307296e053
Reviewed-on: https://gerrit.instructure.com/4452
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-07-08 23:11:52 -06:00
Jon Jensen 47eea0b0eb fixed up a few i18n keys
Change-Id: I0a3502b0fdef62c743622426e79b40306afe5ad1
Reviewed-on: https://gerrit.instructure.com/4582
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-07-06 18:50:37 -06:00
Jon Jensen 35705ee7bc various i18n fixes/deduplication
added checks to extractor for some common typos/oversights (and more line numbers)

Change-Id: I7a2b080cf2a26cb6711539220fe2486a1a4f04b5
Reviewed-on: https://gerrit.instructure.com/4581
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-07-06 17:29:33 -06:00
JT Olds 5c62e434ce summary messages i18n
Change-Id: Ib34600c22dda89e99a43c09af7438103332c11d0
Reviewed-on: https://gerrit.instructure.com/4472
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-06 10:52:21 -06:00