ad39ec1dc3
Added markdown to EULA
2015-02-25 11:25:10 -08:00
2b83b52735
Disallow delete if lock_passwords is true
2015-02-25 10:49:03 -08:00
cd99295f83
More auth locking
2015-02-25 10:41:25 -08:00
6ab95ff387
Prevent auth changes on demo
2015-02-25 10:37:39 -08:00
1aa25d1e6d
Merge pull request #558 from roncsak/develop
...
Enhance further install without dummy data
2015-02-25 02:06:56 -08:00
1b5b3fba8a
Merge pull request #559 from cleathley/develop
...
Updates to Dockerfile for QrCode support
2015-02-25 01:59:55 -08:00
c71bdc0d5e
Removed Dockerfile as this was stopping the actual build (difference in docker versions ?)
2015-02-25 17:49:09 +08:00
7380affe9c
Added php5-gd as it's required for the QR Codes, Bit of code cleanup and removal of the toolbar by default
2015-02-25 17:46:28 +08:00
1734c5ab99
Enhance installation further 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-25 08:47:05 +01:00
18f96bb20a
hopefully this sets that motherfucka executable
2015-02-25 08:17:56 +01:00
da28036297
Revert "remove Bitdeli badge"
...
This reverts commit 474731d1a3
2015-02-25 08:04:04 +01:00
474731d1a3
remove Bitdeli badge
2015-02-25 08:03:04 +01:00
f59db3c741
Revert "delete and file mode"
...
This reverts commit ecfc0e0e2b
2015-02-25 08:02:14 +01:00
ecfc0e0e2b
delete and file mode
...
Delete bitdeli badge and add executable mode
2015-02-25 07:54:13 +01:00
8ac16e53c7
Revert "remove Bitdeli badge"
...
This reverts commit 5d81c04b3d
2015-02-25 07:53:11 +01:00
5d81c04b3d
remove Bitdeli badge
...
It is not on origin source
2015-02-25 07:48:12 +01:00
037a8bee2f
Merge branch 'develop' of https://github.com/roncsak/snipe-it into develop
2015-02-25 07:46:17 +01:00
e12bbbc171
Clearly, it's time for me to take a break
2015-02-24 22:21:39 -08:00
31e2299385
Herp derp broke the build
2015-02-24 22:19:14 -08:00
097bb38a23
Fixes #163 - accept acceptance + eula
...
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
2015-02-24 22:15:36 -08:00
4340d50071
Stil allow new user creation
2015-02-24 12:06:00 -08:00
de94311c47
Add ability to prevent passwords from being changed
2015-02-24 11:57:46 -08:00
cb51dc45b6
Extend report to 60 days
2015-02-24 03:49:22 -08:00
dee4baf7dd
Updated language strings
2015-02-24 02:11:10 -08:00
e04ac89c5a
Added expiring warrantee alerts
2015-02-24 02:07:33 -08:00
3fa1bc5c3f
Revert "Update README.md"
...
This reverts commit c41f4e9203
2015-02-24 09:57:13 +01:00
254f4b5f3e
Revert "Revert "Revert "Enhance further install without dummy data"""
...
This reverts commit ae381576aa
2015-02-24 09:56:23 +01:00
132578bfe3
Revert "set filemode"
...
This reverts commit c2a1e39b54
2015-02-24 09:32:31 +01:00
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
snipe