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

997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe 5abc4467df New placeholder language files for translations 2014-10-29 17:38:24 -04:00
snipe ffe095d64b Updates to language files 2014-10-29 17:38:07 -04:00
snipe ce566509ce Merge pull request #306 from madd15/patch-1 
Allow spaces in category name
 2014-10-29 14:27:48 -04:00
madd15 84cb51b4c3 Allow spaces in category name 2014-10-29 21:59:51 +10:30
snipe 9b0d930a21 Updated requirements in main README 2014-10-29 05:56:05 -04:00
snipe 1680d45163 Updated composer lock 2014-10-29 05:38:03 -04:00
snipe 5e1f61ea2a Ignore new uploads subdirectories 2014-10-29 05:37:48 -04:00
snipe 75d0136d7f Merge pull request #304 from madd15/feature-avatars 
Feature local avatars and model images
 2014-10-29 05:08:49 -04:00
madd15 30428cb858 Vars for lang - Image 2014-10-29 17:34:47 +10:30
madd15 26ab53c02c Added Location and Website 2014-10-29 17:33:10 +10:30
madd15 d8815b5ef5 Change to Vars for labels 2014-10-29 17:32:19 +10:30
madd15 e8737b156a Add image and avatar lang vars 2014-10-29 17:19:27 +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
madd15 da70d5042c uploads\avatars folder 2014-10-29 14:43:27 +10:30
madd15 239370058c changed to avatar 2014-10-29 14:28:24 +10:30
madd15 0b4c1b8d83 Feature Avatars 
Appropriate changes to views and controllers
User Avatar Migration
Add intervention/image
 2014-10-29 14:18:54 +10:30
snipe 736c9a1ad7 Merge pull request #302 from madd15/patch-2 
Change Locations to sort by name asc
 2014-10-28 02:05:05 -04:00
madd15 fb46a04d78 Change Locations to sort by name asc 2014-10-28 16:01:11 +10:30
snipe e9e332e19e Merge pull request #300 from madd15/patch-2 
Change paginate to get for Index
 2014-10-27 15:19:33 -04:00
madd15 16420dafa9 Change paginate to get for Index 
Fixes #261 - Pagination appears to work correctly after this change
 2014-10-27 12:14:55 +10:30
rob 22f81912e4 Fixes #299 2014-10-24 17:08:50 -04:00
snipe e61f93deb8 Merge pull request #297 from madd15/patch-4 
Changed rtd_location_id for edit to match create
 2014-10-24 16:38:18 -04:00
snipe 8d2b09a647 Merge pull request #298 from madd15/patch-1 
Changed to == on $setting->qr_code
 2014-10-24 12:11:36 -04:00
madd15 b11a0cb436 Changed to == on $setting->qr_code 2014-10-25 00:27:25 +10:30
madd15 dd923984ef Changed rtd_location_id for edit to match create 
Forgot to change postEdit
 2014-10-24 15:17:07 +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