lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
17080 commits 1 branch 0 tags 220 MiB
Commit graph

4247 commits

Author SHA1 Message Date
snipe
4afd598df7
Merge pull request #10356 from bestlong/fix_modal_dialog_html_typo 
fix modal-title html tag unpaired.
 2021-11-24 19:39:58 -08:00
Shao Yu-Lung
55d05eeae3 fix modal-title html tag unpaired. 2021-11-24 10:28:10 +08:00
Ivan Nieto Vivanco
d95d3dc282 Add the call to defaultValue() function in custom fields with date format 2021-11-23 17:21:46 -06:00
Ivan Nieto Vivanco
741eb28622 Add the call to defaultValue() function in custom fields with date format 2021-11-23 17:11:21 -06:00
Klaus J. Mueller
a85fa14f9c fix #10344 and #9135 2021-11-22 17:58:26 +01:00
Matthew Nickson
9381ba2404
Merge branch 'develop' into sum_cost_by_quantity 2021-11-21 18:59:34 +00:00
Wächtler, Yannick
1b76185798 Added TODO: comments to pages, where there are non-localized strings, in order to keep track of them 2021-11-19 15:32:13 +01:00
Wächtler, Yannick
9164daf5bc Added localized strings for admin/settings 2021-11-19 15:23:48 +01:00
Wächtler, Yannick
6917d59185 Added localized strings for reports 2021-11-19 12:39:19 +01:00
Wächtler, Yannick
04fec144a0 Added localization strings for partials, added file structure 2021-11-19 12:12:11 +01:00
Nuraeil
7084703b5a
Merge pull request #4 from snipe/develop 
Merge current develop into branch
 2021-11-18 21:30:45 +01:00
Wächtler, Yannick
5a2f8788a9 Fixed merge issue in view.blade.php and added translatable string 2021-11-16 19:34:20 +01:00
Wächtler, Yannick
f2c3e51a83 Catching up to snipe-it/develop branch 2021-11-16 19:25:23 +01:00
Wächtler, Yannick
6feb39f6b9 Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop 2021-11-16 08:50:45 +01:00
snipe
bbb0d1be17 Possible fix for asset model editing when no custom fieldset is associated 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 21:09:35 -08:00
snipe
65d1855b38 Display app_locked message on front-end 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:50:55 -08:00
snipe
f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
 2021-11-15 19:24:38 -08:00
snipe
bc21875324 More refinements to the UI 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 18:15:38 -08:00
snipe
1a703bf78b Added logout clarification 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:59:52 -08:00
snipe
494c72d92b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:58:04 -08:00
snipe
69fe3c0299 Added some comments on the JS 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:57:15 -08:00
snipe
e2702186a9 Slightly reworked UI 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:48:59 -08:00
snipe
b069eec43a Fixed upload disabled button 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 16:01:22 -08:00
snipe
f8cf65bbb3 Small layout fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 13:01:02 -08:00
snipe
ec2a3b0f35 Updated label names 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 01:44:34 -08:00
snipe
230a568145 Added help text and more info in the modal 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 01:44:11 -08:00
snipe
856b9294f8 Improved BS tables on backups 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 00:08:43 -08:00
snipe
8590e5d67e UNRELATED: fixed wrong html tag for license view badge count 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 00:08:15 -08:00
snipe
fb21712a68 Added restore modal HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-09 19:38:40 -08:00
Brady Wetherington
a58c5ce27f Better documentation, disable AdLdap2-based "Add domain" setting 2021-11-08 17:11:47 -08:00
snipe
edf98cb795
Merge pull request #10279 from snipe/fixes/turn_get_into_post_for_custom_field_required 
Turn custom fields required/optional/remove into POST requests
 2021-11-08 14:37:36 -08:00
snipe
38c36af6fc Changes logout to POST 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-08 12:53:11 -08:00
snipe
0d811d067c Turn cusotm fields required/optional/remove into POST requests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-05 10:53:48 -07:00
Wächtler, Yannick
6b2801867d Renamed account/api to account/general to match naming schema, changed the associated account/api trans() to account/general 2021-11-04 20:15:23 +01:00
Wächtler, Yannick
63b30489df Added localized strings for notifications 2021-11-02 15:44:57 +01:00
Wächtler, Yannick
670b70c7e1 Added localized strings for models 2021-11-02 15:34:50 +01:00
Wächtler, Yannick
c0891e6827 Added localized strings for modals 2021-11-02 15:27:13 +01:00
Wächtler, Yannick
30d30490a3 Added localized strings for locations 2021-11-02 15:14:54 +01:00
Wächtler, Yannick
4af6412da6 Added localized strings for licenses 2021-11-02 14:55:49 +01:00
Wächtler, Yannick
4fcd4a930f Added localized strings for layouts 2021-11-02 14:45:58 +01:00
Wächtler, Yannick
8bad9c5140 Added localized strings for kits 2021-11-02 14:25:21 +01:00
Wächtler, Yannick
26e056fb3c Added localized strings for improter, added en structure 2021-11-02 14:09:22 +01:00
Wächtler, Yannick
c16ade2d87 Added localized strings for hardware 2021-11-02 14:02:48 +01:00
Wächtler, Yannick
167bf97d46 Added localized strings for groups 2021-11-02 12:03:41 +01:00
Wächtler, Yannick
e825fa81aa Added localized strings for depreciations 2021-11-02 11:50:56 +01:00
Wächtler, Yannick
a96c53784c Added localized strings for custom_fields 2021-11-02 11:27:53 +01:00
Wächtler, Yannick
c11af0e222 Added missing localized strings for account/accept/index.blade.php and view-assets.blade.php 2021-11-02 10:40:41 +01:00
Wächtler, Yannick
433d6fd3e0 Added localized strings for admin/companies 2021-11-02 10:23:15 +01:00
Wächtler, Yannick
b784e63aa8 Added localized strings for account 2021-11-02 10:13:22 +01:00
Matthew Nickson
90ca66834b
Fixed sumFormatterQuantity if using 1.234,56 fomat 
Previously sumFormatterQuantity used the parseFloat to convert the
string purchase_cost to a floating point number. parseFloat does not
return the correct value when using the comma format. To fix this
sumFormatterQuantity now used the cleanFloat function to convert
purchase_cost to a float.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2021-10-30 22:48:45 +01:00