Commit Graph

387 Commits

Author SHA1 Message Date
Paul van Tilburg
ed56393d8f Merge tag 'v1.12.1' into development
Release 1.12.1
2015-06-06 12:27:52 +02:00
Paul van Tilburg
90b0df148e Merge branch 'release/1.12.1' 2015-06-06 12:27:47 +02:00
Paul van Tilburg
938f1ec9b9 Update the changelog for the new release 2015-06-06 12:27:44 +02:00
Paul van Tilburg
4eaf0cb58a Bump version to 1.12.1 2015-06-06 12:26:36 +02:00
Paul van Tilburg
656867e044 Add a footer (with version) 2015-06-06 12:26:16 +02:00
Paul van Tilburg
57f6ece385 More indentation fixes 2015-06-06 11:58:16 +02:00
Paul van Tilburg
46416fe180 Fix spacing so the changelog entry doesn't become a quoted block 2015-06-06 11:57:52 +02:00
Paul van Tilburg
7e12667e9a Update the changelog for the new release
This was forgotten during the v1.12 release.
2015-06-06 11:56:46 +02:00
Paul van Tilburg
df019fb09e Merge tag 'v1.12' into development
Release 1.12
2015-06-05 22:36:40 +02:00
Paul van Tilburg
ba2b014ae7 Merge branch 'release/1.12' 2015-06-05 22:36:33 +02:00
Paul van Tilburg
9928fc6f2a Bump version to 1.12 2015-06-05 22:36:00 +02:00
Paul van Tilburg
e41b8715c2 Merge branch 'feature/3f9d21-escape-strings-in-templates' into development (closes: #3f9d21) 2015-06-05 22:30:22 +02:00
Paul van Tilburg
15b91d98ae Escape strings in the invoice template 2015-06-05 22:30:02 +02:00
Paul van Tilburg
ac551fcf7a Add helper method for LaTeX-escaping strings in ERB 2015-06-05 22:26:59 +02:00
Paul van Tilburg
d4985a2242 Merge branch 'feature/19b3cc-fix-no-active-tasks-overview' into development (closes: #19b3cc) 2014-11-08 12:07:32 +01:00
Paul van Tilburg
4cf1517b43 Show message if there are tasks but no active tasks
Show links to the task form of each of these tasks so that time can be
registered there.
2014-11-08 12:06:34 +01:00
Paul van Tilburg
2e5985b32b Discern customer tasks and active tasks 2014-11-08 12:06:19 +01:00
Paul van Tilburg
856d22b617 Merge tag 'v1.10' into development
Release 1.10
2014-11-01 22:15:57 +01:00
Paul van Tilburg
ab3213503a Merge branch 'release/1.10' 2014-11-01 22:15:48 +01:00
Paul van Tilburg
5b1a0ffc1d Update the changelog for the new release 2014-11-01 22:15:33 +01:00
Paul van Tilburg
730736a84a Bump version to 1.10 2014-11-01 22:10:45 +01:00
Paul van Tilburg
ca533ad158 Merge branch 'feature/ff83ce-preselect-time-entries-invoice-form' into development (closes: #ff83ce) 2014-11-01 22:09:48 +01:00
Paul van Tilburg
38c8d7dd17 Only select time entries that are not in the current month 2014-11-01 22:09:44 +01:00
Paul van Tilburg
d613a095e1 Add in_current_month? method to the TimeEntry model 2014-11-01 22:09:21 +01:00
Paul van Tilburg
68c6a337a1 Show only active tasks in the invoice select form
If there are tasks with an hourly rate that have no time entries,
then it's not worth showing them.
2014-11-01 22:08:16 +01:00
Paul van Tilburg
46aca92887 Remove the TODO file
All TODO entries were either already fixed or are present as ticgit
tickets.
2014-11-01 21:52:44 +01:00
Paul van Tilburg
a7807a8da6 Add a Rakefile for the 'yard' documentation task 2014-11-01 21:50:24 +01:00
Paul van Tilburg
a98c2a63dc Remove a very old mockup 2014-11-01 21:38:54 +01:00
Paul van Tilburg
80a77922c3 Merge branch 'feature/e1ac56-yard-documentation' into development (closes: #e1ac56) 2014-11-01 21:37:53 +01:00
Paul van Tilburg
58f5e4bbe6 Rework all documentation in YARD format 2014-11-01 21:37:41 +01:00
Paul van Tilburg
db3dca4923 Ignore generated YARD documentation and cache 2014-11-01 21:37:30 +01:00
Paul van Tilburg
8314996c09 Merge branch 'feature/02ad0e-improve-main-overview' into development (closes: #02ad0e) 2014-11-01 18:10:09 +01:00
Paul van Tilburg
59ef003c0f Ignore style.css.map generated by Sass 2014-11-01 17:48:46 +01:00
Paul van Tilburg
49eb58ff51 Build a span per customer so that they flow and use two columns in the overview 2014-11-01 17:47:52 +01:00
Paul van Tilburg
35462ed0dd Show a total of unbilled time and earned money (excl. VAT) per customer 2014-11-01 17:47:13 +01:00
Paul van Tilburg
d1ac6ff979 Show only active tasks in the overview view
Active tasks are unbilled tasks that are tasks that are either fixed cost
or that have time entries that should be billed.
2014-11-01 17:45:16 +01:00
Paul van Tilburg
1f8b7b2d2b Merge tag 'v1.8' into development
Release 1.8
2014-10-31 22:25:52 +01:00
Paul van Tilburg
32d0e48b1d Merge branch 'release/1.8' 2014-10-31 22:25:05 +01:00
Paul van Tilburg
1a4bd12a23 Update the changelog for the new release 2014-10-31 22:25:00 +01:00
Paul van Tilburg
03ca8b6d47 Bump version to 1.8 2014-10-31 22:06:41 +01:00
Paul van Tilburg
46409502fb Merge branch 'feature/4235ef-force-invoice-regeneration' into development (closes: #4235ef) 2014-10-31 21:59:34 +01:00
Paul van Tilburg
371ec2c81a Handle delete requests for invoices 2014-10-31 21:59:17 +01:00
Paul van Tilburg
3e412ef16e Add some bottom margin to button groups 2014-10-31 21:58:39 +01:00
Paul van Tilburg
236729be6c Check and show a delete button if an invoice file is present 2014-10-31 21:55:04 +01:00
Paul van Tilburg
b94d5ccff2 Fix invoice period calculation
Currently, the end time of the period was always the creation time of
the invoice (due to the initialisation), as it is generally by definition
later than any of the task periods.
2014-10-28 10:02:13 +01:00
Paul van Tilburg
8d8eba1e18 Documentation fix 2014-10-25 22:33:05 +02:00
Paul van Tilburg
60230c5854 Fixed bug preventing updates tasks 2014-10-25 22:32:57 +02:00
Paul van Tilburg
f831580c3d Add some changelog entries for already finished features 2014-10-25 22:00:04 +02:00
Paul van Tilburg
52b65ea6e0 Merge branch 'feature/9f7883-rounding-to-time-resolution' into development (closes: #9f7883) 2014-10-25 21:56:20 +02:00
Paul van Tilburg
b12d78bdb2 Round start and end time before validation (and thus saving)
I've chosen to connect the callback to before_validation because
at a later point we want to check for overlap between time entries
and this should be done using the corrected versions.
2014-10-25 21:55:23 +02:00