DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
2324 commits 97 branches 266 tags 292 MiB
Commit graph

2324 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 58a9b0d3e8 Normalized route name 2017-10-03 12:50:01 -07:00
snipe fcb1283a14 Added missing deployed page title 2017-10-03 12:49:53 -07:00
snipe 54671af7f0 Small export assets fix 2017-10-03 11:49:41 -07:00
snipe aedabb0920 Merge branch 'develop' 2017-10-03 11:29:06 -07:00
snipe aaf4acef83 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-10-03 11:28:45 -07:00
snipe 8e73cacf4e Fixes custom report to include assigned to names, etc 2017-10-03 10:38:28 -07:00
Daniel Meltzer b4b2daebbd Fix Importer tests. (#4122) 2017-10-03 09:14:04 -07:00
snipe 3e2c18cb4d Merge branch 'develop' 2017-10-03 08:47:57 -07:00
snipe c721fdd793 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-10-03 08:46:25 -07:00
Daniel Meltzer d119372ff0 Fix License Import. (#4121) 
The license name is not unique, so keying by license alone was causing issues.  Match using name + serial instead.
 2017-10-03 08:46:06 -07:00
snipe c8bed867da Export PDF as landscape 2017-10-03 07:32:18 -07:00
snipe 3a470ce789 Only report exceptions we want to see 2017-10-03 07:28:00 -07:00
snipe f9105719a8 Merge branch 'develop' 2017-10-03 05:16:11 -07:00
snipe d303cbd7cb Bumped version 2017-10-03 05:15:52 -07:00
snipe 96c09e7264 Merge branch 'develop' 2017-10-03 02:05:47 -07:00
snipe ef19bc7c16 Workaround to fix #4117 
This shouldn’t be necessary, but it looks like some folks missed the migration that drops the FK for company_id
 2017-10-03 02:05:22 -07:00
snipe aa8472971d Merge branch 'develop' 2017-10-02 21:58:17 -07:00
snipe 78257d5ca6 Merge branch 'develop' 2017-10-02 21:55:25 -07:00
tiagom62 655484b1da General cleanup and get ubuntu install working. (#4118) 2017-10-02 21:37:04 -07:00
snipe ac8185339d Removed linebreaks 2017-10-02 20:32:42 -07:00
snipe a021ce011b Correct argv 2017-10-02 20:31:43 -07:00
snipe 3687cbfdb3 Added rollbar support 2017-10-02 20:27:45 -07:00
snipe 594135fd70 Upgrade script improvements 2017-10-02 20:11:07 -07:00
snipe 2542b9cf59 Merge branch 'develop' 2017-10-02 17:21:36 -07:00
snipe 8a7abba427 Slash url 2017-10-02 17:21:18 -07:00
snipe 3775649c8a Merge branch 'develop' 2017-10-02 17:19:59 -07:00
snipe 9df648b428 Fix Session path 2017-10-02 17:19:22 -07:00
snipe 11a1efdbbc Merge branch 'develop' 2017-10-02 16:56:12 -07:00
snipe a65c2f305e Set polict to same-origin in example env 2017-10-02 16:47:19 -07:00
snipe 50777f5c1d Merge branch 'develop' 2017-10-02 16:39:11 -07:00
snipe ff38cdd09b Comment out the nullable middleware until we have a chance to check all model validators 2017-10-02 16:36:43 -07:00
snipe 9420913d25 Set referrer policy to same origin - should fix a lot of weird validation redirects 2017-10-02 16:35:57 -07:00
snipe 59225701b5 Redirect to previous after login 2017-10-02 16:00:42 -07:00
snipe 6aa5d4d58c Merge branch 'develop' 2017-10-02 15:27:33 -07:00
snipe cd2e137fcc Bumped version 2017-10-02 15:27:18 -07:00
snipe 0b968e1d6b Merge branch 'develop' 2017-10-02 13:31:08 -07:00
snipe 7a27fda083 Update example env with CSP default 2017-10-02 13:29:42 -07:00
snipe aab635154a Default to turning CSP off until we can fix vue/CSP issues 2017-10-02 13:29:14 -07:00
snipe e389f67629 Merge branch 'develop' 2017-10-02 13:09:17 -07:00
Geoff Young 169dc779fd Fix box title in Label settings view (#4111) 2017-10-02 13:00:32 -07:00
tiagom62 26423c5c02 Fix various installer issues. (#4096) 
* Various installer fixes.

* CentOS 6 related fixes.
 2017-10-02 12:59:53 -07:00
snipe 862543428b Fix named route for license checkin 2017-10-02 12:58:17 -07:00
snipe d28e882f5d Fixed form close tag 2017-10-02 12:57:01 -07:00
snipe e26d038589 Fixed license checkin form UI 2017-10-01 15:08:32 -07:00
snipe afc8133acf URL nullable validation isn’t working in Laravel 5.4? 2017-10-01 14:40:13 -07:00
snipe abe19a6311 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-10-01 14:33:02 -07:00
snipe 07359c76ad Fixes #4094 - more nullables 2017-10-01 14:32:47 -07:00
Daniel Meltzer a2453be573 Pass urls to passport vue components to make work in subdirectories. (#4090) 2017-10-01 13:59:07 -07:00
Daniel Meltzer c2616412c0 Add laravel routes to javascript (#4092) 
* Add laravel routes to javascript

This will clean up a lot of passing of urls.  Adds a route() helper and
everything...

This commit also moves the customfield fetching to only be fetched once
and shared with each file, rather than once for each file.

* Try to fix travis unit test things.

* Downgrade doctrine/inflector for php5

* Attempt to occasional seeder issues on travis if the asset does not generate validatable data.

* Update sql dump for functional tests.

* Try to fix api tests.
 2017-10-01 12:59:55 -07:00
Daniel Meltzer 23ca2d9a0b Minor fixes (#4091) 
* Fix old urls.

Still had some /admin/ urls floating around, which was causing bad
redirects in some instances.  Should fix #4085

* The modal seems to be confusing license upload. be more explicit in the route we redirect to.

* Fix #4039.  Use proper methods for location assets.

This also fixes a bunch of n+1 issues in the transformer.  Also: curious
to know what Location::assets() does, because it doesn't do what I want
it to :)
 2017-10-01 12:57:04 -07:00