Commit Graph

1491 Commits

Author SHA1 Message Date
Cody Cutrer 828a58b9e3 don't fail zipping empty folders. fixes #5002
Change-Id: I510facebfc85fd617013741d862d3417b66ce341
Reviewed-on: https://gerrit.instructure.com/4949
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-04 12:44:02 -06:00
Cody Cutrer aa69f2bc02 masquerading missed i18n
Change-Id: I8bd956d15d1c455384959a3fb9f87d9992c66588
Reviewed-on: https://gerrit.instructure.com/4946
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-04 12:33:12 -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
Brian Whitmer 13dce134d4 support query parameters in Basic LTI
External tools were not working if there were query parameters
in the URL (http://dr-chuck.com/ims/php-simple/tool.php?a=1&b=2).
This should now work correctly.

Change-Id: Ibc0b0d61deed508058cadd07bbc2387194926f9e
Reviewed-on: https://gerrit.instructure.com/4936
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-08-04 11:43:04 -06:00
Jon Jensen 103116eadf scope cached fragments to locale, fix some caching issues
Change-Id: Id1ad5229bbde6f54bf8b8b92030bb69180bef5b6
Reviewed-on: https://gerrit.instructure.com/4933
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-08-04 10:43:50 -06:00
tom metge 043c92e575 don't raise when ldap host is invalid
Change-Id: Ie2bfa8d4369e43aa187b77b865f86abcb3ed36ae
Reviewed-on: https://gerrit.instructure.com/4927
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-08-04 10:26:06 -06:00
JT Olds c930cfd6db don't bail when an abstract course is not available
fixes #5183

Change-Id: I2425b901bcbc454ec5238694c337cda1b4e1de81
Reviewed-on: https://gerrit.instructure.com/4904
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-08-04 10:06:08 -06:00
JT Olds b92427222e allow unchanged passwords to be reset via sis
fixes #5182

Change-Id: I5c7a6705714b3991048b468ad5961875311f1348
Reviewed-on: https://gerrit.instructure.com/4903
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-08-04 10:06:00 -06:00
Cody Cutrer b01bc2fc0b don't always show Wimba conferences fixes #5071
check for presence, validity, and enabled of settings as whole,
rather than if any settings (including defaults) exist

Change-Id: I33a7cbd2da645185cce7bbd7b154e27f28a0ddfe
Reviewed-on: https://gerrit.instructure.com/4899
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-04 09:41:27 -06:00
Brian Palmer ef286021fa enable español
Change-Id: I26697efb99b83fc8f1564b19804619f1a9d51006
Reviewed-on: https://gerrit.instructure.com/4930
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-03 17:14:30 -06:00
Jon Jensen e1debe40ad generate js translation files as part of compiling assets
Change-Id: I0fa75273af3c9b43d9ca7deee1eccce0ec27e3f5
Reviewed-on: https://gerrit.instructure.com/4909
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-03 15:42:39 -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 9c8dbf57ad fix announcements not going to dashboard on delayed change; fixes #5185
Change-Id: I670e5c5acbf3d121fe3861f3751e2af55bb4e91d
Reviewed-on: https://gerrit.instructure.com/4908
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-03 14:40:44 -06:00
Zach Wily 9e2ba3d24a show terms in courses dropdown when it's necessary; fixes #4803
Rather than always showing the term of the course, we're going to show it if
the following conditions are met:
 * it's not the "Default Term"
 * the user has at least two courses with the same name in different terms

On the full list of enrollments screen, we'll always show the term if it's not
Default Term.

Change-Id: Id1424b13feb0c9cd65eed7cc48e980c3a4603f2d
Reviewed-on: https://gerrit.instructure.com/4907
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-03 14:40:14 -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
Cody Cutrer c186e53736 wiki_sidebar doesn't need active folders, but does need non-truncated root folders
Change-Id: I6b8cc9720bd76f98f55afb2b0b4b491e5c2c9863
Reviewed-on: https://gerrit.instructure.com/4913
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-03 14:13:18 -06:00
Jon Jensen f3beda6ed6 localize notifications according to user's locale (or browser_locale)
Change-Id: I39d76c156182f448c4c7efa6743c14ac70dd0faf
Reviewed-on: https://gerrit.instructure.com/4906
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-08-03 13:13:29 -06:00
Brian Palmer 1e9e7dbeb2 api to retrieve a single course
This also solves the use case of requesting a course by sis id, and
getting the internal canvas id back.

Change-Id: Ie614310a3c5a2eed668e3787a2280a8ae9f89f9b
Reviewed-on: https://gerrit.instructure.com/4901
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-08-03 12:44:16 -06:00
Brian Palmer d22878be0e continue to allow the previous api behavior when the user has a canvas session
Change-Id: Ibf65f01d8dc180eea78b9e8812c2dace000ae63b
Reviewed-on: https://gerrit.instructure.com/4830
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-08-03 12:43:54 -06:00
Zach Wily 770e8aca86 fix i18n for default term name
The strategy is that if a term is named "Default Term", that will be a marker
that it's the default term in any language. When displaying the term name, we
check if it == "Default Term" and show the translated version if so. We also
do some special-casing on saving a new term name to make sure the translated
term name doesn't get saved as the new name.

Change-Id: Ic2b6659f75ef5e56bb5aa5fb7b241bba77dee445
Reviewed-on: https://gerrit.instructure.com/4905
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-03 11:20:39 -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
Zach Wily 97a3b778fd sort files alphabetically in the modules file picker; fixes #4082
Change-Id: Ie17aa35636c9f66f4bb285fda6d6032e537d1a17
Reviewed-on: https://gerrit.instructure.com/4902
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-02 16:35:21 -06:00
tom metge 249b6540e9 add a configuration test utility for LDAP settings
a modal dialog is presented to the user that runs several tests:
connection, LDAP bind, LDAP search, and testing of arbitrary
LDAP credentials.

Change-Id: I7bf53fb856784598367e3481008b9a7be9526c62
Reviewed-on: https://gerrit.instructure.com/4485
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-08-02 16:07:18 -06:00
Cody Cutrer eb4b0b27fb fix mt usage in AccountsController
Change-Id: I1399754028c0b4aa94cf125a2ac33387da31ff56
Reviewed-on: https://gerrit.instructure.com/4900
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-08-02 12:22:38 -06:00
Brian Palmer 3ac246b839 re-enable these disabled files controller specs
also fix some specs that weren't actually testing anything, because no
exception was being raised

Change-Id: I3e61f7c3c80003cacf7b722bd2525705ef786c1e
Reviewed-on: https://gerrit.instructure.com/4855
Reviewed-by: JT Olds <jt@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-29 13:48:51 -06:00
JT Olds d2d99c0b53 removing invalid copyright
Change-Id: I87e10c6cb97a99988a9f87857d5c6e0c0e44442a
Reviewed-on: https://gerrit.instructure.com/4843
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-07-29 12:58:10 -06:00
Brian Palmer 821c648abd wrong key name in file_store.yml.example
Change-Id: I0aa0b568e79402ad9f4f07e249fda3248d72a9ae
Reviewed-on: https://gerrit.instructure.com/4854
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-29 12:52:24 -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
Brian Palmer b970f4a650 limit sis import transaction time
Change-Id: Ife4425585bf413f8b4c8d26a42dddff2786e7d1e
Reviewed-on: https://gerrit.instructure.com/4847
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-07-29 08:41:55 -06:00
JT Olds 323348f239 can't add floats to strings in ruby
use string interpolation instead. fixes #5157

Change-Id: Ida55869a1b3b6ef5d432ae3574ede141f5962cc2
Reviewed-on: https://gerrit.instructure.com/4829
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-07-28 16:18:49 -06:00
Cody Cutrer 1b03b2f61d don't multiply quota by 2^20 on the statistics page
Change-Id: I6596e9ac09ec7d28b59cce7bad65ccd8e75b1b61
Reviewed-on: https://gerrit.instructure.com/4834
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-28 12:46:36 -06:00
Brian Palmer 8259d2b51c create a unique temp directory for each job, underneath the master tmpdir
This way it's easy to tell what job created a file, and it makes cleanup
more reliable, since Dir.mktmpdir will remove the whole directory when
the job ends and the block exits.

Closes #5093

I was a bit worried about the performance impact of making a new
directory for every single job, but on an active job server of ours, it
only seems to add about 160 microseconds per job.

Change-Id: Id4318da20cac75e6ba232ec2250b78c38485f9e4
Reviewed-on: https://gerrit.instructure.com/4811
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-07-28 12:43:06 -06:00
Brian Palmer e06d3ba422 support publishNow respondus setting, closes #5137
Change-Id: Iae961cd08579525e311a8a70c04bd2186f8382a8
Reviewed-on: https://gerrit.instructure.com/4803
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-07-28 12:42:58 -06:00
Bracken Mosbacker b3167f4640 start discussion topic api
refs #4752

Change-Id: I54712c27ef1c496c2c92f7805240ca91405b2858
Reviewed-on: https://gerrit.instructure.com/4797
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-28 12:05:18 -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
Brian Palmer 8ce1e3091f sel spec for cloned image thumbnails displaying in wiki sidebar
Change-Id: I5f7280750daf079fa539926f43eb27a1348b7d2e
Reviewed-on: https://gerrit.instructure.com/4824
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
2011-07-27 12:42:40 -06:00
Zach Wily 955e61af53 deactivate enrollments when date restrictions are added
Change-Id: Ic6e50a8c31f58032ea9219ef7143f69c9539bb25
Reviewed-on: https://gerrit.instructure.com/4806
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-27 10:25:54 -06:00
Zach Wily 15c7faa005 active enrollments when removing term date restrictions; fixes #4988
Change-Id: I11a616dc762ea66e47d916e9b53b3bc178fc26e8
Reviewed-on: https://gerrit.instructure.com/4802
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-27 10:25:39 -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
Brian Palmer 85476a42fb fix typos in sis importer causing wrong object ids to update batch id
This was causing "full batch mode" to delete things that it shouldn't.

Fixes #5084

Change-Id: I6e19820ae9daf0b2096fd569451669ad2bb5f52f
Reviewed-on: https://gerrit.instructure.com/4820
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-27 09:46:24 -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
Brian Palmer e6800c8b6a fix initialization of redis-cache cache store
The current version of redis-cache takes only the list of servers, it
doesn't support other config options like key prefix or database number.

Change-Id: If233c46d77b58650627dda75d7a8e1f2f212eb7f
Reviewed-on: https://gerrit.instructure.com/4801
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-07-25 16:35:29 -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
Brian Palmer 6cd7e209af log job id and worker id with all log lines for delayed jobs
closes #5094

Change-Id: I257ade8d7a07d75392eca64377bd3c1655521045
Reviewed-on: https://gerrit.instructure.com/4796
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-07-25 13:25:53 -06:00
Brian Palmer 353204e7a1 log context when using local rails buffered logger
This was already supported for Syslog, but not for the BufferedLogger
class. Also add an option to disable the context logging.

This also fixes a bug where the session logging was always using the
default session cookie name (_normandy_session), rather than the
configured one.

refs #5094

Change-Id: I4c8389f1051a70c25a92bfe018044cd15f45422b
Reviewed-on: https://gerrit.instructure.com/4795
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-25 13:25:18 -06:00
Zach Wily 3bafa682d9 speed up courses selenium test
In this spec we call find_element a lot when we expect that the element
probably isn't there. implicit_wait was causing each of those calls to take 3
seconds. For this spec, we manually set it to zero.

Also changed the default 3 second implicit_wait to 1 second for everything.

Also changed the spec to use create_session instead of doing a full login
sequence.

These changes reduced this spec's runtime from 90s to 30.

Change-Id: I9f268ac437eae5ef24ec71a5c1108957b83fd8de
Reviewed-on: https://gerrit.instructure.com/4794
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-25 08:28:36 -06:00