Sakai.Git

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
KNL-1430 detect true value of copyright Alert property (#2404)

* KNL-1430 detect true value of copyright Alert property

SAK-30871: Turn off email notifications when a file is uploaded in elfinder (#2365)

SAK-30871: Add email option in rename method

SAK-30871: Turn off email notifications when a file is uploaded in elfinder (#2365)

SAK-30871: Add email option in rename method

SAK-31198 Upgrade CAS Client to allow new CAS 4 servers. (#2528)

SAK-31090 changed table to get rid of extra column (#2409)

SAK-31090 changed table to get rid of extra column (#2409)

SAM-2747; fix extended dates (#2495)

* SAM-2747; fix extended dates

* SAM-2747; handle missing and blank dates properly for extended dates

* SAM-2747; explicit blank entry is different from not overriding dates

* SAM-2747; fix defualt values when not using US English

* SAM-2747; date format needs to be consistent

    • -11
    • +35
    /samigo/samigo-app/src/webapp/js/extendedTime.js
SAM-2747; fix extended dates (#2495)

* SAM-2747; fix extended dates

* SAM-2747; handle missing and blank dates properly for extended dates

* SAM-2747; explicit blank entry is different from not overriding dates

* SAM-2747; fix defualt values when not using US English

* SAM-2747; date format needs to be consistent

    • -11
    • +35
    /samigo/samigo-app/src/webapp/js/extendedTime.js
SAK-31184 feedback improvements (#2504)

* SAK-31184 Turn Help Panel into own email form

This change changes the Help panel to have it's own backing email form.

As well as own email destination, configurable service name, and

configurable link.

* Create Reusable EmailForm Template

This change creates a reusable emailForm template which may be used

to by various panels to send emails with customizable (via bundles)

instructions.

* Each panel can now be a link or form

Within the feedback tool, each panel may now be a link or a form.

The only exception is that the content panel is always an email form.

The suggestions, helpdesk, and technical panels may all be either an

email form or an external link.

* Add two optional panels to feedback

This change adds in two default hidden panels to the feedback tool.

These panels allow administrators to configure additional "modules" /

services / etc available to users within the feedback tool. The panel's

are just shells, so they will need to be configured (setting up their

messages via bundles).

* Improve styling

These changes improve the styling of the feedback tool.

* Icons are now configurable via bundles, in the form of

bundleCategory_icon_no_translate. For example,

content_icon_no_translate or ask_icon_no_translate.

* Icons are now a fix width.

* The header now has a set height

* Bullets are added to each panel's explanation, as well as improved

spacing between items

* The panel's action (i.e. link or to emailForm) is at the bottom of

the panel and centered.

* Each panel's height and width has been increased to allow for the

explanation to not be as squished

* Improve link style

* Improve centering of bottom link

(cherry picked from commit d8991e695ea8f7f82c6cdbf75d1d13e14949b1db)

Conflicts:

feedback/src/main/resources/org/sakaiproject/feedback.properties

    • -1
    • +1
    /feedback/src/java/mysql/createtables.sql
    • -1
    • +1
    /feedback/src/java/oracle/createtables.sql
    • -0
    • +43
    /feedback/src/webapp/WEB-INF/templates/emailForm.handlebars
    • -43
    • +50
    /feedback/src/webapp/css/feedback.css
    • -24
    • +94
    /feedback/src/webapp/js/feedback.js
SAK-31184 feedback improvements (#2504)

* SAK-31184 Turn Help Panel into own email form

This change changes the Help panel to have it's own backing email form.

As well as own email destination, configurable service name, and

configurable link.

* Create Reusable EmailForm Template

This change creates a reusable emailForm template which may be used

to by various panels to send emails with customizable (via bundles)

instructions.

* Each panel can now be a link or form

Within the feedback tool, each panel may now be a link or a form.

The only exception is that the content panel is always an email form.

The suggestions, helpdesk, and technical panels may all be either an

email form or an external link.

* Add two optional panels to feedback

This change adds in two default hidden panels to the feedback tool.

These panels allow administrators to configure additional "modules" /

services / etc available to users within the feedback tool. The panel's

are just shells, so they will need to be configured (setting up their

messages via bundles).

* Improve styling

These changes improve the styling of the feedback tool.

* Icons are now configurable via bundles, in the form of

bundleCategory_icon_no_translate. For example,

content_icon_no_translate or ask_icon_no_translate.

* Icons are now a fix width.

* The header now has a set height

* Bullets are added to each panel's explanation, as well as improved

spacing between items

* The panel's action (i.e. link or to emailForm) is at the bottom of

the panel and centered.

* Each panel's height and width has been increased to allow for the

explanation to not be as squished

* Improve link style

* Improve centering of bottom link

    • -1
    • +1
    /feedback/src/java/mysql/createtables.sql
    • -1
    • +1
    /feedback/src/java/oracle/createtables.sql
    • -0
    • +43
    /feedback/src/webapp/WEB-INF/templates/emailForm.handlebars
    • -43
    • +50
    /feedback/src/webapp/css/feedback.css
    • -24
    • +94
    /feedback/src/webapp/js/feedback.js
SAM-2880:Double precision sum trouble leads to wrong score intervals (#2533)

SAM-2880:Double precision sum trouble leads to wrong score intervals (#2533)

SAK-30863 change zh to zh-cn (#2523)

SAK-30240 update date widget in Calendar tool (#2468)

SAK-30240 update date widget in Calendar tool (#2468)

SAK-31106 Can Mark same message as read multiple times (#2484)

SAK-31106 Can Mark same message as read multiple times (#2484)

SAK-30859 Remove link broken in Course Setup (#2485)

SAK-30859 Remove link broken in Course Setup (#2485)

Merge pull request #2513 from juanjmerono/SAK-31188

SAK-31188 Update spanish translations in 11.x branch up to 100%

Merge pull request #2514 from juanjmerono/SAK-31190

SAK-31190 Update spanish translations in master/trunk up to 100%

SAK-30287 - Assignment - categories not available if no gb item created (#2506)

SAK-30287 - Assignment - categories not available if no gb item created (#2506)

SAK-30243 new date widget to resources (#2526)

SAK-30243 new date widget to resources (#2526)

SAM-2852 Samigo negative point regression (#2520)

    • -11
    • +49
    /samigo/samigo-app/src/webapp/js/authoring.js
SAM-2852 Samigo negative point regression (#2520)

    • -11
    • +49
    /samigo/samigo-app/src/webapp/js/authoring.js
SAM-2751 Samigo honor pledge add missing sql when initializing a new db (#2521)

SAM-2751 Samigo honor pledge add missing sql when initializing a new db (#2521)

1336 Added in the ONE_PASS_RENDER to make sure the refreshes don't reset the state of data that was updated asynchronously. Adds some state info to the URL though. Do we care about this?