3135869d5a
Fixed font path
2015-02-25 17:53:25 -08:00
c2d30ce865
Ignore siteflow
2015-02-25 17:53:17 -08:00
69a446af97
Font awesome
2015-02-25 17:51:01 -08:00
93b11c35d0
CSS updates
2015-02-25 17:50:21 -08:00
cc3d007fa6
Use font-awesome for sidenav
2015-02-25 17:12:23 -08:00
8cc1bd0159
Updated font-awesome
2015-02-25 16:58:26 -08:00
8879bff160
Fixed bug for reporting on upload in dashboard
2015-02-25 16:48:42 -08:00
fae70bb485
Updated table strings
2015-02-25 16:38:15 -08:00
d4cafe364f
Item language string
2015-02-25 16:38:05 -08:00
346b62bf26
Missing language string
2015-02-25 16:37:57 -08:00
3ba6e45011
Added Accessories scaffolding
2015-02-25 16:31:22 -08:00
525a9225c8
Dashboard
2015-02-25 16:30:59 -08:00
df448f0c35
Merge pull request #564 from splaer/barcode-1
...
Barcode 1
2015-02-25 12:56:26 -08:00
7808039d0d
Merge branch 'develop' of https://github.com/snipe/snipe-it into barcode-1
2015-02-25 15:54:06 -05:00
0ff0d18351
Functionality back to url view for the time being until other code is implemented
2015-02-25 15:52:24 -05:00
fc4f1fd7fc
Updated lock file
2015-02-25 12:35:41 -08:00
d55d9f5530
Merge pull request #562 from splaer/barcode-1
...
Barcode - Stage 1
2015-02-25 12:32:13 -08:00
cd7461a3a8
Missed files. Composer to add new package and organized the view page label
2015-02-25 15:08:12 -05:00
ad39ec1dc3
Added markdown to EULA
2015-02-25 11:25:10 -08:00
b2af455523
Merge conflict resolution. Added a use at the same line as remote. Fixed
2015-02-25 14:09:58 -05:00
6d4f4c6064
Preparation for barcode goodness. Changed out library to one that supports all barcode types and not just QR. Prep branch for much bigger barcode things
2015-02-25 14:07:23 -05: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
snipe