RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9640 commits 1 branch 0 tags 56 MiB
Commit graph

9640 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
lmann99
2b1a91a9f6 Merge branch 'master' of https://github.com/lmann99/libreplan 2017-01-18 22:48:17 -05:00
lmann99
de6f27c6fd Merge pull request #2 from lmann99/add-planner-view-user-preferences 
Add to user preferences ability to set default show/hide button state
 2017-01-18 22:45:21 -05:00
lmann99
837313d2d7 Merge pull request #2 from lmann99/add-planner-view-user-preferences 
Add to user preferences ability to set default show/hide button state
 2017-01-14 18:57:17 -05:00
lmann99
50df8c866a Add to user preferences ability to set default show/hide button state 
Added additional user preferences settings to allow setting the default state of the planning view show buttons
 (resources, progress, reported hours, labels, and money cost bar)
 2017-01-14 18:49:09 -05:00
lmann99
e12795c136 Merge pull request #1 from lmann99/add-global-dashboard-vert-scrollbar 
Create vertical scroll bar on global dashboard
 2017-01-10 23:08:09 -05:00
lmann99
200bc99542 Create vertical scroll bar on global dashboard 
Add a height attribute to zul grid component.
 2017-01-10 23:05:37 -05:00
lmann99
cef18801a9 Revert "Create vertical scroll bar on global dashboard" 
This reverts commit dbdc802b98.

Forgot to checkout new branch prior to committing
 2017-01-10 22:50:32 -05:00
lmann99
dbdc802b98 Create vertical scroll bar on global dashboard 
Add height attribute to zul grid component
 2017-01-10 22:45:12 -05:00
lmann99
89773995ea Add the description field to the Create new project dialog 
Improve workflow and communication by being able to see the description of newly created
projects without requiring access to edit the project.
 2017-01-08 01:25:15 -05:00
lmann99
8243aa6304 Add a Planned Budget column and change sorter on Total Budget to Projects List tab 
Planned Budget will reflect the amounts planned on project tasks.  Changed the sorter on Total Budget to use the amounts estimated on the
General data tab instead of the amounts on project tasks.
 2017-01-08 00:40:11 -05:00
lmann99
21c41a4e35 Fix LazyInitializationException when sorting project list by Total Budget 
Total Budget sorter uses a number of collections that are being lazy loaded, changed to load eagerly.
Possibly could use a *forceLoad* method but dont see any available publicly. May need to revisit
for performance reasons at some point.
 2017-01-08 00:24:39 -05:00
lmann99
b5d13c0824 Fix LazyInitializationException when sorting project list by State 
State is using the same sorter as Total Budget, change to use state name instead.
 2017-01-07 23:40:01 -05:00
lmann99
e274cf8a1e Merge branch 'master' of https://github.com/LibrePlan/libreplan 
Pulling in later changes...
 2017-01-04 17:27:20 -05:00
Jeroen Baten
1a8e8fad5a Merge pull request #138 from PaulLuchyn/master 
Updated javadoc and docs, bug fixing
 2017-01-04 17:20:16 +01:00
PaulLuchyn
a57c7520d6 Added javadoc 
Docs update, fixed ArithmeticException on dashboard page
 2017-01-04 12:36:27 +02:00
lmann99
29a4aefd84 Fix for bug 1706, java.lang.StackOverflowException when adding backdated progress assignment 2017-01-03 22:31:21 -05:00
lmann99
894db82655 Typographic and minor edits, addition of pipeline dashboard document 2017-01-02 23:57:59 -05:00
lmann99
4921df1ba9 Changes to logo uploading and deleting 2017-01-02 12:16:07 -05:00
lmann99
4cef4f2cc8 Correction to earlier email notification related changes 2017-01-01 22:20:13 -05:00