eHour
  •  
Options
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 16 May
12:34 am

Thies Edeling

EHO-138 - background now has height of 2000px
EHO-138 - background now has height of 2000px

Options
    • binary
    /eHour-web/src/main/webapp/img/bg_blue_grey/gradient_blue.gif
Monday 14 May
11:59 am

Thies Edeling

EHO-226 - Development ehourserverrunner was broken
EHO-226 - Development ehourserverrunner was broken

Options
    • -14
    • +0
    /eHour-standalone/pom.xml
    • -7
    • +0
    /eHour-standalone/src/main/profiles/dev/contexts/ehourweb.xml
    • -70
    • +0
    /eHour-standalone/src/main/profiles/dev/jetty.xml
    • -28
    • +0
    /eHour-standalone/src/main/profiles/dev/log4j.properties
    • -0
    • +7
    /eHour-standalone/src/test/resources/home/conf/contexts/ehourweb.xml
    • -0
    • +56
    /eHour-standalone/src/test/resources/home/conf/jetty.xml
1:00 am

Thies Edeling

EHO-226 - removed duplication, reused convenience methods on EhourHomeUtil
EHO-226 - removed duplication, reused convenience methods on EhourHomeUtil

Options
    • -25
    • +10
    /eHour-wicketweb/src/main/java/net/rrm/ehour/ui/listener/EnvInitListener.java
1:00 am

Thies Edeling

EHO-226 - failed on Windows, depended on system's file separator.
EHO-226 - failed on Windows, depended on system's file separator.

Options
    • -11
    • +6
    /eHour-common/src/test/groovy/net/rrm/ehour/appconfig/EhourHomeUtilTest.groovy
12:16 am

Thies Edeling

Derby homedir (location of derby's db) is now set relative to ehour home
Derby homedir (location of derby's db) is now set relative to ehour home

Options
    • -0
    • +11
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourHomeFinder.java
12:15 am

Thies Edeling

Using forward slashes everywhere rather than system file separator
Using forward slashes everywhere rather than system file separator

Options
    • -9
    • +2
    /eHour-common/src/main/java/net/rrm/ehour/appconfig/EhourHomeUtil.java
Sunday 13 May
11:55 pm

Thies Edeling

Jetty's context dir is relative to ehour_home
Jetty's context dir is relative to ehour_home

Options
    • -1
    • +1
    /assembly/standalone/conf/jetty.xml
11:55 pm

Thies Edeling

Jetty version bump
Jetty version bump

Options
    • -1
    • +1
    /pom.xml
11:42 pm

Thies Edeling

Files in ehour_home are loaded using with absolute paths rather than from classpath making it more portable.
Files in ehour_home are loaded using with absolute paths rather than from classpath making it more portable.

Options
    • -5
    • +8
    /eHour-common/src/main/java/net/rrm/ehour/appconfig/EhourHomeUtil.java
    • -9
    • +3
    /eHour-persistence-derby/src/main/java/net/rrm/ehour/persistence/datasource/DerbyDataSourceFactory.java
    • -335
    • +322
    /eHour-service/src/main/java/net/rrm/ehour/config/service/ConfigurationServiceImpl.java
    • -1
    • +4
    /eHour-service/src/test/groovy/net/rrm/ehour/config/service/ConfigurationServiceImplTest.groovy
    • -13
    • +19
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourHomeFinder.java
    • -24
    • +20
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourServer.java
    • -1
    • +3
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourServerRunner.java
    • -54
    • +17
    /eHour-standalone/src/main/java/net/rrm/ehour/ServerPropertiesConfigurator.java
    • -1
    • +1
    /eHour-standalone/src/test/java/net/rrm/ehour/ServerPropertiesConfiguratorTest.java
    • -2
    • +2
    /eHour-wicketweb/src/test/java/net/rrm/ehour/ui/admin/config/page/AbstractMainConfigTest.java
    • -2
    • +0
    /eHour-wicketweb/src/test/java/net/rrm/ehour/ui/admin/config/panel/SkinConfigPanelTest.java
    • -83
    • +71
    /eHour-wicketweb/src/test/java/net/rrm/ehour/ui/timesheet/export/excel/ExportReportExcelTest.java
11:36 pm

Thies Edeling

Unused jetty-env deleted
Unused jetty-env deleted

Options
    • -15
    • +0
    /eHour-web/src/test/resources/jetty-env-mysql.xml
10:13 pm

Thies Edeling

Removed duplication and splitted concerns
Removed duplication and splitted concerns

Options
    • -3
    • +4
    /assembly/install4j/ehour_build.install4j
    • -5
    • +4
    /eHour-common/src/main/java/net/rrm/ehour/appconfig/EhourHomeUtil.java
    • -10
    • +2
    /eHour-common/src/main/java/net/rrm/ehour/util/EnvFileSystemResource.java
    • -0
    • +52
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourHomeFinder.java
    • -12
    • +40
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourServer.java
    • -74
    • +5
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourServerRunner.java
    • -0
    • +2
    /eHour-standalone/src/main/java/net/rrm/ehour/ServerPropertiesConfigurator.java
    • -0
    • +40
    /eHour-standalone/src/test/java/net/rrm/ehour/EhourHomeFinderTest.java
    • -1
    • +1
    /eHour-standalone/src/test/java/net/rrm/ehour/ServerPropertiesConfiguratorTest.java
Saturday 12 May
1:11 am

Thies Edeling

install4j can't provide subdirs of the install dir as a system property, therefore do a little discovering ourselves
install4j can't provide subdirs of the install dir as a system property, therefore do a little discovering ourselves

Options
    • -487
    • +487
    /assembly/install4j/ehour_build.install4j
    • -2
    • +2
    /eHour-common/src/main/java/net/rrm/ehour/appconfig/EhourHomeUtil.java
    • -0
    • +18
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourServerRunner.java
    • -22
    • +0
    /eHour-standalone/src/test/resources/conf/ehour.properties
    • binary
    /eHour-standalone/src/test/resources/conf/excel_default_logo.png
    • -22
    • +0
    /eHour-standalone/src/test/resources/conf/log4j.properties
    • -0
    • +22
    /eHour-standalone/src/test/resources/home/conf/ehour.properties
    • binary
    /eHour-standalone/src/test/resources/home/conf/excel_default_logo.png
    • -0
    • +22
    /eHour-standalone/src/test/resources/home/conf/log4j.properties
Friday 11 May
2:50 pm

Thies Edeling

Merge pull request #12 from nolith/fix_crash_on_pm_report…
Merge pull request #12 from nolith/fix_crash_on_pm_report

PM report crash

Options
Thursday 10 May
11:54 am

Alessio Caiazza

PM reporting a project w/out hours in the selected timeframe causes eHour to crash.…
PM reporting a project w/out hours in the selected timeframe causes eHour to crash.

In many places getHour().floatValue() is called without null checking.

Options
    • -1
    • +1
    /eHour-common/src/main/java/net/rrm/ehour/report/reports/element/AssignmentAggregateReportElement.java
1:11 am

Thies Edeling

Detailed chart only works with rounded numbers
Detailed chart only works with rounded numbers

Options
    • -0
    • +89
    /eHour-wicketweb/src/main/scala/net/rrm/ehour/ui/chart/AggregateReportChartGenerator.scala
    • -89
    • +0
    /eHour-wicketweb/src/main/scala/net/rrm/ehour/ui/chart/AggregateReportChartGenerators.scala
    • -2
    • +2
    /eHour-wicketweb/src/main/scala/net/rrm/ehour/ui/report/panel/aggregate/CustomerReportPanel.scala
    • -2
    • +2
    /eHour-wicketweb/src/main/scala/net/rrm/ehour/ui/report/panel/aggregate/EmployeeReportPanel.scala
    • -2
    • +2
    /eHour-wicketweb/src/main/scala/net/rrm/ehour/ui/report/panel/aggregate/ProjectReportPanel.scala
    • -5
    • +6
    /eHour-wicketweb/src/main/scala/net/rrm/ehour/ui/report/panel/detail/DetailedReportChartGenerator.scala
    • -1
    • +1
    /eHour-wicketweb/src/test/scala/net/rrm/ehour/ui/chart/CustomerChartGeneratorTest.scala
    • -1
    • +1
    /eHour-wicketweb/src/test/scala/net/rrm/ehour/ui/chart/EmployeeChartGeneratorTest.scala
    • -1
    • +1
    /eHour-wicketweb/src/test/scala/net/rrm/ehour/ui/chart/ProjectChartGeneratorTest.scala
Wednesday 09 May
11:50 pm

Thies Edeling

mainmenu displayed too many entries
mainmenu displayed too many entries

Options
    • -1
    • +1
    /eHour-wicketweb/src/main/scala/net/rrm/ehour/ui/common/menu/TreeBasedMenu.scala
Tuesday 08 May
12:24 pm

Thies Edeling

removed the img in the welcome screen of the installer
removed the img in the welcome screen of the installer

Options
    • -493
    • +487
    /assembly/install4j/ehour_build.install4j
11:57 am

Thies Edeling

EHO-226 dist dir was not set properly
EHO-226 dist dir was not set properly

Options
    • binary
    /assembly/install4j/ehour.gif
    • -1
    • +1
    /assembly/install4j/ehour_build.install4j
1:36 am

Thies Edeling

tweaking for the scala plugin: -12 seconds on compile time only building the zipped war dist in prod profile: -7seconds
tweaking for the scala plugin: -12 seconds on compile time only building the zipped war dist in prod profile: -7seconds

Options
    • -22
    • +27
    /eHour-war/pom.xml
    • -1
    • +9
    /pom.xml
1:06 am

Thies Edeling

EHO-265 - minor cleanups in login flow
EHO-265 - minor cleanups in login flow

Options
    • -321
    • +310
    /eHour-wicketweb/src/main/java/net/rrm/ehour/ui/common/session/EhourWebSession.java
    • -1
    • +2
    /eHour-wicketweb/src/main/java/net/rrm/ehour/ui/login/page/Login.java
    • -5
    • +3
    /eHour-wicketweb/src/main/java/net/rrm/ehour/ui/login/page/Logout.java
12:16 am

Thies Edeling

CSS fix for the menu, font was too large when clicked.
CSS fix for the menu, font was too large when clicked.

Options
    • -1
    • +1
    /eHour-web/src/main/webapp/css/ehour.css
    • -163
    • +153
    /eHour-web/src/main/webapp/css/menu.css
12:16 am

Thies Edeling

EHO-265 Logging in failed after logging out, fixed
EHO-265 Logging in failed after logging out, fixed

Options
    • -303
    • +302
    /eHour-wicketweb/src/main/java/net/rrm/ehour/ui/EhourWebApplication.java
    • -64
    • +65
    /eHour-wicketweb/src/main/java/net/rrm/ehour/ui/common/component/header/HeaderPanel.java
    • -60
    • +46
    /eHour-wicketweb/src/main/java/net/rrm/ehour/ui/login/page/Login.java
    • -0
    • +15
    /eHour-wicketweb/src/main/java/net/rrm/ehour/ui/login/page/Logout.java
    • -18
    • +16
    /eHour-wicketweb/src/main/java/net/rrm/ehour/ui/login/page/SessionExpiredPage.java
Monday 07 May
9:32 pm

Thies Edeling

Main menu displayed all items, regardless of permissions
Main menu displayed all items, regardless of permissions

Options
    • -71
    • +81
    /eHour-wicketweb/src/main/scala/net/rrm/ehour/ui/common/menu/TreeBasedMenu.scala
12:35 am

Thies Edeling

EHO-226 - installer installs eHour as a service
EHO-226 - installer installs eHour as a service

Options
    • binary
    /assembly/install4j/ehour.png
    • -7
    • +73
    /assembly/install4j/ehour_build.install4j
    • -0
    • +1
    /assembly/install4j/install_en.properties
Sunday 06 May
3:01 am

Thies Edeling

fixed NPE in test
fixed NPE in test

Options
    • -55
    • +39
    /eHour-service/src/test/java/net/rrm/ehour/timesheet/service/TimesheetServiceTest.java
3:01 am

Thies Edeling

EHO-226 - minor renames
EHO-226 - minor renames

Options
    • -5
    • +6
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourServerRunner.java
2:29 am

Thies Edeling

EHO-226 - Fixed (64bit) Windows installer
EHO-226 - Fixed (64bit) Windows installer

Options
    • -8
    • +6
    /assembly/install4j/ehour_build.install4j
    • -5
    • +5
    /eHour-common/src/main/java/net/rrm/ehour/appconfig/EhourHomeUtil.java
    • -5
    • +0
    /eHour-common/src/main/resources/context-propertyconfig.xml
    • -0
    • +11
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourServerRunner.java
    • -1
    • +1
    /eHour-wicketweb/src/main/java/net/rrm/ehour/ui/listener/EnvInitListener.java
Thursday 03 May
5:26 pm

Thies Edeling

Basic install4j config added for providing an installer and launcher for the standalone version…
Basic install4j config added for providing an installer and launcher for the standalone version

removed tanuki wrapper

added dist

Options
    • binary
    /assembly/install4j/ehour.gif
    • -0
    • +429
    /assembly/install4j/ehour_build.install4j
    • -1574
    • +0
    /assembly/standalone/bin/linux-x86-32/ehour.sh
    • binary
    /assembly/standalone/bin/linux-x86-32/libwrapper.so
    • binary
    /assembly/standalone/bin/linux-x86-32/wrapper
    • -1260
    • +0
    /assembly/standalone/bin/linux-x86-64/ehour.sh
    • binary
    /assembly/standalone/bin/linux-x86-64/libwrapper.so
    • binary
    /assembly/standalone/bin/linux-x86-64/wrapper
    • -1574
    • +0
    /assembly/standalone/bin/macosx-32/ehour.sh
    • binary
    /assembly/standalone/bin/macosx-32/libwrapper.jnilib
    • binary
    /assembly/standalone/bin/macosx-32/wrapper
    • -1574
    • +0
    /assembly/standalone/bin/macosx-64/ehour.sh
    • binary
    /assembly/standalone/bin/macosx-64/libwrapper.jnilib
    • binary
    /assembly/standalone/bin/macosx-64/wrapper
    • -103
    • +0
    /assembly/standalone/bin/windows-x86-32/eHour-installService.bat
  16. … 9 more files in changeset.
Wednesday 02 May
11:52 pm

Thies Edeling

EHO-226 - replacing Tanuki service wrapper with install4j generated launcher and installer
EHO-226 - replacing Tanuki service wrapper with install4j generated launcher and installer

Options
    • -7
    • +7
    /assembly/standalone/conf/contexts/ehourweb.xml
    • -56
    • +56
    /assembly/standalone/conf/jetty.xml
    • -0
    • +4
    /eHour-common/src/main/java/net/rrm/ehour/appconfig/EhourHomeUtil.java
    • -32
    • +45
    /eHour-standalone/src/main/java/net/rrm/ehour/EhourServerRunner.java
Wednesday 25 Apr
9:20 am

Thies Edeling

Merge branch 'maven-overhaul' of https://github.com/nolith/ehour…
Merge branch 'maven-overhaul' of https://github.com/nolith/ehour

Conflicts:

build_war_dist.xml

Options
Earlier activity No later activity