Commit Graph

2318 Commits

Author SHA1 Message Date
Bryan Madsen 25553b1dde added additional steps to selenium/quizzes_spec mousewheel test
The steps are necessary because selenium would freeze during the
jenkins build when a dialog would appear when the test was closing

Change-Id: I07a6728457d66859829f84bde2acb8c8ffaddc0b
Reviewed-on: https://gerrit.instructure.com/6712
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-11-04 16:46:22 -06:00
Zach Wily 81949b2ebe don't html escape user answers in fimb questions; fixes #5628
Test Plan:

Create a quiz with a FIMB question. As a student, take the quiz and enter '<'
in one of the blanks for that question. Submit the quiz. See the results and
verify that '<' was not changed to '&lt;'.

Change-Id: I83df931bb0b3fa28d6a03d6d715d9ad27ddf8881
Reviewed-on: https://gerrit.instructure.com/6691
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-11-04 16:15:42 -06:00
Cody Cutrer fc385c4899 show merge link when applicable in profile refs #5833
Change-Id: I7cffb99cf9519f78045494dc9e37671e7b28faf0
Reviewed-on: https://gerrit.instructure.com/6689
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-11-04 15:28:57 -06:00
Jon Jensen 56dac9418a recompiled js files
Change-Id: I8c62308925d9f7b44525f045192a4bcc13fc52f2
Reviewed-on: https://gerrit.instructure.com/6698
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-11-04 14:48:33 -06:00
Cody Cutrer 1020430f52 infer the correct account when registering a new pseudonym refs #5833
Change-Id: I4a7a1e5a90668d161e5190c44705b8849fb0a039
Reviewed-on: https://gerrit.instructure.com/6608
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-11-04 12:54:48 -06:00
Bracken Mosbacker 5c57abea78 don't show discussion responses in stream when not allowed
Discussions have an option to not allow users to see replies
until they've posted themselves. This worked correctly on the
discussion page itself, but the user would still see the
replies in their stream

This also removes that option, and the delayed posting option
from group discussion topics. These settings are useless in
that context because all users are admins and can see the
topics anyway.

Test Plan:
 * create a topic in a course and check the box "Replies are not visible until after users post"
 * post a reply to that topic as the teacher
 * log in as a student in that course and go to your dashboard
 * you should see the topic in the stream but not the response you created as a teacher

closes #4706

Change-Id: I0c50a3adb8e18ea74d209f4c9a5ac429b7faaf0e
Reviewed-on: https://gerrit.instructure.com/6684
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-11-04 12:27:27 -06:00
Jacob Fugal 9e9040146a disable 'randomly assign students' for restricted self-signup groups
also, make the random assignment happen on the server via an ajax call.
before, it would make one ajax call per student assigned, which is
rather inefficient when there are many students to assign.

fixes #6099

Change-Id: I89e5059fa1bd42b1a25e5cb88d552841c426530a
Reviewed-on: https://gerrit.instructure.com/6576
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-11-04 12:25:44 -06:00
Jacob Fugal 94000c86f0 finish discussion topics API
supports creating and listing top-level entries in a discussion topic,
and creating and listing replies to a discussion entry. listing
discussion topics was already supported. includes support for
attachments on top-level entries.

test-plan:
  creating an entry under a topic
    should allow creating an entry under a topic and create it correctly
    should return json representation of the new entry
    should allow creating a reply to an existing top-level entry
    should not allow reply-to-reply
    should allow including attachments on top-level entries
    should silently ignore attachments on replies to top-level entries
    should include attachment info in the json response
  listing top-level discussion entries
    should return top level entries for a topic
    should return attachments on top level entries
    should include replies on top level entries
    should sort top-level entries by descending created_at
    should sort replies included on top-level entries by descending
  created_at
    should paginate top-level entries
    should only include the first 10 replies for each top-level entry
  listing replies
    should return replies for an entry
    should sort replies by descending created_at
    should paginate replies
  require initial post
    should allow admins to see posts without posting
    shouldn't allow student who hasn't posted to see
    shouldn't allow student's observer who hasn't posted to see
    should allow student who has posted to see
    should allow student's observer who has posted to see

fixes #4752

Change-Id: I0da83e6c301be74f1ac5d2d957ebb6338a98179c
Reviewed-on: https://gerrit.instructure.com/6690
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-11-04 12:25:27 -06:00
Ryan Shaw 7b3c47b2ff don't error when using grading_scheme and no score
Change-Id: Ib1b83e617d555a5b3834f5d8f2fb28ca031d5ded
fixes: #6164
Reviewed-on: https://gerrit.instructure.com/6634
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-11-04 09:59:25 -06:00
Brian Palmer 20d6180dc4 enforce nonce and timestamp in lti outcome requests
This uses redis to store the nonces as locks that expire after 90
minutes. Timestamps are epoch UTC values, as per the oauth spec.

testplan: send oauth requests to the api endpoint with the same nonce
more than once, or with a too-old timestamp

refs #5892

Change-Id: Id6130c2a07e206dad716673aa6adbe9d36565a7c
Reviewed-on: https://gerrit.instructure.com/6683
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-11-04 09:42:51 -06:00
Brian Palmer a67b9af987 add deleteResult support to LTI grade passback, refs #5892
Canvas' implementation now passes all the certification tests for section 8,
"LTI 1.1: Suport for Basic Outcomes Service"

testplan: manually set up an assignment as an external_tool, then use
the certification app to verify that deleteResult works as expected.

Change-Id: Idf694d9e5a617a08ef11c5d803ed564de6af1250
Reviewed-on: https://gerrit.instructure.com/6679
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-11-04 09:42:35 -06:00
Brian Palmer b9b5409d39 add readResult support to LTI grade passback, refs #5892
testplan: you can set up an assignment as an external_tool type
manually, and then hit the IMS certification test tool to verify that
replaceResult and readResult are now fully supported.

Change-Id: Id193ba1943f51b3cb4b6a2d078d8a2262c26659e
Reviewed-on: https://gerrit.instructure.com/6678
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-11-04 09:42:23 -06:00
Brian Palmer c1957aac1a launch lti tool when viewing external_tool assignment
There isn't current any way to create this assignment type in the UI.
This just gets us far enough that we can test out the API functionality
against the IMS tests and some other tools that use grade passback.

refs #5892

Change-Id: I6f806a53bca0708702ff9e64e8e520be26234430
Reviewed-on: https://gerrit.instructure.com/6661
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-11-04 09:42:13 -06:00
Cody Cutrer 2b3b31904f fix rendering settings page for accounts with customized login handles
refs #5833

Change-Id: I2e985fe86e4ef9cb5fa63deacaafaae69238ba5d
Reviewed-on: https://gerrit.instructure.com/6682
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-11-04 08:56:57 -06:00
Brian Palmer a70c0f45f0 fix incompatible change in prefixing of api routes
testplan: this fixes currently broken specs in some canvas plugins

Change-Id: I3c1c9f3ff34a2c1e6011adbc4c4f5ca0b7b40d5a
Reviewed-on: https://gerrit.instructure.com/6670
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-03 12:38:40 -06:00
Ryan Florence a880d38753 cancel mousewheel over select boxes fixes #6143
we suspect a lot of complaints about "my answers
are changing!" on quizzes is due to window's
mouse wheel behavior where a focused select box
gets its values changed when mousewheeled.

Now when users scroll after answering the question
it won't change on them.

Change-Id: Ia0c1ec095749997d0cf8adcf2853615d9c321c35
Reviewed-on: https://gerrit.instructure.com/6602
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-03 12:11:46 -06:00
Ryan Florence 127317682f added I18n js file to jquerypluginsspec
was throwing an error in the specs

Change-Id: Iace281478759ad4763089b432a2d71d62fd36648
Reviewed-on: https://gerrit.instructure.com/6620
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-11-03 10:50:09 -06:00
Bracken Mosbacker f15c5cc9c1 make sure matching questions are formatted correctly when imported
imported matching answers were missing the required 'left' field

import the package attached to the ticket to test

closes #6146

Change-Id: I97e4af7070cb2068e677af91d3f23cde8e077987
Reviewed-on: https://gerrit.instructure.com/6615
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-11-03 09:17:36 -06:00
Ryan Shaw 99a97badef track user interaction events in google analytics
this will track things like

form validation errors:
  * name of form (id or classname or page title)
  * which fields were invalid

viewing document previews
  * doc details
  * which service (google or scribd) used

Slow Ajax requests (things that take over 1 sec)
  *does not track things less than 1 sec

Change-Id: I569e405089df5acd983472cb834f35d41b1a4bf3
Reviewed-on: https://gerrit.instructure.com/6142
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-11-03 09:16:30 -06:00
Jon Jensen 395b0fdb07 only load course list when menu first opens
previously it did the ajax query on every page load, and always
regardless of whether anything could be customized. this seems like
a reasonable compromise to ensure there is no noticeable wait when
clicking on the customize link.

also fixed a display issue where the custom list editor got clipped
if you had no accounts or groups.

test plan:

1. regression test of menu customization
 1. add courses
 2. remove courses
 3. reset list
2. ensure menu works as expected for users w/ <= 8 courses
3. ensure menu customization ui works for teachers w/ > 8 courses
   and who are not account admins (i.e. no managed accounts)

Change-Id: I390806e6a05211fae9a7375490ca2036774edc7c
Reviewed-on: https://gerrit.instructure.com/6607
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-11-03 09:14:59 -06:00
Brian Palmer b66e8ba590 respond 'failure' not 'unsupported' for bad values in replaceResult
refs #5892

This also rejects values > 1.0, the LTI test suite specifically checks
for this. If we get a use case for a tool that wants to give extra
credit, we can re-evaluate.

Change-Id: I4894d8ae3b2fdcdb5eb3bae902ef934b34a632a3
Reviewed-on: https://gerrit.instructure.com/6658
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-11-03 08:54:03 -06:00
Brian Palmer 25d77ac15d add replaceResult support to LTI grade passback, refs #5892
Also versioned the URI and removed the tool_id param. As part of the
processing it pulls the tool from the assignment and verifies that it's
the same tool as was used to launch, by looking at the sourcedid.

Assignments now have an external_tool type and link to a
ContextExternalTool.

testplan: there isn't a way in the UI to configure an assignment as an
external tool yet, so it'll need to be manually configured in the
console.

Change-Id: I0cf5ec85d450409d6ea1ec71ce1d5d4c19622d4c
Reviewed-on: https://gerrit.instructure.com/6652
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-02 16:32:55 -06:00
Brian Whitmer 28c9895295 don't rename external tools when the tag is renamed
Other asset types (like assignments, wiki pages and files)
have a required linking between the name of the asset and
the name of the tag. This is for consistency's sake.
However, it doesn't make sense to enforce this kind of
policy for external tools, since tools can be configured
at the account level, and instructors shouldn't have the
ability to rename tools somewhere up the chain. This
change disconnects external tools from tags linking to
those external tools.

fixed #6170

testplan:
- configure an external tool
- add an external tool to a course module
- rename the link to something other than the tool's name
- check to make sure the tool's name didn't also change

- configure an external tool
- add an external tool to a course module
- rename the tool
- check to make sure the link's name didn't also change

- add an assignment to a course module
- rename the link in the module
- check to make sure the assignment's name also changed

- add an assignment to a course module
- rename the assignment
- check to make sure the module link's name also changed

Change-Id: I2291b4ca0ee2c83da1dd9a81bc46eb05d1925982
Reviewed-on: https://gerrit.instructure.com/6641
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-11-02 16:29:04 -06:00
Brian Palmer 7efd4c62b2 add LTI grade passback infrastructure, refs #5892
The endpoint is
/api/lti/tools/:tool_id/courses/:course_id/assignments/:assignment_id/submissions/:user_id

This shouldn't ever be hit manually, the URI is passed to the LTI assignment
tool in the lis_outcome_service_url param. The shared secret and the
lis_result_sourcedid parameter will prevent abuse.

Currently the endpoint doesn't support any queries, it responds
unsupported to all valid signed xml requests. Next step is to actually
implement viewing and changing the grade for the course/assignment/user
combination.

testplan: hit the url with a valid signed oauth request with xml body,
get back an "unsupported" api response

Change-Id: I2f938f3d45ec71488dd81ac74131acfe13b6d8cb
Reviewed-on: https://gerrit.instructure.com/6623
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-02 15:59:47 -06:00
JT Olds cf6a996bec get forked-selenium specs working again
* we no longer have a test environment in domain.yml i guess,
   which broke this
 * logging users in just by default assumed no forked server

testplan: n/a

Change-Id: I3c57aac6a1a1cf3164f1d9bc2b177a9d91162776
Reviewed-on: https://gerrit.instructure.com/6633
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-11-02 14:09:20 -06:00
Ryan Florence cf29385018 IE8 was throwing an error on objectCollection.indexOf
Overwriting index of on all objectCollections,
where before it checked if the object already had
an indexOf method.

Change-Id: I85deeb066f1cc3b81b0e0436aea4f47d2df2fcd3
Reviewed-on: https://gerrit.instructure.com/6616
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-11-02 12:57:46 -06:00
Ryan Florence be2fecb7ea fixes for IE8 incompatibility for userUtils
No String.prototype.trim, regex support is spotty,
and more IE fun.

Change-Id: I983bf9cc32ab049158b0633057c9141efb33e561
Reviewed-on: https://gerrit.instructure.com/6618
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-11-02 10:46:13 -06:00
Jon Jensen 0260734021 blur/change previous input when tiny gets focus, fixes #5764
fixes chrome/safari issue (ie and ff already fire the change event)

test plan:

in each supported browser:

 1. test the bugfix
  1. start taking a quiz with a numerical and an essay question
  2. type in the numerical answer
  3. click into the rich text editor
  4. confirm that the numerical answer gets marked as answered on the
     right hand side
 2. check for regressions/side effects, i.e. test the rich text editor
    in a few other places (e.g. quiz editor, wiki) and confirm that it
    is behaving normally and not generating javascript errors

Change-Id: I0794fe99588652fede2d10a766ad79dcfe8ebcfd
Reviewed-on: https://gerrit.instructure.com/6589
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2011-11-01 17:02:36 -06:00
JT Olds 2729cf1df3 api docs reference invalid jquery path
except we don't even use jquery in the api docs

testplan: n/a

Change-Id: I6d4be9e25ca68e64f62414a1e81ac40549a5b99f
Reviewed-on: https://gerrit.instructure.com/6617
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-11-01 15:34:29 -06:00
JT Olds a05c986540 these specs depend on at least one enabled conferences type
Testplan: n/a

Change-Id: Iaaedd184a8324275b669158b5dbc3c4027f78a71
Reviewed-on: https://gerrit.instructure.com/6613
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-01 14:07:37 -06:00
Cody Cutrer 70b1c6b70b avoid establishing a connection during initialization
Change-Id: I26cdb531d47fe495833d2de2b8ee9b841e1b72c8
Reviewed-on: https://gerrit.instructure.com/6612
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-11-01 13:54:00 -06:00
Jacob Fugal 847175bf32 enable showing group rosters on student groups view
when a student is viewing the list of groups they are in and that they
may join, enable viewing the roster of each group. :read_roster
permission is given to students that are eligible to join the group or
request an invitation to the group. fix pageless so that if the
container is hidden when a load completes, the loader is still properly
hidden. fixes #5931

Change-Id: I50aee8c19e927ce25afa17d9b1533df0aa7239e9
Reviewed-on: https://gerrit.instructure.com/6184
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-01 13:34:42 -06:00
Jon Jensen 74fb788200 include invited enrollments in course dropdown, show state
also made general purpose methods for ranking (in ruby and sql) and
distinct on.

Change-Id: I4052472eb700cbdfe6b586ed6d12f61fd51bf08f
Reviewed-on: https://gerrit.instructure.com/6593
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-01 12:37:34 -06:00
Brian Palmer 4efba9ac0a update oauth lib to 0.4.5 and our usage to oauth 1.0a
This gem update required updating our twitter, linkedin, and gdocs
integrations to correctly provide the redirect uri and use the oauth
verifier on return, which we weren't doing before.

As a consequence, google no longer displays a big scary warning about
Canvas not being secure in its oauth usage.

Facebook uses oauth 2.0, so no changes were needed there.

refs #5892

refs #6127 (this stuff needs refactoring)

Change-Id: I04289638915b84dbe439bd57b36da90151c662b9
Reviewed-on: https://gerrit.instructure.com/6585
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-11-01 12:08:10 -06:00
Zach Wily 834b8517f0 fix names on the access report, other tweaks; fixes #4682
This makes the access report actually show the right names for things, and it
also displays icons next to them to indicate the type.

Change-Id: I0241bc9546555a0796dee35786cdfcddb930ef1a
Reviewed-on: https://gerrit.instructure.com/3869
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-11-01 11:56:54 -06:00
Bracken Mosbacker b95617a36f only show feedback for the current course in feedback sidebar
This was already happening for a couple of the default front
pages, but this fix makes it happen for all of them

closes #5842

Change-Id: If11db2e93cdfe228a3ee9019ff68ffe97e03696f
Reviewed-on: https://gerrit.instructure.com/6601
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-01 11:48:00 -06:00
Ryan Florence cc4522fc04 incorporated AMD into the main application
- added AMD support for Template, but it still
  exports to window.Template until we convert all
  recent stuff into modules

- converted objectCollection, CustomList, and
  courseList to modules

- added specs for objectCollection

Change-Id: Ib4ca4e25374c656b7b583ec7284c37672c117d2a
Reviewed-on: https://gerrit.instructure.com/6545
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-01 10:33:49 -06:00
Bracken Mosbacker 8ec102aa0e don't try to delete an already deleted group membership
A group membership could have been deleted before this pre-processing
so if the membership isn't found don't try to delete it

closes #6145

Change-Id: I7bac508f52de0e3b07a83d2eb5c87b22886ce5cc
Reviewed-on: https://gerrit.instructure.com/6606
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-01 10:33:19 -06:00
Bryan Madsen 0161a8734b update selenium-webdriver gem to 2.10.0
Change-Id: I951108682c1dc509c5194aab82151c3c44acce4c
Reviewed-on: https://gerrit.instructure.com/6569
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-11-01 10:23:23 -06:00
Jon Jensen ada8367873 cache menu courses
Change-Id: I75dc56fc3ad26f9b2fe60234ecda4ed695a92bf3
Reviewed-on: https://gerrit.instructure.com/6603
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-11-01 10:19:32 -06:00
Ryan Shaw 134e3a105b add mobile login screen for ipod/iphone. closes #5817
Change-Id: Ib0e787a1e5802207c54856162fecca856c241b51
Reviewed-on: https://gerrit.instructure.com/6575
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
2011-11-01 10:12:26 -06:00
Cody Cutrer f259d610bd don't send merge notifications to users that can't login
refs #5833

Change-Id: Ibf9ca8188510ba0aa5e722dc2f64d87293686c4f
Reviewed-on: https://gerrit.instructure.com/6597
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-11-01 09:36:09 -06:00
Jon Jensen 0dcfd7dff8 fix conversation api doc
Change-Id: I5f936ff709d6b7becd33eb9c517a13a712d0490d
Reviewed-on: https://gerrit.instructure.com/6604
Reviewed-by: BJ Homer <bj@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-11-01 08:41:05 -06:00
JT Olds 752225f676 don't create a dimdim plugin setting for every spec
Change-Id: Ic381eaec230a2605964e171264c8b943a0d7c788
Reviewed-on: https://gerrit.instructure.com/6574
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-10-31 17:13:33 -06:00
JT Olds 98e18bab02 fixing google doc deletion. refs #5796
Change-Id: I9ebf2875367cafe1fd9f8d96174d1e62fd6bd542
Reviewed-on: https://gerrit.instructure.com/6485
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-31 17:13:06 -06:00
JT Olds b0f4c0cf6d a GoogleDocEntry is not a model
Change-Id: I1f59e486a7c7a6d63a216d00004cd2e0acd5740d
Reviewed-on: https://gerrit.instructure.com/6503
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-31 17:12:57 -06:00
Brian Palmer a6c537f948 remove rb-fsevent/rb-inotify from the gemfile
This doesn't work with our current deploy process, so it'll need to be
in devs' local Gemfile for now

Change-Id: Ia918672fac851b132c2e688a27bf9f20555f65c3
Reviewed-on: https://gerrit.instructure.com/6598
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-31 15:36:26 -06:00
Cody Cutrer 4e1f699a71 don't lose our enrollment when navigating between multiple courses with pending invitations
refs #5833

Change-Id: I9e91bb20f7f4f412b2c604f27acb86a02d338323
Reviewed-on: https://gerrit.instructure.com/6596
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-31 14:55:44 -06:00
Brian Palmer 03d8d6df64 remove cruft around unused image search library and model
We do support flickr searches, but it happens completely in javascript.
I guess originally it was going to go through a controller action and
use the individual user's flickr api credentials as a UserService or
something.

Change-Id: I531777458d0e59ca0f1180aa11e3b31029975f34
Reviewed-on: https://gerrit.instructure.com/6480
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-10-31 14:52:15 -06:00
Zach Wily f6e13d5a2d show login label on "add user" screen for cas/saml users; fixes #6120
Since SAML/CAS users are unlikely to be using email addresses as logins, we
now show the "Login:" field always in the Add User dialog for them. They can
also specify a login label in their authentication configuration, and it
defaults to Login.

Change-Id: Idcfd876d947eb0ca104a6681a02ac11f993302ce
Reviewed-on: https://gerrit.instructure.com/6566
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-31 14:03:26 -06:00