8000 Comparing netresearch:main...mogic-le:mogic-develop · netresearch/timetracker · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: netresearch/timetracker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
< 8000 div data-show-on-forbidden-error hidden>

Uh oh!

There was an error while loading. Please reload this page.

base: main
Choose a base ref
...
head repository: mogic-le/timetracker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: mogic-develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 14 files changed
  • 2 contributors

Commits on Feb 26, 2025

  1. TIM-106: Fix testBulkentryAction 

    - queried entries were wrong
    @tivvie @cweiske
    tivvie authored and cweiske committed Feb 26, 2025
    Configuration menu
    Copy the full SHA
    00f032e View commit details
    Browse the repository at this point in the history

  2. TIM-106: Bulk entry: Show error to user without contract 

    .. when requesting contract times to be used.
    @tivvie @cweiske
    tivvie authored and cweiske committed Feb 26, 2025
    Configuration menu
    Copy the full SHA
    881d7d7 View commit details
    Browse the repository at this point in the history

  3. TIM-106: Bulk entry: Fix end date for open ended contracts 

    Use enddate of bulkentry instead of today.
    @tivvie @cweiske
    tivvie authored and cweiske committed Feb 26, 2025
    Configuration menu
    Copy the full SHA
    02759a3 View commit details
    Browse the repository at this point in the history

  4. TIM-106: Bulk entry: Show warning message if contract expires during … 

    …interval
    @tivvie @cweiske
    tivvie authored and cweiske committed Feb 26, 2025
    Configuration menu
    Copy the full SHA
    0fa2cc9 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2025

  1. TIM-102: Update contract API docs

    @tivvie @cweiske
    tivvie authored and cweiske committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    45bdcf6 View commit details
    Browse the repository at this point in the history

  2. TIM-102: Add . to contract error messages

    @tivvie @cweiske
    tivvie authored and cweiske committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    b61f8ae View commit details
    Browse the repository at this point in the history

  3. TIM-102: Sort contracts list by username and then by start date 

    .. so that the list is ordered properly to see the contracts of a single
person in order
    @cweiske
    cweiske committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    c5ca6f3 View commit details
    Browse the repository at this point in the history

  4. TIM-102: Update test, contracts are returned sorted by username and t… 

    …hen by startdate
    @tivvie @cweiske
    tivvie authored and cweiske committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    5b25af2 View commit details
    Browse the repository at this point in the history

  5. TIM-102: Saving a contract now looks up existing contracts 

    - checks for date mismatches before creating a new contract
- refuses to create new contract if error in existing contract
- last open ended contract gets updated
    @tivvie @cweiske
    tivvie authored and cweiske committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    b78e4c9 View commit details
    Browse the repository at this point in the history

  6. TIM-102: Allow custom start and end day for contracts 

    Do not limit it to start-of-month.
    @tivvie @cweiske
    tivvie authored and cweiske committed Mar 3, 2025
    Configuration menu
    Copy the full SHA
    769eb57 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2025

  1. TIM-116: Fix tt not loading in Firefox 

     - Wait until DOM is ready, and all classes are loaded instead of wait until the document is ready
    @tivvie
    tivvie committed Mar 5, 2025
    Configuration menu
    Copy the full SHA
    f5b34b8 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2025

  1. TIM-120: Remove incomplete russian translation

    @cweiske
    cweiske committed Mar 12, 2025
    Configuration menu
    Copy the full SHA
    fabbbcb View commit details
    Browse the repository at this point in the history

  2. TIM-120: CS

    @cweiske
    cweiske committed Mar 12, 2025
    Configuration menu
    Copy the full SHA
    3831775 View commit details
    Browse the repository at this point in the history

  3. TIM-120, TIM-116: Fix translation loading for time tracking and inter… 

    …pretation
    @cweiske
    cweiske committed Mar 12, 2025
    Configuration menu
    Copy the full SHA
    521f256 View commit details
    Browse the reposito 8000 ry at this point in the history

  4. TIM-120, TIM-116: Fix interpretation entries list 

    I do not know why Interpretation.entryStore.requires does not work anymore,
but manually requiring the file makes it work again.
    @cweiske
    cweiske committed Mar 12, 2025
    Configuration menu
    Copy the full SHA
    7c62160 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2025

  1. TIM-123: Translate error message "No entry for id." 

    .. and update test
    @tivvie @cweiske
    tivvie authored and cweiske committed May 9, 2025
    Configuration menu
    Copy the full SHA
    eab175a View commit details
    Browse the repository at this point in the history

  2. TIM-123: Fix documentation for /interpretation/allEntries 

    - Add key extTicket to response
    @tivvie @cweiske
    tivvie authored and cweiske committed May 9, 2025
    Configuration menu
    Copy the full SHA
    ce7fd8c View commit details
    Browse the repository at this point in the history

  3. TIM-123: Add new route get single entry by id: /tracking/entry/{id}

    @tivvie @cweiske
    tivvie authored and cweiske committed May 9, 2025
    Configuration menu
    Copy the full SHA
    20a9a3b View commit details
    Browse the repository at this point in the history
Loading
0