 snipe
|
62b5ec5b02
|
Slack field validation and placeholder text
|
2015-04-30 16:58:33 -07:00 |
|
|
snipe
|
3c00f38a0f
|
Slack integration for asset checkin/checkout
|
2015-04-29 17:38:22 -07:00 |
|
|
snipe
|
bce06543b2
|
Merge remote-tracking branch 'origin/master' into develop
|
2015-04-29 15:28:38 -07:00 |
|
|
snipe
|
9841dbbbc4
|
Fixed HTML so settings are saved correctly
|
2015-04-29 15:28:11 -07:00 |
|
|
snipe
|
d61506fcf7
|
Fixes for #766 - add activity report
|
2015-04-29 14:50:12 -07:00 |
|
|
madd15
|
9be50152b3
|
per_page Select drop-down
|
2015-04-02 11:21:32 +10:30 |
|
|
snipe
|
51148f1371
|
Removed additional settings, since all are displayable now
|
2015-03-27 22:32:38 -07:00 |
|
|
snipe
|
c6be6f480e
|
Disable editing title when locked
|
2015-03-20 14:56:03 -07:00 |
|
|
madd15
|
ff8b88d187
|
add pencil to edit settings button
|
2015-03-10 13:56:25 +10:30 |
|
|
madd15
|
f532665f06
|
update icon
|
2015-03-10 13:53:34 +10:30 |
|
|
snipe
|
4076b29b63
|
Support for DATAMATRIX and PDF417 barcodes
|
2015-03-04 17:43:53 -08:00 |
|
|
snipe
|
6bb3f222ea
|
Hash version for settings page
|
2015-02-28 15:21:44 -08:00 |
|
|
snipe
|
d7b7a3a4a8
|
Better version output
|
2015-02-28 15:18:31 -08:00 |
|
|
snipe
|
b986b3276c
|
Dynamic version number on settings and footer
|
2015-02-28 14:59:03 -08:00 |
|
|
snipe
|
97d97fc4df
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
Conflicts:
app/views/backend/categories/edit.blade.php
app/views/backend/depreciations/edit.blade.php
app/views/backend/groups/create.blade.php
app/views/backend/groups/edit.blade.php
app/views/backend/hardware/bulk.blade.php
app/views/backend/hardware/checkin.blade.php
app/views/backend/hardware/checkout.blade.php
app/views/backend/hardware/edit.blade.php
app/views/backend/licenses/checkin.blade.php
app/views/backend/licenses/checkout.blade.php
app/views/backend/licenses/edit.blade.php
app/views/backend/locations/edit.blade.php
app/views/backend/manufacturers/edit.blade.php
app/views/backend/models/edit.blade.php
app/views/backend/statuslabels/edit.blade.php
app/views/backend/suppliers/edit.blade.php
app/views/frontend/account/change-email.blade.php
app/views/frontend/account/change-password.blade.php
app/views/frontend/account/profile.blade.php
app/views/frontend/auth/forgot-password-confirm.blade.php
app/views/frontend/auth/signin.blade.php
|
2015-02-26 10:26:04 -08:00 |
|
|
madd15
|
379f6bef6c
|
catergories lang and serveral icons
|
2015-02-26 23:48:17 +10:30 |
|
|
snipe
|
59ea144b28
|
Minor UX tweaks
|
2015-02-26 03:07:19 -08:00 |
|
|
snipe
|
f9f3b5b4f9
|
Smaller buttons
|
2015-02-26 02:42:25 -08:00 |
|
|
snipe
|
ca1351b704
|
Switched to all FA
|
2015-02-25 18:14:51 -08:00 |
|
|
snipe
|
ad39ec1dc3
|
Added markdown to EULA
|
2015-02-25 11:25:10 -08:00 |
|
|
snipe
|
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 |
|
|
snipe
|
e04ac89c5a
|
Added expiring warrantee alerts
|
2015-02-24 02:07:33 -08:00 |
|
|
snipe
|
ad9e7f1d9e
|
Cleaned up settings form for nicer display
|
2015-02-19 15:34:55 -08:00 |
|
|
snipe
|
f8e12cabd4
|
Fixes #476 - added logo upload and header color
|
2015-02-19 15:14:50 -08:00 |
|
|
snipe
|
38961298ed
|
Fixes #439 - loads javascript and CSS locally
|
2015-02-17 15:29:57 -08:00 |
|
|
snipe
|
51a7752771
|
Moved cancel text to buttons language file
|
2015-02-06 18:52:09 -08:00 |
|
|
snipe
|
3787a3f4ba
|
Fixed language strings for incrementing IDs
|
2015-01-22 15:34:19 -08:00 |
|
|
snipe
|
d6a0249c60
|
Fixed #373 - added ability to auto-increment asset tags
|
2014-11-20 18:28:45 -05:00 |
|
|
madd15
|
0eda46da0c
|
Move side column back to top on the right
|
2014-11-06 11:23:07 +10:30 |
|
|
madd15
|
1047c5c8bb
|
Update Settings to contain PHP & Laravel versions
|
2014-11-06 11:12:15 +10:30 |
|
|
snipe
|
0d402f52c8
|
Localization
|
2014-11-02 13:34:08 -05:00 |
|
|
snipe
|
9e85dcb9fc
|
Fixes #315 - add EOL as display option in settings (run migrations)
|
2014-11-01 18:38:24 -04:00 |
|
|
madd15
|
b11a0cb436
|
Changed to == on $setting->qr_code
|
2014-10-25 00:27:25 +10:30 |
|
|
snipe
|
309772e67d
|
Fixed operator for setting bool display
|
2014-10-23 22:43:06 -04:00 |
|
|
madd15
|
189523a943
|
Add Display Checkout Date Setting
|
2014-10-24 12:30:51 +10:30 |
|
|
madd15
|
98b96d372d
|
Add Display Checkout Date Setting
|
2014-10-24 12:29:58 +10:30 |
|
|
madd15
|
692c861594
|
Updated static text to Lang vars
Updated static text to Lang vars
|
2014-10-17 15:36:31 +10:30 |
|
|
madd15
|
c68d76870e
|
Change all form to use Form:: & update Lang
Updated <input> to Form::
Update static text to Lang Vars
|
2014-10-17 15:35:56 +10:30 |
|
|
snipe
|
ee7d9bec70
|
Fixes #279 - QR checkbox not staying checked
|
2014-10-16 15:39:05 -04:00 |
|
|
Cordeos Team
|
0dfc9660ca
|
alpha 0.4.0 release candidate
|
2014-08-11 17:13:43 +09:00 |
|
|
root
|
cb8369e9de
|
Initial QA Patch to fix errors
Add License
Add Asset
Show Deleted Users
License Assign
|
2014-08-08 00:03:12 +09:00 |
|
|
snipe
|
8b914102b7
|
Updated spacing for PSR-2
|
2014-06-24 17:49:39 -04:00 |
|
|
madd15
|
82f0c6f00c
|
Change to Triple = and no '
|
2014-06-24 13:02:13 +09:30 |
|
|
madd15
|
9fe76a21f6
|
Remove double 'Display QR Codes'
|
2014-06-24 12:46:37 +09:30 |
|
|
madd15
|
3b9f96419b
|
Check boxes not showing correct settings
|
2014-06-24 12:31:43 +09:30 |
|
|
snipe
|
3e7a9e45d1
|
Fixes PR #168 and #167
|
2014-06-23 19:40:09 -04:00 |
|
|
snipe
|
08d05b481f
|
Fixes #158
|
2014-06-19 16:10:00 -04:00 |
|
|
snipe
|
c937796224
|
More language strings, per #151
|
2014-06-09 21:30:58 -04:00 |
|
|
snipe
|
94016678f8
|
More internationalization per #151
|
2014-06-09 00:02:31 -04:00 |
|
|
Jake McGraw
|
af603f0380
|
make text below asset tags configurable
|
2014-05-03 20:06:59 +00:00 |
|