Commit graph

99 commits

Author SHA1 Message Date
KodeStar
dce553c587 Merge branch 'master' into v1.2
# Conflicts:
#	resources/views/app.blade.php
2018-02-07 18:17:04 +00:00
KodeStar
3ab91cc0e1 Merge remote-tracking branch 'origin/v1.2' into v1.2 2018-02-07 18:15:40 +00:00
Chris
6adbcb8d1c changed gitignore 2018-02-07 15:45:12 +00:00
Chris
211da7cb09 supported apps support 2018-02-07 15:43:29 +00:00
Chris
beb12147e0 fix incorrect translation strings 2018-02-07 14:01:10 +00:00
Chris
0f3087ab7d translations 2018-02-07 13:37:40 +00:00
Chris
a5e99545d7 Possible fix to subfolder issue 2018-02-07 08:59:40 +00:00
Chris
a8a7e56da7 Merge branch 'master' into v1.2 2018-02-07 08:47:54 +00:00
KodeStar
57ac6bc680 Merge branch 'master' into v1.2 2018-02-06 22:40:58 +00:00
KodeStar
70bce9869a
default key 2018-02-06 22:29:31 +00:00
KodeStar
3e4617e37d
create .env if missing 2018-02-06 22:02:50 +00:00
KodeStar
2e06f1c153
try and remove reliance on .env 2018-02-06 21:28:56 +00:00
KodeStar
3a3446151e supported apps stuff 2018-02-06 20:41:29 +00:00
Chris
fd5ca1914c Supported apps fixes 2018-02-06 15:27:02 +00:00
KodeStar
34cc2b6c2c
Merge pull request #14 from linuxserver/add-license-1
Create LICENSE
2018-02-06 13:59:31 +00:00
KodeStar
a3a6b78a32
Create LICENSE 2018-02-06 13:58:54 +00:00
KodeStar
82540d7b7c
Update readme.md 2018-02-06 11:19:16 +00:00
KodeStar
2376546c71
Delete README.md 2018-02-06 11:13:51 +00:00
KodeStar
40b80983aa
Delete _config.yml 2018-02-06 11:13:41 +00:00
KodeStar
7a0cf5716c
Update readme.md 2018-02-06 11:11:25 +00:00
KodeStar
88949c0885
Update README.md 2018-02-06 11:01:51 +00:00
KodeStar
831ab4a844
Update _config.yml 2018-02-06 10:58:58 +00:00
KodeStar
24e1559051
Update README.md 2018-02-06 10:58:30 +00:00
KodeStar
250ac1142d
Update README.md 2018-02-06 10:55:26 +00:00
KodeStar
44e1c495c8 Set theme jekyll-theme-tactile 2018-02-06 10:51:45 +00:00
KodeStar
fea3eb2aa4 Set theme jekyll-theme-merlot 2018-02-06 10:50:30 +00:00
KodeStar
a38cb3284a
Create README.md 2018-02-06 10:45:44 +00:00
KodeStar
0942850832 Set theme jekyll-theme-tactile 2018-02-06 10:14:43 +00:00
KodeStar
ade028767a supported apps stuff 2018-02-05 23:08:37 +00:00
KodeStar
983cf98b9e
Delete storage 2018-02-05 21:13:56 +00:00
KodeStar
3e02d92105 Initial supported apps support 2018-02-05 20:59:38 +00:00
KodeStar
0cd8f551a1 git supported apps 2018-02-05 20:29:56 +00:00
KodeStar
bd8bac162f gitignore 2018-02-05 20:14:16 +00:00
KodeStar
91ecd03c4e supported apps 2018-02-05 19:49:20 +00:00
KodeStar
5a0321cd4f don't ignore supported apps 2018-02-05 19:47:36 +00:00
KodeStar
b9d212ed58 remove symlink 2018-02-05 19:45:40 +00:00
KodeStar
83f2a81e91 changes 2018-02-05 19:43:24 +00:00
KodeStar
3f20fe75c6 Merge branch 'master' into v1.2 2018-02-05 18:14:06 +00:00
KodeStar
8dd47347b8
Update readme.md 2018-02-05 18:13:24 +00:00
KodeStar
f87b6d50b3
Update CHANGELOG.md 2018-02-05 18:07:06 +00:00
KodeStar
09133a0177
Merge pull request #11 from linuxserver/v2
V2
2018-02-05 17:18:34 +00:00
KodeStar
c4c9a12035 Merge branch 'master' into v2 2018-02-05 17:12:45 +00:00
KodeStar
5c62bb7ed5 Changed buttons to be fixed to bottom rather than abolsutely positioned to app container 2018-02-05 17:10:57 +00:00
KodeStar
7867c7b3ca Fix each bar provider not set breaking page 2018-02-05 17:06:52 +00:00
Chris
db70a6af33 removed errant character 2018-02-05 15:55:38 +00:00
Chris
2f79499b0d fix to show settings when not empty && instead of || 2018-02-05 15:51:16 +00:00
Chris
20e029a3ff Small change 2018-02-05 15:42:15 +00:00
Chris
09276f08fc fixes 2018-02-05 15:39:26 +00:00
Chris
eb3c3b94d6 hopefully fix upgrade issues from v1.0 2018-02-05 15:22:51 +00:00
Chris
c90c08b904 Added upgrade process 2018-02-05 15:02:18 +00:00