Jeroen Baten
e48a64d151
Merge pull request #1892 from vmazurashu/master
...
#1891 : fix version inconsistency which caused runtime error
2018-09-25 20:27:35 +02:00
vmazurashu
bc5ceeb64d
#1891 : fix version inconsistency which caused runtime error
2018-09-25 17:48:12 +03:00
Jeroen Baten
409d4c7b0c
Merge pull request #1889 from vmazurashu/master
...
#1887 : In risk or issue a field is defined too short
2018-09-15 09:31:21 +02:00
vmazurashu
b7ec362648
#1887 : change UI and DB constraints
2018-09-14 15:07:03 +03:00
Jeroen Baten
73a63e4381
Merge pull request #1884 from vmazurashu/master
...
#1872 : contacting stats needs checking
2018-09-11 17:26:04 +02:00
vmazurashu
73810ab3fa
#1872 : add additional verification of empty config
2018-09-11 11:46:38 +03:00
Jeroen Baten
0b53fef77a
Merge pull request #1881 from vmazurashu/master
...
#1872 : contacting stats needs checking
2018-09-06 09:55:00 +02:00
vmazurashu
fd73890e0a
1872: remove default constructor
2018-09-05 12:08:02 +03:00
vmazurashu
5377e5cb28
#1872 : add necessary imports
2018-09-05 12:06:00 +03:00
vmazurashu
bb8979a9c7
1872: fix sending statistics
2018-09-05 12:02:24 +03:00
vmazurashu
26ea8a3a85
1870: update mysql jdbc driver version
2018-09-05 11:59:02 +03:00
vmazurashu
1a2d870aa1
1870: update postgresql jdbc driver version, add explicitly org.zkoss.common.zweb
2018-09-05 11:57:51 +03:00
Jeroen Baten
9856988935
Merge pull request #1879 from vmazurashu/master
...
#1868 : Fix mess in libreplan/libreplan-business/src/main/resources/db.changelog-1.4.xml
2018-07-11 10:19:31 +02:00
vmazurashu
8091c8540d
#1868 : revert changes to default one, add new change set with fixes
2018-07-11 11:02:37 +03:00
Vadim
f715698f7b
Merge 1868: revert changes to default one, add new change set with fixes
...
# Conflicts:
# libreplan-business/src/main/resources/db.changelog-1.4.xml
# libreplan-business/src/main/resources/db.changelog.xml
2018-07-11 10:43:30 +03:00
Jeroen Baten
6c6d2bf749
Merge pull request #1874 from vmazurashu/master
...
#1802 string This progress type cannot cannot be removed
2018-06-18 14:57:41 +02:00
Vadim
5b251b4aea
#1802 : fix issue with wrong string
2018-06-18 15:46:19 +03:00
Vadim
44de669bbc
Update section with providing URL to the application
2018-06-18 15:44:57 +03:00
Jeroen Baten
d49cee584d
Merge pull request #141 from lmann99/master
...
Possible fixes for lazy initialization errors, email notifications, and other minor issues
2018-06-04 13:41:47 +02:00
lmann99
8973aedee9
Merge branch 'master' of git://github.com/LibrePlan/libreplan
...
Updating from upstream
2017-11-11 11:43:18 -05:00
Jeroen Baten
6ac6fdf4a6
Merge pull request #143 from mrtinkz/master
...
Fixed AnnotationAwareAspectJAutoProxyCreator is only available on Jav…
2017-06-10 12:22:54 +02:00
Vikram Palakurthi
328f4fc017
Fixed AnnotationAwareAspectJAutoProxyCreator is only available on Java 1.5 and higher
2017-06-09 15:39:06 -05:00
lmann99
f72cb9962c
Merge pull request #26 from lmann99/filter-projects-at-finished-status
...
Add filtering of finished projects
2017-04-17 22:20:26 -04:00
lmann99
b43d48e439
Add filtering of finished projects
...
User preference setting to default filtering of finished projects from planning
and company views.
* Still needs work to investigate and update resource views
2017-04-17 22:14:49 -04:00
lmann99
b7fd49b881
Merge pull request #25 from lmann99/add-start-end-dates-to-weekly-personal-timesheet-dashboard
...
Add day of week to personal timesheet date display
2017-02-05 12:10:20 -05:00
lmann99
b011743f4b
Add day of week to personal timesheet date display
...
Makes it easier for end users to select timesheet with weekly or twice monthly periodicity
by including the start and end dates.
Fixes #24
2017-02-05 12:09:08 -05:00
lmann99
a1b3959506
Merge pull request #23 from lmann99/taskelement-get-toplevel-project-taskelement
...
Use top level project task for grouped sub tasks
2017-02-05 11:30:19 -05:00
lmann99
64e095a841
Use top level project task for grouped sub tasks
...
Instead of using the group task as the project task need to pull the top level parent.
A grouped task will have as parent the group not the project.
Fixes #21
2017-02-05 11:28:51 -05:00
lmann99
89d81f8f5b
Merge pull request #22 from lmann99/email-notification-leaf-tasks-only
...
Restrict email notifications to leaf node tasks
2017-02-05 09:09:32 -05:00
lmann99
fd6b2acf4f
Restrict email notifications to leaf node tasks
...
Email notifications for tasks to start or finish should only be sent to individual tasks not
to task groups.
2017-02-05 09:05:31 -05:00
lmann99
1f3ce26c94
Merge pull request #19 from lmann99/fillChart-check-null
...
Fix exception when clearing a chart
2017-01-26 01:23:23 -05:00
lmann99
344f8faa08
Fix exception when clearing a chart
...
Fixes #15
2017-01-26 01:22:46 -05:00
lmann99
50855d19e3
Merge pull request #18 from lmann99/treeController-array-index-out-of-bounds
...
Tree controller array index out of bounds
2017-01-26 01:13:31 -05:00
lmann99
9b02c6f511
Corrected lower bound on index check
2017-01-26 01:12:30 -05:00
lmann99
737967c2f8
Correct index out of bounds exception in focusGoDown
...
Adds a check to stop treeList at the second last item instead of allowing the list index to go negative.
Fixes#17
2017-01-26 01:04:33 -05:00
lmann99
a4b1f3bc14
Correct index out of bounds exception in focusGoDown
...
Adds a check to prevent list index from going negative
Fixes#17
2017-01-26 00:46:46 -05:00
lmann99
d1c6144ae3
Merge pull request #16 from lmann99/fix-lazyinitialization-user-profiles-roles
...
Include missed lazy=false to User hibernate config
2017-01-24 00:08:02 -05:00
lmann99
1cf2d17e8a
Include missed lazy=false to User hibernate config
2017-01-23 23:39:49 -05:00
lmann99
cdd2399028
Merge pull request #14 from lmann99/fix-lazyinitialization-user-profiles-roles
...
Fix lazyinitialization listing a users profiles roles
2017-01-23 22:42:37 -05:00
lmann99
8cfd3fa58c
Fix lazyinitialization listing a users profiles roles
...
Add a lazy=false to User hibernate config as workaround.
Fixes #13
2017-01-23 22:41:21 -05:00
lmann99
87f1650003
Merge pull request #12 from lmann99/move-i18n.tld
...
Modify taglib config to correct /WEB-INF/tld/i18n.tld not found errors
2017-01-22 20:52:54 -05:00
lmann99
3cd17ed7a1
Modify taglib config to correct /WEB-INF/tld/i18n.tld not found errors
...
Copy i18n.tld to same location as config.xml and update config.xml to point at new location.
Fixes #11
2017-01-22 20:50:17 -05:00
lmann99
50587bfa02
Merge pull request #10 from lmann99/update-sapphire
...
Update sapphire.jar to 8.0.4
2017-01-22 12:00:06 -05:00
lmann99
edfb4c20f0
Update sapphire.jar to 8.0.4
...
Provides a missing image file, bar-bg.png, that is causing many not found
messages in error log.
Fixes #9
2017-01-22 11:59:17 -05:00
lmann99
c683fe9204
Merge pull request #8 from lmann99/fix-transientObject-exception-saving-project
...
Fix TransientObjectException when allocating a resource to a previous…
2017-01-22 11:52:46 -05:00
lmann99
4b952866a0
Fix TransientObjectException when allocating a resource to a previously saved schedule
...
Fixes #3
2017-01-22 11:51:02 -05:00
lmann99
f95977c986
Merge pull request #7 from lmann99/exclude-non-bound-resources-from-notifications
...
Resolve NullPointerExceptions thrown by email notification scheduled …
2017-01-22 10:04:10 -05:00
lmann99
c73031b572
Resolve NullPointerExceptions thrown by email notification scheduled jobs
...
Added null checks. Moved getCurrentWorker to DAO as now being used by multiple routines.
Fixes #6
2017-01-22 10:00:56 -05:00
lmann99
a58320abcf
Merge pull request #5 from lmann99/remove-notifications-when-tasks-removed
...
Remove notifications from queue when associated project or task deleted
2017-01-21 22:56:29 -05:00
lmann99
b101d18e9e
Remove notifications from queue when associated project or task deleted
...
Prevents a HibernateObjectRetrievalFailureException from being thrown when a scheduled email notification
job attempts to send a notification associated to a project or task that was deleted prior to
the scheduled job running.
Fixes #4
2017-01-21 22:50:13 -05:00
