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

972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
madd15 b11a0cb436 Changed to == on $setting->qr_code 2014-10-25 00:27:25 +10:30
snipe d36c73550b Merge pull request #296 from madd15/patch-4 
Change rtd_location_id to allow no location set
 2014-10-24 00:24:05 -04:00
madd15 bbfc87dddf Change rtd_location_id to allow no location set 2014-10-24 14:50:27 +10:30
snipe 90497bb6a4 Updated spanish translations 2014-10-23 23:37:15 -04:00
snipe 35ce00f6ab Merge remote-tracking branch 'origin/master' into develop 2014-10-23 23:22:51 -04:00
snipe 3cbd8c9b5d Added CrowdIn link 2014-10-23 23:22:35 -04:00
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 309772e67d Fixed operator for setting bool display 2014-10-23 22:43:06 -04:00
snipe 139a0a2e2a Merge branch 'develop' of github.com:snipe/snipe-it into develop 2014-10-23 22:39:55 -04:00
snipe 88459b755f Merge branch 'madd15-patch-2' into develop 2014-10-23 22:39:22 -04:00
snipe e17de3d34f Merge branch 'patch-2' of github.com:madd15/snipe-it into madd15-patch-2 2014-10-23 22:38:11 -04:00
madd15 a6cd7c0bab Changed to only one date for checkout date 2014-10-24 13:07:57 +10:30
snipe 062d16b2c0 Merge branch 'patch-2' of github.com:madd15/snipe-it into madd15-patch-2 2014-10-23 22:22:55 -04:00
madd15 7f44d6dd47 Add display_checkout_date to settings table 2014-10-24 12:48:04 +10:30
madd15 9125def119 Add checkout_date 2014-10-24 12:41:25 +10:30
madd15 024972e239 Add Checkout Date column 2014-10-24 12:35:42 +10:30
madd15 b0e1ef6024 Add Display Checkout Date 2014-10-24 12:32:44 +10:30
madd15 d74bddb51f Add display_checkout_date 2014-10-24 12:32:06 +10:30
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
snipe 14a9500c6f Merge pull request #293 from madd15/patch-5 
Update Country, Change to Form::, Change state to max 32
 2014-10-23 20:12:45 -04:00
madd15 0e9e659dc4 Alter State to varchar(32) in Suppliers Table 2014-10-24 10:40:14 +10:30
snipe 7bea50feca Merge pull request #294 from madd15/patch-4 
Added DB Prefix to Migrations
 2014-10-23 20:08:31 -04:00
madd15 8f582f29e2 Change state to max 32 2014-10-24 10:17:19 +10:30
madd15 cbf23fc455 Update Country, Change to Form:: 2014-10-24 10:16:08 +10:30
madd15 fafd03f00f Added DB Prefix to Migrations 
Added DB::getTablePrefix(); to migrations to fix #284

not sure if there is another way to achieve this
 2014-10-23 11:47:46 +10:30
snipe 05fb2a434c Merge pull request #283 from madd15/patch-3 
Update table.action to table.actions
 2014-10-19 18:47:12 -04:00
madd15 e43a94586b Update table.action to table.action 2014-10-20 08:46:27 +10:30
madd15 0d12428140 Reordered, Changed title and added per_page 
Reordered, Changed title and added per_page
 2014-10-17 15:39: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 255b618559 Updated for 1.0 release 2014-10-16 18:40:31 -04:00
snipe bf1e075551 Fixes #87 - made datatables responsive v1.0 2014-10-16 17:46:47 -04:00
snipe 7c97477a53 Added default location to physical hardware 2014-10-16 17:41:56 -04:00
snipe ee7d9bec70 Fixes #279 - QR checkbox not staying checked 2014-10-16 15:39:05 -04:00
snipe 58a99a2219 Merge pull request #246 from mrshu/patch-2 
fix: Use the old asset tag when cloning
 2014-09-10 11:51:31 -04:00
Marek Šuppa a829fcf52f fix: Use the old asset tag when cloning 
* Removed previous use of placeholder, added code to set the old asset tag as the new one since it is being checked for uniqueness.
* For more rationale see our discussion with @technogenus in #241
 2014-09-10 08:55:57 +02:00
snipe af450c9bcc Merge pull request #241 from mrshu/patch-1 
views: Added old tag to placeholder when cloning
 2014-09-08 14:25:32 -04:00
snipe 5575567726 Merge pull request #235 from rrdial/patch-1 
Spelling correction.
 2014-09-08 14:25:01 -04:00
snipe 97724a95e3 Merge pull request #242 from mizar1616/spanish 
Spanish Translation 1.0
 2014-09-08 14:23:15 -04:00
mizar1616 2bf57febd8 Spanish Translation 
Ver 1.1
 2014-09-08 15:19:35 +02:00
Marek Šuppa a82a35d921 views: Added old tag to placeholder when cloning 
* Added the old tag to the placeholder attribute of the `asset_tag` input to improve the UX.
 2014-09-08 14:45:06 +02:00
R Ryan Dial 94ead64386 Spelling correction. 2014-09-02 14:57:27 -04:00
snipe e978038cc0 Merge pull request #234 from burlito/typo-fix 
fix typo: artisand -> artisan
 2014-09-01 23:53:31 -04:00
Andrej Manduch 96e40d72b9 fix typo: artisand -> artisan 
In few app.example.php config files was artisand instead artisan.

Signed-off-by: Andrej Manduch <amanduch@gmail.com>
 2014-09-02 05:47:12 +02:00
snipe 284154a2d7 Merge remote-tracking branch 'origin/master' into develop 2014-08-17 04:38:19 -04:00
snipe e0da7ffe9b Updated composer lock 2014-08-17 04:38:01 -04:00
snipe 35479bfa40 Removed pre-update-cmd 2014-08-17 04:37:38 -04:00
snipe 582a9bf78b Make location_id nullable 2014-08-17 04:37:30 -04:00
snipe e8c197c6a5 No upper cap to password 2014-08-15 23:10:41 -04:00