Daniel Merino

About
  • First commit 22 January 2015
  • Latest commit 04 June 2020
Last Week All Time
Commits: 0 88

Reviews

0 active reviews

Counts may include data that you cannot access.

Line History

Line history chart not available

Line history chart not available

 

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Committer Mappings

Daniel Merino is mapped to 3 committers over 1 repository
Username daniel.merino is mapped to:
Thursday 04 Jun 2020
1:04 pm

Daniel Merino

SAK-43752 - Fix issue with bars after Jfreechart upgrade to 1.5.0 (#8269)

(cherry picked from commit c07a83af93dcad805aed6d9c39f51535226d1440)

Options
    • -1
    • +0
    /sitestats/sitestats-impl/src/java/org/sakaiproject/sitestats/impl/chart/ChartServiceImpl.java
1:04 pm

Daniel Merino

SAK-43752 - Fix issue with bars after Jfreechart upgrade to 1.5.0 (#8269)

Options
    • -1
    • +0
    /sitestats/sitestats-impl/src/java/org/sakaiproject/sitestats/impl/chart/ChartServiceImpl.java
1:04 pm

Daniel Merino

SAK-43752 - Fix issue with bars after Jfreechart upgrade to 1.5.0 (#8269)

(cherry picked from commit c07a83af93dcad805aed6d9c39f51535226d1440)

Options
    • -1
    • +0
    /sitestats/sitestats-impl/src/java/org/sakaiproject/sitestats/impl/chart/ChartServiceImpl.java
Wednesday 29 Jan 2020
2:42 am

Daniel Merino

SAK-40096 - Some Lessons items are uneditable if associated group is deleted - NPE (#7817)

Options
    • -1
    • +1
    /lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
2:42 am

Daniel Merino

SAK-40096 - Some Lessons items are uneditable if associated group is deleted - NPE (#7817)

(cherry picked from commit d5b4e7c8d0d47c4e17aa871b3755c2b15f7581cd)

Options
    • -1
    • +1
    /lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
Friday 04 Oct 2019
2:53 am

Daniel Merino

SAK-42584 - Add percentage of voters (#7406)

Options
    • -0
    • +5
    /polls/api/src/java/org/sakaiproject/poll/logic/ExternalLogic.java
    • -0
    • +7
    /polls/impl/src/java/org/sakaiproject/poll/logic/impl/ExternalLogicImpl.java
    • -0
    • +5
    /polls/impl/src/test/org/sakaiproject/poll/logic/test/stubs/ExternalLogicStubb.java
    • -1
    • +1
    /polls/tool/src/bundle/org/sakaiproject/poll/bundle/Messages_es.properties
    • -3
    • +7
    /polls/tool/src/java/org/sakaiproject/poll/tool/producers/ResultsProducer.java
Thursday 06 Jun 2019
11:08 am

Daniel Merino

SAK-41858 - Strip doesn't work, only strips from beginning and end of lines. Using replace. (#6992)

(cherry picked from commit 078c312def69354ff0f74bfe526d1e2226125730)

Options
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettingsListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
11:08 am

Daniel Merino

SAK-41858 - Strip doesn't work, only strips from beginning and end of lines. Using replace. (#6992)

Options
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettingsListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
Tuesday 04 Jun 2019
10:41 am

Daniel Merino

SAK-41858 - Change deleteWhitespace method by strip, as deleteWhitespace also deletes newline characters. (#6981)

Options
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettingsListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
10:41 am

Daniel Merino

SAK-41858 - Change deleteWhitespace method by strip, as deleteWhitespace also deletes newline characters. (#6981)

(cherry picked from commit ea4d4e542d9d926ef537ba2769fa722e0c3b5104)

Options
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettingsListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
Tuesday 28 May 2019
5:50 am

Daniel Merino

SAK-41858 - Whitespaces between ip addresses prevent saving exam's se… (#6962)

* SAK-41858 - Whitespaces between ip addresses prevent saving exam's settings

* Replace deprecated commons-lang by lang3

(cherry picked from commit 2f9f1987bfd0f0c90598ab745e3bd2b76785c1c4)

Options
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java
    • -1
    • +2
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettingsListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
5:50 am

Daniel Merino

SAK-41858 - Whitespaces between ip addresses prevent saving exam's se… (#6962)

* SAK-41858 - Whitespaces between ip addresses prevent saving exam's settings

* Replace deprecated commons-lang by lang3

Options
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/ConfirmPublishAssessmentListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettings.java
    • -1
    • +2
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SaveAssessmentSettingsListener.java
    • -1
    • +1
    /samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/author/SavePublishedSettingsListener.java
Friday 29 Mar 2019
4:27 am

Daniel Merino

Adding "To:" field in new folders created in Private Messages

(cherry picked from commit ba397d38b02b45a3d5b82f17508e71f8aec6ccf0)

Options
    • -5
    • +1
    /msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
    • -2
    • +6
    /msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsg.jsp
4:27 am

Daniel Merino

Adding "To:" field in new folders created in Private Messages

Options
    • -5
    • +1
    /msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
    • -2
    • +6
    /msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsg.jsp
Tuesday 12 Feb 2019
10:07 am

Daniel Merino

SAK-41193 - Earliest time is displayed as 0 AM in weekly and daily view (#6545)

(cherry picked from commit d6d601f5b55bb6a6521c708bfee3a2f16bc817cb)

Options
    • -1
    • +1
    /calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewDay.vm
    • -3
    • +3
    /calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewWeek.vm
10:07 am

Daniel Merino

SAK-41193 - Earliest time is displayed as 0 AM in weekly and daily view (#6545)

Options
    • -1
    • +1
    /calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewDay.vm
    • -3
    • +3
    /calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewWeek.vm
Wednesday 21 Nov 2018
3:35 am

Daniel Merino

SAK-40975 - Roster - User names sorting order doesn't respect whitespaces

(cherry picked from commit 861eed002420f213b4e7f2f8389725745a8eae15)

Options
    • -7
    • +14
    /roster2/src/java/org/sakaiproject/roster/api/RosterMemberComparator.java
3:35 am

Daniel Merino

SAK-40975 - Roster - User names sorting order doesn't respect whitespaces

Options
    • -7
    • +14
    /roster2/src/java/org/sakaiproject/roster/api/RosterMemberComparator.java
3:35 am

Daniel Merino

SAK-40975 - Roster - User names sorting order doesn't respect whitespaces

(cherry picked from commit 861eed002420f213b4e7f2f8389725745a8eae15)

Options
    • -7
    • +14
    /roster2/tool/src/java/org/sakaiproject/roster/api/RosterMemberComparator.java
Monday 22 Oct 2018
4:13 am

Daniel Merino

SAK-40823 - Basque properties update for master from Transifex

Options
    • -0
    • +11
    /access/access-impl/impl/src/bundle/access_eu.properties
    • -22
    • +17
    /admin-su/src/bundle/tool-tool-su_eu.properties
    • -60
    • +40
    /admin-tools/src/bundle/aliases_eu.properties
    • -44
    • +42
    /admin-tools/src/bundle/archive_eu.properties
    • -154
    • +159
    /admin-tools/src/bundle/authz-tool_eu.properties
    • -25
    • +8
    /admin-tools/src/bundle/memory_eu.properties
    • -132
    • +121
    /admin-tools/src/bundle/users_eu.properties
    • -0
    • +2
    /announcement/announcement-impl/impl/src/bundle/annc-access_eu.properties
    • -0
    • +3
    /announcement/announcement-impl/impl/src/bundle/annc-noti-prefs_eu.properties
    • -0
    • +6
    /announcement/announcement-impl/impl/src/bundle/siteemaanc_eu.properties
    • -0
    • +113
    /announcement/announcement-tool/tool/src/bundle/announcement_eu.properties
    • -3
    • +225
    /assignment/bundles/resources/assignment_eu.properties
    • -0
    • +1
    /assignment/bundles/resources/permissions_eu.properties
    • -0
    • +6
    /basiclti/basiclti-blis/src/bundle/blis_eu.properties
    • -0
    • +2
    /basiclti/basiclti-impl/src/bundle/basicltisvc_eu.properties
  16. … 137 more files in changeset.
4:13 am

Daniel Merino

SAK-40823 - Basque properties update for master from Transifex

(cherry picked from commit 6032664389744fc12e4e466bf73fb22fdde4f91d)

Conflicts:

announcement/announcement-tool/tool/src/bundle/announcement_eu.properties

assignment/bundles/resources/assignment_eu.properties

basiclti/basiclti-blis/src/bundle/blis_eu.properties

basiclti/basiclti-tool/src/bundle/ltitool_eu.properties

site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric_eu.properties

Options
    • -0
    • +11
    /access/access-impl/impl/src/bundle/access_eu.properties
    • -22
    • +17
    /admin-su/src/bundle/tool-tool-su_eu.properties
    • -60
    • +40
    /admin-tools/src/bundle/aliases_eu.properties
    • -44
    • +42
    /admin-tools/src/bundle/archive_eu.properties
    • -154
    • +159
    /admin-tools/src/bundle/authz-tool_eu.properties
    • -25
    • +8
    /admin-tools/src/bundle/memory_eu.properties
    • -132
    • +121
    /admin-tools/src/bundle/users_eu.properties
    • -0
    • +2
    /announcement/announcement-impl/impl/src/bundle/annc-access_eu.properties
    • -0
    • +3
    /announcement/announcement-impl/impl/src/bundle/annc-noti-prefs_eu.properties
    • -0
    • +6
    /announcement/announcement-impl/impl/src/bundle/siteemaanc_eu.properties
    • -0
    • +112
    /announcement/announcement-tool/tool/src/bundle/announcement_eu.properties
    • -3
    • +225
    /assignment/bundles/resources/assignment_eu.properties
    • -0
    • +1
    /assignment/bundles/resources/permissions_eu.properties
    • -0
    • +5
    /basiclti/basiclti-blis/src/bundle/blis_eu.properties
    • -0
    • +2
    /basiclti/basiclti-impl/src/bundle/basicltisvc_eu.properties
  16. … 137 more files in changeset.
Tuesday 16 Oct 2018
5:20 am

Daniel Merino

SAK-40789 - Forums attachments are not encoded when are migrated to another site

Options
    • -2
    • +2
    /msgcntr/messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/DiscussionForumServiceImpl.java
Thursday 04 Oct 2018
10:37 am

Daniel Merino

SAK-40676 - Sections enrolled by the user should be emphasized with bold font (#6030)

Options
    • -1
    • +1
    /sections/sections-app/src/webapp/css/sections.css
Tuesday 25 Sep 2018
10:08 am

Daniel Merino

SAK-2654 - Add selected day's date as default date for new events in Calendar (#6033)

Options
    • -0
    • +10
    /calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java
Thursday 20 Sep 2018
8:52 am

Daniel Merino

SAK-40618 - Elfinder can't manage PermissionExceptions (#5993)

Options
    • -8
    • +21
    /textarea/elfinder-sakai/src/java/org/sakaiproject/elfinder/sakai/SakaiFsService.java
Monday 06 Aug 2018
3:06 am

Daniel Merino

SAK-40414 - Basque properties master update before Sakai 19 is alive (#5856)

Options
    • -24
    • +21
    /access/access-impl/impl/src/bundle/access_eu.properties
    • -5
    • +5
    /announcement/announcement-impl/impl/src/bundle/annc-access_eu.properties
    • -3
    • +2
    /announcement/announcement-impl/impl/src/bundle/annc-noti-prefs_eu.properties
    • -38
    • +17
    /announcement/announcement-impl/impl/src/bundle/siteemaanc_eu.properties
    • -364
    • +207
    /announcement/announcement-tool/tool/src/bundle/announcement_eu.properties
    • -8
    • +8
    /announcement/announcement-tool/tool/src/bundle/permissions_eu.properties
    • -1070
    • +875
    /assignment/bundles/resources/assignment_eu.properties
    • -11
    • +9
    /assignment/bundles/resources/permissions_eu.properties
    • -1
    • +19
    /basiclti/basiclti-blis/src/bundle/blis_eu.properties
    • -4
    • +14
    /basiclti/basiclti-impl/src/bundle/basicltisvc_eu.properties
    • -10
    • +127
    /basiclti/basiclti-impl/src/bundle/ltiservice_eu.properties
    • -3
    • +1
    /basiclti/basiclti-portlet/src/bundle/basiclti-events_eu.properties
    • -19
    • +94
    /basiclti/basiclti-portlet/src/bundle/basiclti_eu.properties
    • -16
    • +173
    /basiclti/basiclti-tool/src/bundle/ltitool_eu.properties
    • -41
    • +36
    /basiclti/web-ifp/src/bundle/iframe_eu.properties
  16. … 142 more files in changeset.
3:06 am

Daniel Merino

SAK-40403 - Catalan properties master update before Sakai 19 (#5861)

Options
    • -4
    • +4
    /admin-su/src/bundle/tool-tool-su_ca.properties
    • -0
    • +5
    /admin-tools/src/bundle/sites_ca.properties
    • -0
    • +2
    /admin-tools/src/bundle/users_ca.properties
    • -0
    • +2
    /announcement/announcement-impl/impl/src/bundle/siteemaanc_ca.properties
    • -0
    • +1
    /announcement/announcement-tool/tool/src/bundle/announcement_ca.properties
    • -12
    • +71
    /assignment/bundles/resources/assignment_ca.properties
    • -0
    • +12
    /basiclti/basiclti-impl/src/bundle/ltiservice_ca.properties
    • -0
    • +2
    /basiclti/basiclti-portlet/src/bundle/basiclti_ca.properties
    • -0
    • +2
    /basiclti/web-ifp/src/bundle/iframe_ca.properties
    • -0
    • +1
    /chat/chat-tool/tool/src/bundle/chat_ca.properties
    • -2
    • +6
    /config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/siteemacon/siteemacon_ca.properties
    • -2
    • +4
    /config/localization/bundles/src/bundle/org/sakaiproject/localization/bundle/tool/tools_ca.properties
    • -0
    • +19
    /content-review/impl/turnitin/src/main/resources/turnitin_ca.properties
    • -0
    • +5
    /content/content-bundles/resources/content_ca.properties
    • -1
    • +2
    /content/content-bundles/resources/types_ca.properties
  16. … 31 more files in changeset.
3:05 am

Daniel Merino

SAK-40402 - Spanish properties master update before Sakai 19 is alive (#5855)

Options
    • -1
    • +1
    /access/access-impl/impl/src/bundle/access_es.properties
    • -12
    • +12
    /admin-su/src/bundle/tool-tool-su_es.properties
    • -10
    • +10
    /admin-tools/src/bundle/aliases_es.properties
    • -33
    • +33
    /admin-tools/src/bundle/authz-tool_es.properties
    • -49
    • +54
    /admin-tools/src/bundle/sites_es.properties
    • -0
    • +2
    /admin-tools/src/bundle/users_es.properties
    • -5
    • +6
    /announcement/announcement-tool/tool/src/bundle/announcement_es.properties
    • -6
    • +6
    /assignment/api/src/java/org/sakaiproject/assignment/api/conversion/messages_es.properties
    • -75
    • +109
    /assignment/bundles/resources/assignment_es.properties
    • -1
    • +1
    /basiclti/basiclti-api/src/bundle/org/sakaiproject/lti/impl/LTIReportingJob_es.properties
    • -7
    • +19
    /basiclti/basiclti-impl/src/bundle/ltiservice_es.properties
    • -0
    • +2
    /basiclti/basiclti-portlet/src/bundle/basiclti_es.properties
    • -1
    • +1
    /basiclti/basiclti-tool/src/bundle/ltitool_es.properties
    • -3
    • +5
    /basiclti/web-ifp/src/bundle/iframe_es.properties
    • -519
    • +519
    /calendar/calendar-bundles/resources/calendar_es.properties
  16. … 65 more files in changeset.
Thursday 21 Jun 2018
8:24 am

Daniel Merino

Backport of SAK-40092 for 11.x (#5713)

Options
    • -0
    • +1
    /assignment/assignment-bundles/resources/assignment.properties
    • -0
    • +1
    /assignment/assignment-bundles/resources/assignment_es.properties
    • -1
    • +2
    /assignment/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
    • -0
    • +4
    /assignment/assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm
3:50 am

Daniel Merino

SAK-40092 - Don't allow instructors to do a submission in behalf of a student when they can't do it. (#5674)

(cherry picked from commit fc08df90c3bbf36de02edfe32b09082e7de81cc2)

Options
    • -0
    • +1
    /assignment/bundles/resources/assignment.properties
    • -0
    • +1
    /assignment/bundles/resources/assignment_es.properties
    • -1
    • +2
    /assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
    • -3
    • +7
    /assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm