Clone
 

ryan lowe <rjlowe@iupui.edu> in Sakai.Git

svn merge -c 47534 https://source.sakaiproject.org/svn/msgcntr/branches/SAK-13638 U messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java rjlowe:trunk rjlowe$ svn log -r 47534 https://source.sakaiproject.org/svn/msgcntr/branches/SAK-13638 ------------------------------------------------------------------------ r47534 | rjlowe@iupui.edu | 2008-06-16 15:49:51 -0400 (Mon, 16 Jun 2008) | 1 line

SAK-13359 - adding formatted text to revised messages

------------------------------------------------------------------------

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/trunk@47535 66ffb92e-73f9-0310-93c1-f5514f145a0a

UNmerging SAK-13054 from trunk 2-5-x 2-4-x

mailarchive rjlowe$ svn merge -r 41499:41498 https://source.sakaiproject.org/svn/mailarchive

U trunk/mailarchive-tool/tool/src/java/org/sakaiproject/mailarchive/tool/MailboxAction.java

U trunk/mailarchive-tool/tool/src/bundle/email.properties

ryans-macbook-pro-2:mailarchive rjlowe$ svn merge -r 45857:45856 https://source.sakaiproject.org/svn/mailarchive

U branches/sakai_2-5-x/mailarchive-tool/tool/src/java/org/sakaiproject/mailarchive/tool/MailboxAction.java

U branches/sakai_2-5-x/mailarchive-tool/tool/src/bundle/email.properties

ryans-macbook-pro-2:mailarchive rjlowe$ svn merge -r 45875:45874 https://source.sakaiproject.org/svn/mailarchive

U branches/sakai_2-4-x/mailarchive-tool/tool/src/java/org/sakaiproject/mailarchive/tool/MailboxAction.java

U branches/sakai_2-4-x/mailarchive-tool/tool/src/bundle/email.properties

ryans-macbook-pro-2:mailarchive rjlowe$ svn log -r 41499 https://source.sakaiproject.org/svn/mailarchive

------------------------------------------------------------------------

r41499 | rjlowe@iupui.edu | 2008-02-21 14:00:24 -0500 (Thu, 21 Feb 2008) | 1 line

SAK-13054

------------------------------------------------------------------------

ryans-macbook-pro-2:mailarchive rjlowe$ svn log -r 45857 https://source.sakaiproject.org/svn/mailarchive

------------------------------------------------------------------------

r45857 | david.horwitz@uct.ac.za | 2008-04-28 04:46:01 -0400 (Mon, 28 Apr 2008) | 11 lines

svn log -r41499 https://source.sakaiproject.org/svn/mailarchive/trunk/

------------------------------------------------------------------------

r41499 | rjlowe@iupui.edu | 2008-02-21 21:00:24 +0200 (Thu, 21 Feb 2008) | 1 line

SAK-13054

------------------------------------------------------------------------

dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn merge -c41499 https://source.sakaiproject.org/svn/mailarchive/trunk/ mailarchive/

U mailarchive/mailarchive-tool/tool/src/java/org/sakaiproject/mailarchive/tool/MailboxAction.java

U mailarchive/mailarchive-tool/tool/src/bundle/email.properties

------------------------------------------------------------------------

ryans-macbook-pro-2:mailarchive rjlowe$ svn log -r 45875 https://source.sakaiproject.org/svn/mailarchive

------------------------------------------------------------------------

r45875 | stuart.freeman@et.gatech.edu | 2008-04-28 09:22:26 -0400 (Mon, 28 Apr 2008) | 15 lines

SAK-13054 Mail Archive - Creating a mail archive with alias "postmaster" causes a Denial of Service attack

--(stuart@mothra:pts/3)----------------------------------------------------------------------------------------------------------------------------------------------(/home/stuart/src/sakai_2-4-x/mailarchive)--

--(0919:Mon,28 Apr 08:$)-- svn merge -c 41499 https://source.sakaiproject.org/svn/mailarchive/trunk .

U mailarchive-tool/tool/src/java/org/sakaiproject/mailarchive/tool/MailboxAction.java

U mailarchive-tool/tool/src/bundle/email.properties

--(stuart@mothra:pts/3)----------------------------------------------------------------------------------------------------------------------------------------------(/home/stuart/src/sakai_2-4-x/mailarchive)--

--(0920:Mon,28 Apr 08:$)-- ^merge -c^log -r

svn log -r 41499 https://source.sakaiproject.org/svn/mailarchive/trunk .

------------------------------------------------------------------------

r41499 | rjlowe@iupui.edu | 2008-02-21 14:00:24 -0500 (Thu, 21 Feb 2008) | 1 line

SAK-13054

------------------------------------------------------------------------

------------------------------------------------------------------------

git-svn-id: https://source.sakaiproject.org/svn/mailarchive/trunk@47415 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-13020 - Removing time on Gradebook's Due Date due to Assignments2 no longer needing it

svn merge -r 41305:41304 https://source.sakaiproject.org/svn/gradebook/trunk .

D app/business/src/sql/mysql/SAK-13020.sql

D app/business/src/sql/oracle/SAK-13020.sql

U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/GradebookItemProducer.java

C app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentCreator.java

U app/ui/src/webapp/spreadsheetImport.jsp

U app/ui/src/webapp/inc/bulkNewItems.jspf

U app/ui/src/webapp/inc/assignmentEditing.jspf

D app/ui/src/webapp/content/images/pdate.gif

U service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradableObject.hbm.xml

rjlowe:gradebook rjlowe$ vi app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentCreator.java

rjlowe:gradebook rjlowe$ svn resolved app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentCreator.java

Resolved conflicted state of 'app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentCreator.java'

rjlowe:gradebook rjlowe$ svn log -r 41305 https://source.sakaiproject.org/svn/gradebook/trunk

------------------------------------------------------------------------

r41305 | rjlowe@iupui.edu | 2008-02-20 09:34:05 -0500 (Wed, 20 Feb 2008) | 1 line

SAK-13020 - Update Gradebook Due Date to a datetime field to store the date and time an item is due

------------------------------------------------------------------------

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@46218 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-13359

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/trunk@45334 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-13167 - merge branch back into trunk

svn merge -r 42075:43695 https://source.sakaiproject.org/svn/msgcntr/branches/SAK-13167 .

A messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/entity

A messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/entity/ForumTopicEntityProviderImpl.java

A messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/entity/ForumEntityProviderImpl.java

A messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/entity/ForumMessageEntityProviderImpl.java

U messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/ui/DiscussionForumManagerImpl.java

U messageforums-component-impl/pom.xml

U .classpath

U components/src/webapp/WEB-INF/components.xml

A messageforums-api/src/java/org/sakaiproject/api/app/messageforums/entity

A messageforums-api/src/java/org/sakaiproject/api/app/messageforums/entity/ForumTopicEntityProvider.java

A messageforums-api/src/java/org/sakaiproject/api/app/messageforums/entity/ForumEntityProvider.java

A messageforums-api/src/java/org/sakaiproject/api/app/messageforums/entity/ForumMessageEntityProvider.java

U messageforums-api/src/java/org/sakaiproject/api/app/messageforums/ui/DiscussionForumManager.java

U messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties

U messageforums-api/pom.xml

U messageforums-app/src/java/org/sakaiproject/tool/messageforums/MessageForumsFilePickerServlet.java

A messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessagesDirect.jsp

A messageforums-app/src/webapp/jsp/discussionForum/message/dfViewThreadDirect.jsp

U messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp

U messageforums-app/src/webapp/jsp/discussionForum/message/dfViewThread.jsp

U messageforums-app/src/webapp/jsp/discussionForum/forum/dfForumDetail.jsp

A messageforums-app/src/webapp/jsp/discussionForum/forum/dfForumDirect.jsp

U messageforums-app/pom.xml

svn log -r 42075:43695 https://source.sakaiproject.org/svn/msgcntr/branches/SAK-13167

------------------------------------------------------------------------

r42076 | joshua.ryan@asu.edu | 2008-03-10 16:43:23 -0400 (Mon, 10 Mar 2008) | 11 lines

SAK-13167 First pass at EntityBroker and DirectServlet tie in for messagecenter Forum Entites.

* Added Entity Providers for topics and forums

* Added direct jsp access for topics and forums (requires a redirect currently, use of threadLocalManager got things very close but urls were broken, maybe later we'll have direct access with no redirects..)

* Altered message cetner jsf servlet to implement HttpServletAccessProvider for direct servlet access

* Altered DiscussionForumManager to allow easy access to the context (siteId) for a given Forum, Topic or Message

What's left: authz, draft checking and hopefully get rid of the redirect

------------------------------------------------------------------------

r42094 | joshua.ryan@asu.edu | 2008-03-11 02:18:59 -0400 (Tue, 11 Mar 2008) | 2 lines

SAK-13167 added the access side of authz and started Message support

------------------------------------------------------------------------

r42118 | joshua.ryan@asu.edu | 2008-03-11 12:55:34 -0400 (Tue, 11 Mar 2008) | 2 lines

SAK-13167 completed direct access for Messages

------------------------------------------------------------------------

r42153 | joshua.ryan@asu.edu | 2008-03-11 23:29:17 -0400 (Tue, 11 Mar 2008) | 2 lines

SAK-13167 Added the basis for Entity hierarchy via Entity properties

------------------------------------------------------------------------

r42984 | joshua.ryan@asu.edu | 2008-03-23 01:08:00 -0400 (Sun, 23 Mar 2008) | 3 lines

SAK-13167 tighten up authz rules on EntityProviders, could be better, but the existing authz rules are too spread out.

------------------------------------------------------------------------

r42993 | joshua.ryan@asu.edu | 2008-03-23 23:18:38 -0400 (Sun, 23 Mar 2008) | 3 lines

SAK-13167 Added more meta data to available properties available via PropertyProvideable interface

------------------------------------------------------------------------

r43001 | joshua.ryan@asu.edu | 2008-03-24 11:42:47 -0400 (Mon, 24 Mar 2008) | 2 lines

SAK-13167 Localized dates in meta properties

------------------------------------------------------------------------

r43694 | joshua.ryan@asu.edu | 2008-03-26 15:53:43 -0400 (Wed, 26 Mar 2008) | 3 lines

SAK-13167 fix rookie mistake

------------------------------------------------------------------------

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/trunk@45333 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 5 more files in changeset.
NOJIRA - make the helper producer more generic with introduction of HelperAwareProducer extensions

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@43805 66ffb92e-73f9-0310-93c1-f5514f145a0a

ASNN-87 - Gradebook Helper / Need to account for GB configured for % grade entry

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@42473 66ffb92e-73f9-0310-93c1-f5514f145a0a

ASNN-65 GB Helper / error saving when due date is specified (error is missiing key in bundle)

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@42213 66ffb92e-73f9-0310-93c1-f5514f145a0a

ASNN-25 - gradebook helper / on initial creation of gb item the setting

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@41539 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-13054

git-svn-id: https://source.sakaiproject.org/svn/mailarchive/trunk@41499 66ffb92e-73f9-0310-93c1-f5514f145a0a

ASNN-25, ASNN-26 - Error checking on new gradebook helper, sorry for the two JIRAs one commit, but you can't have one without the other

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@41318 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-13020 - Update Gradebook Due Date to a datetime field to store the date and time an item is due

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@41305 66ffb92e-73f9-0310-93c1-f5514f145a0a

    • -0
    • +3
    /gradebook/app/business/src/sql/mysql/SAK-13020.sql
    • -0
    • +1
    /gradebook/app/business/src/sql/oracle/SAK-13020.sql
    • binary
    /gradebook/app/ui/src/webapp/content/images/pdate.gif
ASNN-23 - Grade Individual's Submission / Unable to enter a grade and comments

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@41283 66ffb92e-73f9-0310-93c1-f5514f145a0a

ASNN-14 - Add Assignment page / create a new BG item does not automatically select to use that item

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@41235 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-12786 - Multiple Clicks on Mark as Read

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/trunk@40504 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA - Creating permissions for new gradebook helpers, and rewrite entity broker prefix

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@40480 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-12767 - Stop running this script - upgrade jquery in reference to 1.1.4

git-svn-id: https://source.sakaiproject.org/svn/reference/trunk@40448 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA - updated url pattern for the helpers

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@40221 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA - new urls for helpers

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@40220 66ffb92e-73f9-0310-93c1-f5514f145a0a

    • -0
    • +75
    /gradebook/app/ui/src/webapp/content/templates/gradebookItem.html
NOJIRA - Minor UI changes to helper tools for Assignments2

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39903 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA - REasonable date selected in helper

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39894 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA- Minor UI updates to helper app

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39882 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA - changes to helper app

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39801 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA - Minor updates

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39800 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA - GB Helper work for Assignments2

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39792 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA - Temporary Finished Helper page to make Assignments2 Helper app work correctly

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39779 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-12180 - Fixed errors with grading helper

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39769 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-12180 - New helper tool to grade an assignment

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39765 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA - Gradebook RSF helper validation work and error throwing

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39689 66ffb92e-73f9-0310-93c1-f5514f145a0a

NOJIRA - Adding JS to add form in helper

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@39687 66ffb92e-73f9-0310-93c1-f5514f145a0a