Skip to content

Commit 6ecfd4a

Browse files
committed
Merge branch 'master' of https://github.com/Leantime/leantime
2 parents 70593ab + d38b996 commit 6ecfd4a

File tree

7 files changed

+63
-270
lines changed

7 files changed

+63
-270
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ There are two main ways to install LeanTime for production. The first of which i
123123
* Create an empty MySQL database
124124
* Upload the entire directory to your server
125125
* Point your domain root to the `public/` directory
126-
* Rename `config/.env.sample` to `config/.env`
126+
* Rename `config/sample.env` to `config/.env`
127127
* Fill in your database credentials (username, password, host, dbname) in `config/.env`
128128
* Navigate to `<yourdomain.com>/install`
129129
* Follow instructions to install database and set up first user account
@@ -185,7 +185,7 @@ There are two ways to install a development setup of LeanTime. The first (but mo
185185
* Create MySQL database
186186
* Run webpack builder via `make build-dev`
187187
* Point your local domain to the `public/` directory
188-
* Rename `config/.env.sample` to `config/.env`
188+
* Rename `config/sample.env` to `config/.env`
189189
* Fill in your database credentials (username, password, host, dbname) in `config/.env`
190190
* Navigate to `<localdomain>/install`
191191
* Follow instructions to install database and user account
@@ -256,7 +256,7 @@ Please refer to our [documentation](https://docs.leantime.io/installation/common
256256

257257
## 🔌 Extend Leantime ##
258258

259-
You can extend Leantime by
259+
#### You can extend Leantime by:
260260
- building your own plugin: [Plugin Docs](https://docs.leantime.io/development/plugin-development)
261261
- using our json-rpc API: [API Docs](https://docs.leantime.io/api/usage)
262262
- or by purchasing a plugin from our [marketplace](https://marketplace.leantime.io)

app/Domain/Timesheets/Templates/showAll.tpl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
} ?>><?= $tpl->escape($client['name'])?></option>
8484
<?php } ?>
8585
</select>
86-
</td
86+
</td>
8787
<td>
8888
<label for="projects"><?php echo $tpl->__('label.project'); ?></label>
8989
<select name="project" style="max-width:120px;">

blocklist.json

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
[
2-
"tw-fixed",
32
"tw-absolute",
43
"tw-relative",
54
"tw-sticky",
6-
"tw-bottom-0",
7-
"tw-left-0",
8-
"tw-right-0",
95
"tw-right-[10px]",
106
"tw-top-0",
117
"tw-top-[10px]",
@@ -14,19 +10,13 @@
1410
"tw-float-right",
1511
"tw-float-left",
1612
"tw-mx-m",
17-
"tw-my-2",
1813
"tw-mb-0",
1914
"tw-mb-4",
20-
"tw-mb-8",
2115
"tw-mb-[10px]",
22-
"tw-mb-[20%]",
23-
"tw-mb-[5px]",
2416
"tw-mb-base",
2517
"tw-mb-l",
2618
"tw-mb-m",
27-
"tw-mb-none",
2819
"tw-ml-0",
29-
"tw-ml-1",
3020
"tw-ml-[10px]",
3121
"tw-ml-m",
3222
"tw-ml-sm",
@@ -35,35 +25,25 @@
3525
"tw-mr-m",
3626
"tw-mr-sm",
3727
"tw-mr-xs",
38-
"tw-mt-2",
39-
"tw-mt-4",
4028
"tw-mt-[20px]",
4129
"tw-mt-[3px]",
42-
"tw-mt-auto",
4330
"tw-mt-base",
44-
"tw-mt-none",
4531
"tw-mt-sm",
4632
"tw-block",
4733
"tw-inline",
4834
"tw-flex",
49-
"tw-grid",
5035
"tw-hidden",
5136
"tw-h-12",
52-
"tw-h-36",
5337
"tw-h-[250px]",
5438
"tw-h-[30px]",
55-
"tw-h-fit",
5639
"tw-h-full",
5740
"tw-h-screen",
5841
"tw-max-h-[200px]",
5942
"tw-max-h-[600px]",
6043
"tw-max-h-[90vh]",
61-
"tw-min-h-screen",
6244
"tw-w-1/2",
63-
"tw-w-1/3",
6445
"tw-w-1/4",
6546
"tw-w-12",
66-
"tw-w-3/4",
6747
"tw-w-3/5",
6848
"tw-w-80",
6949
"tw-w-[100px]",
@@ -73,22 +53,11 @@
7353
"tw-w-auto",
7454
"tw-w-full",
7555
"tw-min-w-[250px]",
76-
"tw-min-w-max",
77-
"tw-max-w-[320px]",
78-
"tw-max-w-fit",
79-
"tw-max-w-max",
8056
"tw-flex-1",
81-
"tw-shrink-0",
8257
"tw-flex-grow",
8358
"tw-cursor-grab",
84-
"tw-snap-x",
85-
"tw-snap-mandatory",
86-
"tw-snap-proximity",
87-
"tw-snap-center",
88-
"tw-grid-cols-4",
8959
"tw-flex-row",
9060
"tw-flex-col",
91-
"tw-flex-wrap",
9261
"tw-content-center",
9362
"tw-items-center",
9463
"tw-justify-start",
@@ -104,26 +73,20 @@
10473
"tw-gap-x-[10px]",
10574
"tw-overflow-hidden",
10675
"tw-overflow-y-auto",
107-
"tw-overflow-x-hidden",
10876
"tw-overflow-y-scroll",
10977
"tw-rounded",
11078
"tw-rounded-full",
111-
"tw-rounded-lg",
11279
"tw-rounded-md",
11380
"tw-border-b",
11481
"tw-border-t",
11582
"tw-border-[var(--main-border-color)]",
11683
"tw-bg-[#b0b0b0]",
117-
"tw-bg-black",
11884
"tw-bg-blue-500",
11985
"tw-bg-gray-300",
12086
"tw-bg-gray-500",
12187
"tw-bg-primary",
12288
"tw-bg-red-500",
12389
"tw-bg-yellow-500",
124-
"tw-bg-opacity-50",
125-
"tw-object-cover",
126-
"tw-p-2",
12790
"tw-p-[10px]",
12891
"tw-p-[20px]",
12992
"tw-p-m",
@@ -140,31 +103,23 @@
140103
"tw-py-4",
141104
"tw-py-[5px]",
142105
"tw-pb-1",
143-
"tw-pb-[10px]",
144-
"tw-pb-[20px]",
145106
"tw-pb-[30px]",
146107
"tw-pb-l",
147108
"tw-pb-m",
148109
"tw-pb-sm",
149-
"tw-pl-0",
150110
"tw-pl-1",
151111
"tw-pl-2",
152-
"tw-pl-[20px]",
153112
"tw-pr-xs",
154113
"tw-pt-base",
155114
"tw-pt-l",
156-
"tw-pt-none",
157-
"tw-pt-xl",
158115
"tw-pt-xs",
159116
"tw-text-left",
160117
"tw-text-center",
161118
"tw-text-right",
162-
"tw-align-bottom",
163119
"tw-text-2xl",
164120
"tw-text-[14px]",
165121
"tw-text-l",
166122
"tw-text-sm",
167-
"tw-text-xl",
168123
"tw-text-xs",
169124
"tw-font-medium",
170125
"tw-leading-[25px]",

config/sample.env

Lines changed: 0 additions & 192 deletions
This file was deleted.

0 commit comments

Comments
 (0)