Commit graph

1773 commits

Author SHA1 Message Date
vmazurashu
b7ec362648 #1887: change UI and DB constraints 2018-09-14 15:07:03 +03:00
vmazurashu
73810ab3fa #1872: add additional verification of empty config 2018-09-11 11:46:38 +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
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
lmann99
8973aedee9 Merge branch 'master' of git://github.com/LibrePlan/libreplan
Updating from upstream
2017-11-11 11:43:18 -05:00
Vikram Palakurthi
328f4fc017 Fixed AnnotationAwareAspectJAutoProxyCreator is only available on Java 1.5 and higher 2017-06-09 15:39:06 -05: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
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
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
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
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
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
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
4b952866a0 Fix TransientObjectException when allocating a resource to a previously saved schedule
Fixes #3
2017-01-22 11:51:02 -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
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
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
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
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
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
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
fc381520ba fixed some small strings 2016-12-27 22:37:06 +01:00
Jeroen Baten
f46f1bfbb3 updated and added languages 2016-12-27 16:21:40 +01:00
Paul Luchyn
6be32a2161 Added "Delete all projects" button 2016-12-12 17:14:48 +02:00
Paul Luchyn
b12c5c673e Added interactive user roles list 2016-12-08 17:37:25 +02: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
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
Paul Luchyn
e327ecfe30 Merge remote-tracking branch 'upstream/master' 2016-11-29 16:04:27 +02: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
Paul Luchyn
1603be046e Fixed ValidationException on LDAP configuration page 2016-11-24 14:08:25 +02:00
Paul Luchyn
ecef5a32ca Changed css styles on Dashboard (Global) page 2016-11-24 12:58:19 +02:00
Paul Luchyn
ca9a470714 Added constraints to the risk and issue logs page 2016-11-24 11:08:44 +02:00
Paul Luchyn
9dce4e47ce Added nonlimiting limits 2016-11-23 16:59:15 +02:00