ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,881 Commits 84 Branches 293 Tags
766b4b901f8dbefe4e052d1927f274a0ace4d7d3
Commit Graph

83 Commits

Author SHA1 Message Date
Daniel Nemanic 6f9daa28eb Update view.blade.php 
Added {{ Config::get('app.url') }} in Line 116 to avoid no Image in SubFolder. ( http://domain.com/snipe-it/... )
 2015-04-15 08:53:50 +02:00
snipe c88ce0d14d Fixes for #722 datatables 2015-04-02 14:55:36 -07:00
Madd15 06b3d6e5ce Fix saveState, change chumper defaults 
Hopefully this will fix the saveState issues
 2015-03-27 16:49:03 +10:30
madd15 7d266fdc4e Convert Models View to use Datatables 2015-03-25 12:03:48 +10:30
madd15 e61f254ffc Update datatable options 2015-03-25 12:03:44 +10:30
madd15 66d1872230 Fix button spacing 2015-03-25 12:03:42 +10:30
madd15 3e98f05564 Convert Models and Categories Index to use Datatables 2015-03-25 12:02:32 +10:30
madd15 df0da15dbb update icon 2015-03-10 13:48:30 +10:30
snipe cb73d81d5b Smaller buttons 2015-02-26 17:23:03 -08:00
snipe 68c3e88343 Few more error icons 2015-02-26 15:52:38 -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 88ce0abe85 more icons 2015-02-27 01:32:24 +10:30
madd15 4570efc68b Add restore to action button 2015-02-27 01:03:31 +10:30
madd15 ea28873fb0 remove edit, clone when deleted 2015-02-27 00:56:47 +10:30
madd15 eb5d4983de more model functionality and icons 2015-02-27 00:53:16 +10:30
madd15 379f6bef6c catergories lang and serveral icons 2015-02-26 23:48:17 +10:30
madd15 9f3edd701b Fixes #565 - Soft Delete Models and Allow Restore 
Allow models to be deleted and restored which in turn allows deleted
hardware to function when model is deleted.
 2015-02-26 22:35:57 +10:30
snipe 59ea144b28 Minor UX tweaks 2015-02-26 03:07:19 -08:00
snipe ca1351b704 Switched to all FA 2015-02-25 18:14:51 -08:00
snipe 08ee02d0cd Fixes #525 - added serial to asset model UI 2015-02-16 13:12:57 -08:00
snipe fbf03b225d Fixes #509 - added MAC address as model option 2015-02-11 16:37:24 -08:00
snipe 51a7752771 Moved cancel text to buttons language file 2015-02-06 18:52:09 -08:00
Svpernova09 8ec5934af5 Add menu option in dropdown to create new hardware. Add optional parameter in create/hardware route to handle the parameter in the incoming link 2014-12-03 14:04:02 -06:00
diwanicki f2ae05786b Update view.blade.php 
closing parens was missing from Depreciation, EOL was not configured for translations
 2014-11-07 16:56:28 -05:00
snipe 687c629953 Bootstrap HTML cleanup 2014-11-01 17:45:28 -04:00
snipe 4d8e663bd1 Replaced hard-coded month string for languag support 2014-11-01 17:27:07 -04:00
snipe 3e11ea70da Reverting to old page title 2014-11-01 17:24:57 -04:00
snipe 86b7b6946f Fixes #316 - added model name back to view 2014-11-01 17:14:36 -04:00
madd15 30428cb858 Vars for lang - Image 2014-10-29 17:34:47 +10:30
madd15 f200e81334 Remove circle effect from image 2014-10-29 15:58:39 +10:30
madd15 03f3294873 Add images to models 
Appropriate changes to views and controllers
includes migration and folder
 2014-10-29 15:54:55 +10:30
Cordeos Team 8d3d8c86b1 A0.4.3 add asset, license, user, model clone and artisan db migration 2014-08-12 17:25:07 +09:00
Cordeos Team 9ccc7d756f A0.4.2: Added asset, license, user, model cloning and fixed some bugs. 2014-08-12 14:28:41 +09:00
Cordeos Team b1fafa7ca4 Added asset, license, user and model cloning 2014-08-12 13:41:17 +09:00
Cordeos Team 0dfc9660ca alpha 0.4.0 release candidate 2014-08-11 17:13:43 +09:00
Cordeos Team 6cfb4ab5d8 0.4.0 release candidate 2014-08-11 13:10:00 +09:00
Cordeos Team af083570a0 initial beta .4 draft 2014-08-10 19:09:08 +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
root b8a4c7e4d6 Initial COMMIT to set the file modified tracking. No changes made. 2014-08-05 13:22:08 +09:00
snipe dc1033025a Fixed #151 - more complete translations 2014-07-19 17:53:04 -04:00
snipe 276b1553c1 Mark required form elements as required 2014-07-08 19:17:31 -04:00
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -04:00
snipe 3e7a9e45d1 Fixes PR #168 and #167 2014-06-23 19:40:09 -04:00
snipe 74653d3480 More refactoring of language structure, language strings per #151 2014-06-09 19:56:47 -04:00
snipe cd0f42c508 Alphabetized language files, more for #151, refactoring language string hierarchy. 2014-06-09 17:45:52 -04:00
snipe 94016678f8 More internationalization per #151 2014-06-09 00:02:31 -04:00
snipe cdddbcf695 Using URL::previous to determine back button address 2013-12-12 00:50:56 -05:00
snipe 4468cbd096 Fixes #112 2013-12-10 04:48:40 -05:00
snipe e49420f62d Fixed bug in depreciation display 2013-12-03 03:02:00 -05:00
Desmond Morris c11510fdca Removes sorting from actions column. Fixes #56 2013-12-01 20:54:43 -05:00