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

57 Commits

Author SHA1 Message Date
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 a9f15fbcae Convert Categories View to use Datatables, and fix Model View missing comma 2015-03-25 12:03:49 +10:30
madd15 e61f254ffc Update datatable options 2015-03-25 12:03:44 +10:30
madd15 faa999ab2b Fix incorrect values 2015-03-25 12:03:41 +10:30
madd15 3e98f05564 Convert Models and Categories Index to use Datatables 2015-03-25 12:02:32 +10:30
madd15 7ef17365be update icon 2015-03-10 14:13:11 +10:30
madd15 90536b1cc2 update icon 2015-03-10 13:37:46 +10:30
madd15 f62148b28c update icon 2015-03-10 13:37:01 +10:30
snipe 1273c4ca87 EULA/req improvements 2015-02-26 18:20:52 -08:00
snipe cb73d81d5b Smaller buttons 2015-02-26 17:23:03 -08:00
snipe 231e465898 Added category types to view 2015-02-26 16:00:52 -08:00
snipe 68c3e88343 Few more error icons 2015-02-26 15:52:38 -08:00
snipe afe2eb736c Added category type 2015-02-26 15:48:44 -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 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 80e10c4c98 Fixes #387 - sortable asset view by manufacturer 2015-02-11 04:57:59 -08:00
snipe c89be34503 Fixes #329 and #454 - added category asset view 2015-02-11 03:51:01 -08:00
snipe 51a7752771 Moved cancel text to buttons language file 2015-02-06 18:52:09 -08:00
Cordeos Team 0dfc9660ca alpha 0.4.0 release candidate 2014-08-11 17:13:43 +09:00
Cordeos Team 87c2a4c9c0 initial commit 2014-08-10 16:42:40 +09: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 cd0f42c508 Alphabetized language files, more for #151, refactoring language string hierarchy. 2014-06-09 17:45:52 -04:00
snipe 75590b6852 More internationalization strings for #151 2014-06-09 00:49:52 -04:00
snipe 610c405aa5 More fixes for #151 2014-06-09 00:25:45 -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
Desmond Morris c11510fdca Removes sorting from actions column. Fixes #56 2013-12-01 20:54:43 -05:00
snipe 2e916d0246 MOAR BOOTSTRAP 2013-11-29 08:39:10 -05:00
snipe 809e176908 Updating for bootstrap3 2013-11-29 07:39:41 -05:00
snipe 030db6e267 Upgrading to bootstrap 3 
Ugh.
 2013-11-29 04:10:25 -05:00
snipe 196710dac8 Fixed bug in error validation display 2013-11-26 14:55:04 -05:00
snipe ee3fb2785e Fixed XSS on modal 
Weird thing. The values were being escaped on the way out but something in the modal javascript was parsing them out as if they weren't. Using data-html="false" seemed to have no effect on the modal. *shrug* Problem for another time.
 2013-11-26 07:05:04 -05:00
snipe 3ba2880a35 Layout tweaks 2013-11-25 10:12:41 -05:00
snipe e9bd8397d8 Added site settings into controllers for page_num, added site_name to blade 2013-11-22 18:03:57 -05:00
snipe 34bbf460ee Added modal confirm-delete 2013-11-20 00:56:39 -05:00
snipe f409ade3a5 So wow. Missed tables disappoint. Such code. 2013-11-18 12:51:20 -05:00
snipe b554a9f9db Updated blades with new style buttons 2013-11-18 04:49:54 -05:00
snipe cfb37dcec0 Replaced english text with language reference on buttons 2013-11-17 20:05:12 -05:00
snipe cf59ec8c67 Fixed pagination bug 
Code required
@if ($models->getTotal() > 10)

NOT

@if (count($models) > 10)
 2013-11-16 11:32:18 -05:00
snipe c1e1323e68 cleanup 2013-11-16 08:12:25 -05:00
snipe 2e132331e7 Refactoring 
Removes extraneous create.blade.php, cleaned up some functions
 2013-11-16 03:25:40 -05:00
snipe 31b90cf2a3 removed ID column. No one cares about the ID 2013-11-15 22:33:02 -05:00
snipe 79da13dff7 Fixed layout for category view 2013-11-15 05:07:34 -05:00
snipe b8d4823cae Removed created_at column in results. 
No one cares when a category or manufacturer was created.
 2013-11-15 05:06:26 -05:00