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

9649 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Jeroen Baten
eceac93df1 Merge pull request #127 from PaulLuchyn/master 
Added non-limiting limits and javadoc
 2016-11-23 16:42:29 +01:00
Paul Luchyn
a8ee928a9c Added javadoc 2016-11-23 17:10:38 +02:00
Paul Luchyn
9dce4e47ce Added nonlimiting limits 2016-11-23 16:59:15 +02:00
Jeroen Baten
d362632a78 Merge pull request #125 from PaulLuchyn/master 
Bug fixing
 2016-11-21 14:51:28 +01:00
Vova Perebykivskyi
495d29768d Revert old timeplotz dependency. 
Rows alignment for Chrome.
 2016-11-21 14:59:12 +02:00
Paul Luchyn
f812889057 Resolved bug with constraint violation when deleting project with risk and issue logs 
Code refactor
 2016-11-21 13:45:38 +02:00
Paul Luchyn
94f10b3866 Fixed null pointer exception when sending email manually 
Fixed bad timeplotz dependency
 2016-11-21 11:26:01 +02:00
Jeroen Baten
690949d50d Merge pull request #123 from PaulLuchyn/master 
Fixed bug with foreign key constraint violation while order deleting
 2016-11-18 15:05:12 +01:00
Paul Luchyn
fbd3a66cbd Merge remote-tracking branch 'upstream/master' 2016-11-18 13:01:38 +02:00
Paul Luchyn
3073f68e1c Fixed bug with foreign key constraint violation while order deleting 
Code refactor, API changes, changed logic of file and order deleting, minor fixes

Code refactoring
Test refactor, file deleting logic changes
 2016-11-18 12:31:13 +02:00
Jeroen Baten
9374b352ac Merge pull request #122 from dgray16/master 
Resolve missing milestones
 2016-11-17 20:26:28 +01:00
Vova Perebykivskyi
321d5cf567 Update hibernate-core to 5.1.1. 
Resolve some no sessions exceptions.
 2016-11-17 11:05:25 +02:00
Jeroen Baten
357f303c3b Merge pull request #121 from dgray16/master 
Minor changes
 2016-11-15 14:58:52 +01:00
Vova Perebykivskyi
46b5997e62 Remove slf4j-jdk14 dependency. 
Set default config for ExpensesSheet entities obviously in ehcache.xml.
Add log4j loggers.
Minor changes to documentation / i18n.
Code refactoring.
 2016-11-15 15:37:16 +02:00
Jeroen Baten
f2e700f373 Merge pull request #119 from dgray16/master 
Changes to EmailSending feature
 2016-11-09 17:42:31 +01:00
Vova Perebykivskyi
5a7c972d47 Code refactoring. 2016-11-09 18:31:42 +02:00
Vova Perebykivskyi
09d6ef866a Merge remote-tracking branch 'upstream/master' 2016-11-09 18:07:04 +02:00