ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
942 Commits 84 Branches 293 Tags
599520dff605714dccf60a82a31893dde8ffa8a0
Commit Graph

98 Commits

Author SHA1 Message Date
snipe 599520dff6 Squashed commit of the following: 
commit 309772e67d
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 22:43:06 2014 -0400

    Fixed operator for setting bool display

commit 139a0a2e2a
Merge: 88459b7 14a9500
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 22:39:55 2014 -0400

    Merge branch 'develop' of github.com:snipe/snipe-it into develop

commit 88459b755f
Merge: 05fb2a4 e17de3d
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 22:39:22 2014 -0400

    Merge branch 'madd15-patch-2' into develop

commit e17de3d34f
Merge: 062d16b a6cd7c0
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 22:38:11 2014 -0400

    Merge branch 'patch-2' of github.com:madd15/snipe-it into madd15-patch-2

commit a6cd7c0bab
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 13:07:57 2014 +1030

    Changed to only one date for checkout date

commit 062d16b2c0
Merge: 05fb2a4 7f44d6d
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 22:22:55 2014 -0400

    Merge branch 'patch-2' of github.com:madd15/snipe-it into madd15-patch-2

commit 7f44d6dd47
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:48:04 2014 +1030

    Add display_checkout_date to settings table

commit 9125def119
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:41:25 2014 +1030

    Add checkout_date

commit 024972e239
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:35:42 2014 +1030

    Add Checkout Date column

commit b0e1ef6024
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:32:44 2014 +1030

    Add Display Checkout Date

commit d74bddb51f
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:32:06 2014 +1030

    Add display_checkout_date

commit 189523a943
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:30:51 2014 +1030

    Add Display Checkout Date Setting

commit 98b96d372d
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 12:29:58 2014 +1030

    Add Display Checkout Date Setting

commit 14a9500c6f
Merge: 7bea50f 0e9e659
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 20:12:45 2014 -0400

    Merge pull request #293 from madd15/patch-5

    Update Country, Change to Form::, Change state to max 32

commit 0e9e659dc4
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 10:40:14 2014 +1030

    Alter State to varchar(32) in Suppliers Table

commit 7bea50feca
Merge: 05fb2a4 fafd03f
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 23 20:08:31 2014 -0400

    Merge pull request #294 from madd15/patch-4

    Added DB Prefix to Migrations

commit 8f582f29e2
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 10:17:19 2014 +1030

    Change state to max 32

commit cbf23fc455
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 24 10:16:08 2014 +1030

    Update Country, Change to Form::

commit fafd03f00f
Author: madd15 <joshdeakin@adam.com.au>
Date:   Thu Oct 23 11:47:46 2014 +1030

    Added DB Prefix to Migrations

    Added DB::getTablePrefix(); to migrations to fix #284

    not sure if there is another way to achieve this

commit 05fb2a434c
Merge: 255b618 e43a945
Author: snipe <snipe@snipe.net>
Date:   Sun Oct 19 18:47:12 2014 -0400

    Merge pull request #283 from madd15/patch-3

    Update table.action to table.actions

commit e43a94586b
Author: madd15 <joshdeakin@adam.com.au>
Date:   Mon Oct 20 08:46:27 2014 +1030

    Update table.action to table.action

commit 0d12428140
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 17 15:39:58 2014 +1030

    Reordered, Changed title and added per_page

    Reordered, Changed title and added per_page

commit 692c861594
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 17 15:36:31 2014 +1030

    Updated static text to Lang vars

    Updated static text to Lang vars

commit c68d76870e
Author: madd15 <joshdeakin@adam.com.au>
Date:   Fri Oct 17 15:35:56 2014 +1030

    Change all form to use Form:: & update Lang

    Updated <input> to Form::
    Update static text to Lang Vars
 2014-10-23 22:46:20 -04:00
snipe 7c97477a53 Added default location to physical hardware 2014-10-16 17:41:56 -04:00
snipe 582a9bf78b Make location_id nullable 2014-08-17 04:37:30 -04:00
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 144c9eb7f8 A0.4.2: asset, license, user, model cloning and move db migration 2014-08-12 15:54:12 +09:00
Cordeos Team 7ac06fa004 DB migration script Rev 0.11 2014-08-11 17:45:11 +09:00
Cordeos Team 0dfc9660ca alpha 0.4.0 release candidate 2014-08-11 17:13:43 +09:00
Cordeos Team d6404dc734 0.4.1 release candidate 2014-08-11 13:32:24 +09:00
Cordeos Team d482b1ea69 0.4.0 release candidate 2014-08-11 13:22:42 +09:00
Cordeos Team 6cfb4ab5d8 0.4.0 release candidate 2014-08-11 13:10:00 +09:00
Cordeos Team 64abdddccb Database migration update 2014-08-10 22:59:57 +09:00
Cordeos Team 23a64cfe26 Database migration update 2014-08-10 22:35:14 +09:00
Cordeos Team 448b54d8e2 DBUpdate 2014-08-10 22:08:38 +09:00
Cordeos Team 72671d3e1d initial beta .4 draft 2014-08-10 20:01:38 +09:00
Cordeos Team efbe7b0fee initial beta .4 draft 2014-08-10 19:58:23 +09:00
root b8a4c7e4d6 Initial COMMIT to set the file modified tracking. No changes made. 2014-08-05 13:22:08 +09:00
Jarno Kurlin 94daba9bab user id 3 does not exists! 2014-07-22 18:53:45 +03:00
snipe ff61705a8f More edits for #140 2014-07-17 13:38:53 -04:00
snipe aa8bbb88e9 Updated MVC for #140, ability to assign software to asset (incomplete) 2014-07-17 08:33:30 -04:00
snipe 7d04ded02a DB migration for #140 2014-07-17 08:32:11 -04:00
snipe 6f2b78ad9f Added DB migration for #15 2014-07-09 11:50:54 -04:00
snipe 89a8f3c277 Fixes #183 - added employee number to users 2014-07-08 02:57:15 -04:00
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -04:00
snipe b09aec67f1 Fixes #155 2014-06-23 23:46:14 -04:00
snipe 6f42b3045e Resolves #155 2014-06-23 22:09:32 -04:00
snipe b365ada0ce Provisions for strict mode 2014-06-19 22:13:43 -04:00
snipe 08d05b481f Fixes #158 2014-06-19 16:10:00 -04:00
snipe 607484b294 Fixes #141 for mysql with strict mode enabled 2014-05-27 19:51:24 -04:00
snipe 9714178ce1 Fixes #141 2014-05-24 05:48:50 -04:00
Jake McGraw af603f0380 make text below asset tags configurable 2014-05-03 20:06:59 +00:00
Jake McGraw 55b54e0a42 added sql migration for qr_code in settings table 
added baconqr to composer package list
added admin settings page for qr code
 2014-01-28 04:25:58 +00:00
snipe 3ec6df492d Added manager_id to DB, install script 2013-12-12 01:12:42 -05:00
snipe 4c3e2a9a68 DB seeding for #112 2013-12-10 03:52:23 -05:00
snipe da9f28fbe7 DB migration for #112 2013-12-10 03:48:20 -05:00
snipe 78b3a0e1f9 Make license fields nullable migration 2013-12-06 04:58:53 -05:00
snipe 82de635a75 Fixed invalid seed data 2013-12-06 02:10:08 -05:00
snipe d72daf14ff Added filename to log seeder for mysql strict mode 2013-12-04 12:14:02 -05:00
snipe bee260b1f0 Added filename to log 2013-12-01 06:45:03 -05:00
snipe b3bb2d4f11 Added soon-out-of-warranty example to test notifications 2013-11-28 16:37:24 -05:00
snipe af69467bea Added notes to log table 2013-11-27 01:29:57 -05:00
snipe b1aa67ddb7 Fixes #69 
Removed problem migration file
 2013-11-27 01:20:57 -05:00
snipe 0e3bcfecd0 Should be final fixes for mysql strict mode 2013-11-26 18:10:46 -05:00
snipe 96368444ac Default user id 2013-11-26 17:53:03 -05:00
snipe 8eeae70313 Formatting cleanup 2013-11-26 17:48:51 -05:00
snipe a33435ee12 No seriously. Fuck you, MySQL strict. 2013-11-26 17:47:21 -05:00
snipe eb7801abf9 Fuck you, MySQL strict mode. Right in the eye. 2013-11-26 17:36:06 -05:00
snipe 4c0af1eae1 Fixed typo causing failure with mysql strict 2013-11-26 17:22:40 -05:00
snipe 1527b88fd6 Fixes #61 2013-11-26 16:36:42 -05:00
snipe 1d50724c91 Removed parent from category 
Since the field was already removed
 2013-11-26 01:15:25 -05:00
snipe 6fee1067bc Added depreciate flag for assets and licenses 2013-11-25 11:31:02 -05:00