c2a1e39b54
set filemode
2015-02-24 09:29:58 +01:00
c41f4e9203
Update README.md
2015-02-24 08:45:38 +01:00
c54615a85f
Update CONTRIBUTING.md
2015-02-24 08:44:40 +01:00
a7d953f923
Merge remote-tracking branch 'upstream/develop' into develop
2015-02-24 08:24:04 +01:00
35cf5b3d60
Fixes #423
2015-02-23 18:46:04 -08:00
ae381576aa
Revert "Revert "Enhance further install without dummy data""
...
This reverts commit b28bcce5f1
2015-02-23 11:52:09 +01:00
b28bcce5f1
Revert "Enhance further install without dummy data"
...
This reverts commit 7d7059504e
2015-02-23 11:50:49 +01:00
7d7059504e
Enhance further install without dummy data
...
Use --force to prevent user unnecessary user interactions.
Seed StatusLabels even when dummy datas chose to not be seeded because
snipe-it heavily builds on those table.
Seed Categories, because it is very common and goot to have, also.
2015-02-23 09:39:42 +01:00
e04fb70aa3
Merge remote-tracking branch 'upstream/master' into develop
2015-02-23 08:25:41 +01:00
7f1489a701
Updated language strings for logo/header color
2015-02-19 18:15:55 -08:00
720c36e433
Merge remote-tracking branch 'origin/develop'
2015-02-19 16:00:35 -08:00
0cceacd17d
Merge pull request #547 from madd15/patch-3
...
Fix activate for strict db
2015-02-19 16:00:17 -08:00
f9ad8d8aa5
Merge remote-tracking branch 'origin/develop'
2015-02-19 15:59:25 -08:00
253c402f3d
Ignore logos
2015-02-19 15:59:18 -08:00
083cb1b5ec
Fix activate for strict db
2015-02-20 10:26:46 +10:30
8b3e22b58e
Fixes #546 - only insert data if values exist
2015-02-19 15:50:53 -08:00
ad9e7f1d9e
Cleaned up settings form for nicer display
2015-02-19 15:34:55 -08:00
5887cce2c5
Merge pull request #545 from madd15/patch-2
...
Fix #541 - Headers not being skipped if checked
2015-02-19 15:25:39 -08:00
f85061f988
Fix #541 - Headers not being skipped if checked
2015-02-20 09:54:55 +10:30
f8e12cabd4
Fixes #476 - added logo upload and header color
2015-02-19 15:14:50 -08:00
348e996e31
Merge pull request #543 from splaer/bug-1
...
Fixed AutoIncrement Bug with no Assets and cleaned up logic
2015-02-19 12:43:31 -08:00
70ae59ed62
Fixed a bug when no assets are in table that the autoincrement method blows up. Also optimzed the logic to get max id instead of popping top off creation date.
2015-02-19 12:52:27 -05:00
6c4d661a85
Merge pull request #540 from madd15/patch-2
...
#539 - Allow checked out asset in requestable
2015-02-18 13:51:48 -08:00
ae104293da
#539 - Allow checked out asset in requestable
2015-02-19 08:20:27 +10:30
c07907833c
Updated laguage strings
2015-02-18 13:33:05 -08:00
7360e52f61
Updated composer lock
2015-02-18 13:16:09 -08:00
7d87b3384c
Standardized colors for checkin/checkout in sidebar
2015-02-18 12:22:37 -08:00
30df21c7aa
Fixed missing checkedout-to info on asset view
2015-02-18 10:27:41 -08:00
6bc1524783
Merge pull request #537 from roncsak/develop
...
Enhance installation
2015-02-18 09:52:01 -08:00
366fb60628
Enhance installation
...
Make available to install app without seeding dummy data.
2015-02-18 16:00:33 +01:00
01f11f2da4
Updated text
2015-02-18 02:56:01 -08:00
f6ae35df63
Only show the "email credentials" checkbox if new user
2015-02-18 02:51:41 -08:00
87936a58fa
CSV user import
2015-02-18 02:48:16 -08:00
305db59472
Merge pull request #533 from uberbrady/docker2
...
Docker2 (DO NOT MERGE YET)
2015-02-17 21:17:17 -08:00
c0ce1939cb
Make Docker respect email configuration passed via environment.
2015-02-17 21:13:40 -08:00
879b6b8f3f
Merge remote-tracking branch 'origin/develop'
2015-02-17 20:44:19 -08:00
8777a1a9f1
Updated language strings
2015-02-17 20:44:01 -08:00
43cdace9de
Merge remote-tracking branch 'origin/develop'
2015-02-17 19:18:10 -08:00
a04af4aead
Bumped version number
2015-02-17 19:17:53 -08:00
e7eec42ab8
Merge pull request #532 from uberbrady/depreciation_refactor
...
Depreciation refactor
2015-02-17 18:55:52 -08:00
063e5c407c
Fixed the depreciation report, fixes to calculate current depreciated
...
value (which were only used there). Additional fixes and refactoring
around Depreciable, in terms of how assets get depreciation via models,
and licenses get depreciation directly.
2015-02-17 18:51:13 -08:00
3ba02b65fb
Oops - Assets get their Depreciation from their *model* - wheras
...
Licenses have a Depreciation directly associated with them. So I
pulled the Depreciation relationship out of Depreciable so that both
Assets and Licenses could pull their depreciations in their associated
ways. I could've done this with an inheritance call, but that seems
a bit much (and unnecessarily confusing).
2015-02-17 17:56:59 -08:00
88dc0700f0
Make date functions work; create negative intervals for depreciation,
...
Also renamed "months_until_depreciation" to "time_until_depreciation"
And renamed Depreciatable to Depreciable (which is an actual word in
English.) Also a cleanup/consistency-enforcement for interval display.
2015-02-17 17:40:16 -08:00
899e2bc9b6
Not convinved this filename is right or anything, but the shared depreciation code is here
2015-02-17 17:40:16 -08:00
1e4071b51d
First stab at cleaning up Depreciation
...
Conflicts:
app/models/Asset.php
It looks like the same time I pulled depreciation out of the
Asset class, uploads were being added in. It doesn't look
like a conflict to me, but git couldn't figure it out. Oh Well.
2015-02-17 17:39:39 -08:00
f5b5f66b82
Update README.md
2015-02-17 16:36:54 -08:00
24e72d1b56
Update README.md
2015-02-17 16:35:31 -08:00
f2922b0a44
Update README.md
2015-02-17 16:33:23 -08:00
92a99993ea
Update README.md
2015-02-17 16:30:52 -08:00
9be159ea15
Cleaned up the docker images to shrink it; expanded docker documentation
2015-02-17 16:22:03 -08:00
Tamás Roncsák