snipe
6e70352d0b
Merge branch 'develop'
...
# Conflicts:
# config/version.php
2018-02-17 01:05:20 -08:00
snipe
9a4f5e0ba8
Bumped hash
2018-02-16 22:10:06 -08:00
snipe
5302108556
Update to master
2018-02-16 13:27:03 -08:00
snipe
27c1bc0271
Bumped hash
2018-02-16 13:24:47 -08:00
snipe
8b2045523d
Bumped hash
2018-02-01 15:55:33 -06:00
snipe
e77aae703b
Bumped hash
2018-01-25 11:03:45 -08:00
snipe
f5636f325d
Bumped hash
2018-01-24 11:01:51 -08:00
snipe
fcb5eea951
Bumped hash
2018-01-24 08:28:53 -08:00
snipe
a28fee1ff4
Bumped hash
2018-01-20 07:47:07 -08:00
snipe
f53c68e040
Bumped hash
2018-01-20 04:40:26 -08:00
snipe
913e6a5709
Bumped hash
2018-01-20 03:59:42 -08:00
snipe
a9ffe8d210
Bumped hash
2018-01-19 17:52:40 -08:00
snipe
c242abb42e
Added Company policy to fix company deletion issue
2018-01-19 17:51:28 -08:00
snipe
6133f09056
Bumped hash
2018-01-17 19:30:31 -08:00
snipe
e8252d9468
Bumped hash
2018-01-17 12:41:11 -08:00
snipe
9e605e0f79
Bumped hash
2018-01-17 12:11:39 -08:00
snipe
78efeec368
Bumped hash
2018-01-11 15:24:37 -08:00
snipe
bc3d27fac6
Bumped hash
2018-01-10 22:57:22 -08:00
snipe
30716b349b
Bumped dev hash
2017-12-15 18:55:56 -08:00
snipe
9018af4f1d
Bumped hash
2017-12-12 10:45:20 -08:00
snipe
55eaea0110
Derp.
2017-12-12 09:25:06 -08:00
snipe
671a125c62
Bumped hash
2017-12-12 09:24:40 -08:00
snipe
035f7a5292
Formatted version
2017-12-07 19:24:03 -08:00
snipe
0ea3100896
Bumped hash
2017-12-07 19:23:34 -08:00
snipe
808cd0f728
Nicer groups permission edit UI
2017-12-05 18:11:06 -08:00
snipe
027f6a7c12
Bumped hash
2017-12-05 13:18:52 -08:00
snipe
28fdbdd5d8
Bumped version
2017-12-04 23:50:45 -08:00
snipe
2aafdb1400
Bumped version
2017-12-01 20:49:04 -08:00
snipe
cbc09f3a12
Fixes #4508 - adds image to location view (and google map, if address and API key exist)
2017-12-01 19:12:35 -08:00
snipe
5a3233da37
Grr.
2017-12-01 14:54:18 -08:00
snipe
80109071a2
Fixed version number
2017-12-01 14:54:02 -08:00
snipe
c43bb670d2
Bumped hash
2017-12-01 14:50:46 -08:00
snipe
5efb803b60
Auto-bumped hash/version
2017-11-30 16:41:06 -08:00
snipe
51168e8e10
Auto-bumped hash/version
2017-11-30 13:40:36 -08:00
snipe
cc5eee1890
Auto-bumped hash/version
2017-11-30 13:32:12 -08:00
snipe
8cf70e7e20
Auto-bumped hash/version
2017-11-27 22:10:54 -08:00
snipe
290cf79778
Auto-bumped hash/version
2017-11-27 21:25:21 -08:00
snipe
8af1481749
Auto-bumped hash/version
2017-11-27 21:20:38 -08:00
snipe
82fca0c72d
Auto-bumped hash/version
2017-11-24 11:25:57 -08:00
snipe
76e3398d44
Auto-bumped hash/version
2017-11-22 18:42:33 -08:00
snipe
64b670033d
Auto-bumped hash/version
2017-11-22 18:30:45 -08:00
snipe
66ac147c9e
Auto-bumped hash/version
2017-11-22 07:32:40 -08:00
snipe
05e0d15ae4
Auto-bumped hash/version
2017-11-22 07:31:50 -08:00
snipe
09f20873df
Auto-bumped hash/version
2017-11-21 22:35:05 -08:00
snipe
2adc1e8ba9
Auto-bumped hash/version
2017-11-21 22:35:04 -08:00
snipe
4a6c18532b
Auto-bumped hash/version
2017-11-21 22:35:02 -08:00
snipe
921f882680
Auto-bumped hash/version
2017-11-21 22:35:01 -08:00
snipe
f79e5add58
Auto-bumped hash/version
2017-11-21 22:34:59 -08:00
snipe
8c15a4e0c6
Auto-bumped hash/version
2017-11-21 21:00:07 -08:00
snipe
9250b45e6e
Auto-bumped hash/version
2017-11-21 21:00:05 -08:00
snipe
3a1de3d2a5
Auto-bumped hash/version
2017-11-21 21:00:02 -08:00
snipe
b59dd11304
Auto-bumped hash/version
2017-11-21 21:00:00 -08:00
snipe
b6222abb7c
Auto-bumped hash/version
2017-11-21 20:59:58 -08:00
snipe
dcf8e4f5ef
Auto-bumped hash/version
2017-11-21 20:59:54 -08:00
snipe
f195073ac3
Auto-bumped hash/version
2017-11-21 20:59:52 -08:00
snipe
452a9d6725
Auto-bumped hash/version
2017-11-21 20:59:50 -08:00
snipe
1d74ddc547
Auto-bumped hash/version
2017-11-21 20:59:45 -08:00
snipe
932b589a14
Auto-bumped hash/version
2017-11-21 20:59:43 -08:00
snipe
671e514785
Auto-bumped hash/version
2017-11-21 20:59:41 -08:00
snipe
1e2ebdb69c
Auto-bumped hash/version
2017-11-21 20:59:39 -08:00
snipe
148751d927
Auto-bumped hash/version
2017-11-21 20:59:37 -08:00
snipe
efecdfaea0
Auto-bumped hash/version
2017-11-21 20:59:35 -08:00
snipe
ab9c84a6b6
Auto-bumped hash/version
2017-11-21 20:59:33 -08:00
snipe
7ce63e653b
Auto-bumped hash/version
2017-11-21 19:39:53 -08:00
snipe
a922c1a298
Auto-bumped hash/version
2017-11-21 19:38:29 -08:00
snipe
0c9e41e1fa
Updated versioning script to handle githooks better
2017-11-21 19:01:47 -08:00
snipe
4fd35573ad
Bumped version
2017-11-20 21:20:34 -08:00
snipe
f137e516a6
Bumped version
2017-11-14 16:49:18 -08:00
snipe
9b1fb90519
Change default log type back to single
2017-11-08 10:58:56 -08:00
snipe
e6ff447ee8
Bumped hash
2017-11-07 23:12:59 -08:00
snipe
eed50112d5
Better fallback for local that won’t break migrations
2017-11-07 18:18:27 -08:00
snipe
30ec919048
Remove AWS package
...
We unfortunately can’t use it right now because it requires a symlink from the storage/app directory. Until we have a better way of checking for configuration issues and/or automatically handling that symlink creation, we’re pulling it for now, since it’s not used anywhere.
2017-11-06 21:45:31 -08:00
snipe
231dea0ebc
Break out service providers by responsibility
2017-11-06 21:17:17 -08:00
snipe
badc763c06
Bumped version
2017-11-04 00:32:33 -07:00
snipe
1859c8f5ab
Reply to seems to be overwritten
2017-11-03 14:55:03 -07:00
snipe
513a1b1e3b
Bumped version
2017-11-02 12:52:44 -07:00
snipe
01bb4bf64a
Bumped version
2017-11-02 11:24:01 -07:00
snipe
3343cf16dd
Bumped version
2017-11-02 04:37:08 -07:00
snipe
1076ec96be
Bumped version
2017-10-28 15:46:02 -07:00
snipe
41994c95e0
Bumped version
2017-10-28 11:22:27 -07:00
snipe
fe70792cbd
Bumped hash
2017-10-28 08:41:34 -07:00
snipe
e8d938e188
Bumped hash
2017-10-25 20:18:06 -07:00
snipe
21c1ca2336
Bumped hash
2017-10-24 19:26:21 -07:00
snipe
c18220069d
Bumped version
2017-10-23 21:17:23 -07:00
snipe
f5ce580593
Bumped version
2017-10-23 19:51:14 -07:00
snipe
341ddec9d8
Adds built-in mail notification vendor templates
2017-10-20 16:52:12 -07:00
snipe
f757da1a98
Bumped hash
2017-10-19 16:45:04 -07:00
snipe
81aaed92ce
Change default session name
2017-10-19 06:08:58 -07:00
snipe
34442362ca
Fixes bad route for new groups
2017-10-18 02:35:30 -07:00
snipe
ab3f5f4f4d
Bumped version
2017-10-18 01:21:50 -07:00
snipe
aa7091d962
Fixes #4226 - adds log_max_files to app config and sample env
2017-10-17 20:04:07 -07:00
snipe
c0103cd878
Bumped version
2017-10-17 18:55:30 -07:00
snipe
176a26e6c3
Bumped version
2017-10-16 09:26:44 -07:00
snipe
13a716310c
Bumped hash
2017-10-11 13:10:29 -07:00
snipe
f468b37f36
Bumped hash
2017-10-07 07:45:43 -07:00
snipe
85da30894b
Bumped version
2017-10-03 21:23:27 -07:00
snipe
d303cbd7cb
Bumped version
2017-10-03 05:15:52 -07:00
snipe
3687cbfdb3
Added rollbar support
2017-10-02 20:27:45 -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
cd2e137fcc
Bumped version
2017-10-02 15:27:18 -07:00
snipe
aab635154a
Default to turning CSP off until we can fix vue/CSP issues
2017-10-02 13:29:14 -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
snipe
9ce2d1f560
Merge branch 'csp-middleware' into develop
2017-09-29 04:14:33 -07:00
snipe
c6069b905b
Bumped version
2017-09-29 03:47:50 -07:00
snipe
d9824a0454
Bumped version
2017-09-28 21:20:37 -07:00
snipe
46d87849f4
Added content security middleware
2017-09-28 19:45:15 -07:00
snipe
26a7701cda
Added referrer-policy header
2017-09-28 17:12:58 -07:00
snipe
5e1df7049c
Make collation and charset for mysql an env variable
2017-09-26 16:02:55 -07:00
snipe
4324242475
Bumped version
2017-09-26 11:12:36 -07:00
snipe
d5e6d82ca1
Bumped version
2017-09-25 22:17:00 -07:00
snipe
b354ca817d
Bumped version
2017-09-25 22:10:06 -07:00
snipe
abc2f7e789
Bumped build number
2017-09-25 21:57:16 -07:00
snipe
9b6276f281
Bumped version
2017-09-25 16:04:23 -07:00
snipe
0715791229
Include oauth keys in backup
2017-09-25 15:45:33 -07:00
snipe
f0a49fefd7
Bumped version
2017-09-22 15:50:24 -07:00
snipe
aff104fa5d
Bumped version for beta
2017-09-18 18:10:43 -07:00
snipe
eba145503b
Bumped version
2017-09-06 19:02:05 -07:00
snipe
7c390cee2c
Bumped version
2017-09-05 18:35:39 -07:00
snipe
a7a10455ae
Bumped version
2017-08-25 13:27:58 -07:00
snipe
16f57e16cb
Fixes #1190 - added basic audit workflow
2017-08-25 10:04:19 -07:00
snipe
e6323e0a1b
Version bump for beta 2
2017-08-24 23:32:33 -07:00
snipe
9bda62d295
ADDED: Password rules for complexity, min length, rejecting common passwords
2017-08-22 20:32:39 -07:00
snipe
ac8f46c93c
Bumped version for beta release
2017-08-09 19:01:07 -07:00
snipe
241bf0cd4b
Allow port number to be configured via env
2017-08-08 12:36:44 -07:00
Daniel Meltzer
f432f98e12
Importer tests + Fixes ( #3733 )
...
* Fix Bug in User::generateFormattedNameFromFullName
In a name "John Doe", this method would split it into "John" and " Doe",
Leaving a space in the last name when importing to the database. Strip
this space.
* Cleanup/fix some item mapping.
Also make some changes to the importer schema to allow for unit testing.
Generate a default item mapping, and then merge that with any custom
mappings.
* Beginning work on importer unit tests.
* Strip out testrun branches from importer. It added a lot of complexity and was not terribly useful with web importer as it stood, might reconsider down the road however.
* Normalize the mapped keys when using custom field mappings.
* Add test for custom asset import mapping.
* Make all unit tests inherit from a new custom base.
This baseclass currently calls Artisan::migrate() and seeds a Settings
instance. This fixes unit tests after the autoincrement bits.
* Store requestable as a boolean. Fixes some import oddities
* Work on tests for accessory importer.
* Test for custom mapping of accessory import, also adjust the internal field for purchase date.
* Update default locale fallback for currency detection
* Fix Reassignable in consumable as well.
* More importer tests and fixes.
2017-07-11 20:37:02 -07:00
snipe
8aa920ca3a
Update composer
2017-07-07 12:59:59 -07:00
Daniel Meltzer
5d4920c741
[WIP] Improvements to unit tests. ( #3574 )
...
* Improvemenets to unit tests.
* Break up modelfactory into multiple files, populate many states.
* Begin testing validation at the unit test level, test relationships.
* Add tests for Asset::availableForCheckout.
* Model factories now generate all needed relationships on demand,
which allows us to unit test with a empty database.
* To faciliate the empty database, we move to using sqlite in memory as
the unit testing database.
* Fix bug with logs of checkouts to non users.
* Fix location finding for assets. Also Fix location show page to show users associated with location. Still need some work to show assets.
* More test and generator improvements
* More unit test fixes. PermissionsTest is borked still.
* More Updates
* Rewrite permissionstest. Check that we have access on the model level rather than via web requests. Also test delete permissions.
* Fix seeders.
* Make the default asset model factory generate assets that are rtd for testing.
* Save progress.
* Rebase tests, fix department unit test, update database for functional tests.
* Update functional and api tests to use new modelfactory signatures.
2017-06-12 17:39:03 -07:00
snipe
f57ebc664e
Added dept management to permissions
2017-05-23 02:50:08 -07:00
snipe
322817b8b1
Bumped version
2017-05-08 20:02:52 -07:00
snipe
8ba19aa855
Fixes explode for trusted proxy
2017-04-27 07:09:23 -07:00
snipe
07f8c9dc5e
Added additional mail markdown config variables
2017-04-27 02:27:57 -07:00
snipe
c7acbc0eee
Stunning hook
2017-04-06 19:45:47 -07:00
Daniel Meltzer
1bb89db451
A few fixes ( #3437 )
...
* This method was renamed, so we need to rename the eager load
* Readd tinker to the composer dev packages.
* Update sql dump for functional tests.
2017-03-31 13:48:31 -07:00
snipe
318ac2be9a
Break cookie
2017-03-03 19:53:58 -08:00
snipe
b5424462c9
Moved non-superadmin settings into sidebar
2017-03-03 17:30:12 -08:00
snipe
dc38e575d9
Allow date/time formatting selection in settings
2017-03-03 17:29:41 -08:00
snipe
381526e488
Additional permissions
2017-02-22 22:21:26 -08:00
snipe
863735a6e5
Fix utf encoding on DB
2017-01-26 04:52:38 -08:00
snipe
b462888850
Derp
2017-01-13 21:15:36 -08:00
snipe
d39b7e19eb
Updated debugbar settings
2017-01-13 21:00:02 -08:00
snipe
e54036991c
Updated trusted proxy config for newer version
2017-01-13 20:59:54 -08:00
snipe
8f31ee318e
Removed extra commented out crap
2017-01-11 14:54:50 -08:00
snipe
84154d936a
Added self.api permission
2017-01-11 04:05:39 -08:00
snipe
b4bed2a11f
Move cipher into the .env
2017-01-09 19:41:24 -08:00
snipe
6351746c62
Bumped to v4.0-develop
2016-12-30 16:28:47 -08:00
snipe
55415e8f56
Fix image resizing for later version of Intervention
2016-12-27 17:31:29 -08:00
snipe
2fe984013b
Fixes #3092 - user location not being exported correctly
2016-12-22 15:53:34 -08:00
snipe
84e1b531fd
Bumped hash
2016-12-15 20:53:50 -08:00
snipe
9ea05bacf3
User resource routes
2016-12-15 20:52:39 -08:00
snipe
4751bcd002
Use redirect()->route instead of ->to
2016-12-15 20:02:47 -08:00