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

9769 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
lmann99
82255f5ee1 Fix for bug 1705, java.lang.NullPointerException by 'Create Worker' when looking up existing user 2017-01-01 16:56:38 -05:00
lmann99
1e58368f3e Add project url to email template keywords, allow url keyword in timesheet template 2017-01-01 08:42:21 -05:00
lmann99
02800f97db Updates to email notification routines 2016-12-31 13:42:04 -05:00
Jeroen Baten
aade5c1743 Merge branch 'master' of https://github.com/LibrePlan/libreplan 2016-12-27 22:37:36 +01:00
Jeroen Baten
fc381520ba fixed some small strings 2016-12-27 22:37:06 +01:00
Jeroen Baten
1129b27fcc Typos fixed 2016-12-27 21:56:54 +01:00
Jeroen Baten
f46f1bfbb3 updated and added languages 2016-12-27 16:21:40 +01:00
PaulLuchyn
6f88905db7 Added docs for i18n for Windows OS 2016-12-16 16:56:21 +02:00
Jeroen Baten
2ec65fcc81 Merge pull request #135 from PaulLuchyn/master 
Added interactive user role list, changesets refactoring
 2016-12-12 20:25:14 +01:00
Paul Luchyn
6be32a2161 Added "Delete all projects" button 2016-12-12 17:14:48 +02:00
Paul Luchyn
0e7c846db3 Changesets refactoring 2016-12-12 11:54:19 +02:00
Paul Luchyn
b12c5c673e Added interactive user roles list 2016-12-08 17:37:25 +02:00
Jeroen Baten
a124fa713c Merge pull request #134 from PaulLuchyn/master 
Changed functional of logs page
 2016-12-05 11:12:33 +01:00
Paul Luchyn
d605ea1ae3 Changed functional of logs page 
Added saving of state between tab changes, code refactor
 2016-12-05 11:43:26 +02:00
Jeroen Baten
20bf076ae1 Merge pull request #133 from PaulLuchyn/master 
Removed subelements checkbox
 2016-11-30 17:32:12 +01:00
Paul Luchyn
2d52ba4ddb Removed checkIncludeOrderElements checkbox and its functional 
Removed checkbox, all corresponding functional and condition checking, predicate refactor, code refactor
 2016-11-30 11:27:00 +02:00
Jeroen Baten
144aa7c4e1 Merge pull request #132 from PaulLuchyn/master 
Minor fixes
 2016-11-29 15:29:07 +01:00
Paul Luchyn
e327ecfe30 Merge remote-tracking branch 'upstream/master' 2016-11-29 16:04:27 +02:00
Jeroen Baten
6a8f65b235 Merge pull request #130 from dgray16/master 
Rows alignment for browsers
 2016-11-29 11:32:31 +01:00
Vova Perebykivskyi
22d3601a6c Merge remote-tracking branch 'upstream/master' 2016-11-29 10:38:00 +02:00
Vova Perebykivskyi
c29bc6aa61 Rows alignment for Firefox. 2016-11-29 10:36:26 +02:00