Commit graph

413 commits

Author SHA1 Message Date
Paul van Tilburg
dc3d7496ca Also hide the register time entries header if there are no time entries 2015-06-20 18:35:11 +02:00
Paul van Tilburg
7139f00286 Add a Register time button to the time line
This button is most needed when viewing the interface on an extra small
screen, because in this case the register time first row will ben hidden.
2015-06-20 18:32:46 +02:00
Paul van Tilburg
ee1f3a1f5e Add missing button name set 2015-06-20 18:31:57 +02:00
Paul van Tilburg
5e4f4fd456 Wrap code to 80 chars; fix comment errors 2015-06-20 18:31:40 +02:00
Paul van Tilburg
c3caede760 Merge branch 'feature/c36555-bootstrap3' into development (closes: #c36555) 2015-06-20 18:29:40 +02:00
Paul van Tilburg
da7d49eaf1 Highlight project/task rows in the invoice select form view 2015-06-20 18:29:07 +02:00
Paul van Tilburg
d4b75e1e04 Fix the Create new invoice button 2015-06-20 18:27:33 +02:00
Paul van Tilburg
69faada059 Follow Bootstrap in using em and strong instead of i and b 2015-06-20 18:26:49 +02:00
Paul van Tilburg
96435e3d86 Fix text class 2015-06-20 18:25:24 +02:00
Paul van Tilburg
67d0b60a9f Add an _icon helper method; add icons to almost all buttons 2015-06-20 18:24:19 +02:00
Paul van Tilburg
e43821dc69 Remove fixed column widths to improve responsiveness of tables 2015-06-20 18:22:44 +02:00
Paul van Tilburg
5600581b49 Round of updates for the complementary/overriding CSS/SASS 2015-06-20 18:20:32 +02:00
Paul van Tilburg
118499396a Rework all views to work with Boostrap 3
* Add responsiveness to tables (use col-xs* and hidden-xs where needed) and
  use the grid system
* Update al inline and horizontal forms (add extra options to the
  form helper methods)
* Replace the accordion by collapsing panels in the task form
* Update buttons and alerts
* Update the navbar in the main layout
2015-06-20 18:16:31 +02:00
Paul van Tilburg
17cad0d0ba Enable responsiveness; drop/remove the unused Bootstrap theme 2015-06-20 17:59:47 +02:00
Paul van Tilburg
bbebeda029 Remove unnecessary Bootstrap CSS/SASS overrides 2015-06-20 17:57:40 +02:00
Paul van Tilburg
ce7fe6e510 Replace glyphicons images by font files 2015-06-20 17:53:10 +02:00
Paul van Tilburg
ca9e889e84 Update the Bootstrap file links in the main layout 2015-06-19 22:25:38 +02:00
Paul van Tilburg
3322f63849 Replace Bootstrap 2.x files by the files of version 3.3.5 2015-06-19 22:24:35 +02:00
Paul van Tilburg
50b24b9410 Merge tag 'v1.14.0' into development
Release 1.14.0
2015-06-19 22:11:16 +02:00
Paul van Tilburg
bcabb15f53 Merge branch 'release/1.14.0' 2015-06-19 22:11:10 +02:00
Paul van Tilburg
0d75f1aaae Update the changelog for the 1.14.0 release 2015-06-19 22:11:06 +02:00
Paul van Tilburg
a97a305f6c Bump version to 1.14.0 2015-06-19 22:08:08 +02:00
Paul van Tilburg
a744a4f0d1 Add a grand total of unbilled hours and amount to the overview view 2015-06-19 22:02:13 +02:00
Paul van Tilburg
5ec8b170bc Merge branch 'feature/08650a-customer-time-entries' into development (closes: #08650a) 2015-06-19 21:42:14 +02:00
Paul van Tilburg
55e18615e4 Hook up a customer-specific time entries list in the customer form view 2015-06-19 21:41:22 +02:00
Paul van Tilburg
7a1d18269a Turn the time entries view into a partial view; create timeline view
Adapt the task form view to use the time entries partial view as well.
2015-06-19 21:39:36 +02:00
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