spencerrlongg
|
0ae297634e
|
ugh
|
2024-07-23 16:59:58 -05:00 |
|
spencerrlongg
|
0f2f559d7a
|
test works, helper still needs work. pushing to check something
|
2024-07-23 16:46:29 -05:00 |
|
snipe
|
57b5b12952
|
Merge pull request #15148 from marcusmoore/fixes/dates-in-user-import
Fixed start_date and end_date in user importer
|
2024-07-23 22:37:19 +01:00 |
|
snipe
|
9baaaae1a3
|
Merge remote-tracking branch 'origin/develop'
|
2024-07-23 22:15:57 +01:00 |
|
snipe
|
1f4118a146
|
Fixed rule
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-23 22:15:37 +01:00 |
|
Marcus Moore
|
f4a3823d88
|
Handle empty strings for dates by converting them to null
|
2024-07-23 13:57:28 -07:00 |
|
snipe
|
b2a69efc9d
|
Merge remote-tracking branch 'origin/develop'
|
2024-07-23 21:42:12 +01:00 |
|
snipe
|
00ebc8b64d
|
Merge pull request #15136 from snipe/fixes/cookie_serialization
Remove cookie serialization
|
2024-07-23 21:41:44 +01:00 |
|
snipe
|
effd273245
|
Merge pull request #14458 from spencerrlongg/bug/sc-24884
Add Form Request and Tests for Update Asset API Method
|
2024-07-23 20:57:47 +01:00 |
|
snipe
|
7858c72b98
|
Fixed string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-23 20:45:12 +01:00 |
|
snipe
|
09e2c0beab
|
Merge pull request #15147 from uberbrady/fix_setup_ssl_check
Fix setup ssl check
|
2024-07-23 20:32:13 +01:00 |
|
spencerrlongg
|
e8864ffb01
|
test added, permission fixed
|
2024-07-23 14:29:17 -05:00 |
|
Brady Wetherington
|
d893de2b7e
|
Merge branch 'develop' into fix_setup_ssl_check
|
2024-07-23 20:24:38 +01:00 |
|
Brady Wetherington
|
7f7cfef81b
|
Mark test as Incomplete, and downgrade error back to debug for tests
|
2024-07-23 20:24:05 +01:00 |
|
spencerrlongg
|
b9fdb5880a
|
quick push
|
2024-07-23 13:48:43 -05:00 |
|
spencerrlongg
|
1139ed676a
|
$id to $asset->id (thanks tests)
|
2024-07-23 13:03:25 -05:00 |
|
Spencer Long
|
64be353156
|
Merge branch 'develop' into bug/sc-24884
|
2024-07-23 12:55:19 -05:00 |
|
Godfrey M
|
750015684d
|
purges user storage files
|
2024-07-23 10:42:50 -07:00 |
|
snipe
|
992d16664d
|
Merge remote-tracking branch 'origin/develop'
|
2024-07-23 18:26:54 +01:00 |
|
snipe
|
900c19b76d
|
Merge pull request #15143 from snipe/fixes/no-NO-language
Switch to nb-NO from no-NO for Norwegian
|
2024-07-23 18:25:27 +01:00 |
|
snipe
|
effd2bce24
|
Fixed test to use nb-NO
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-23 18:22:13 +01:00 |
|
snipe
|
de8816d837
|
Merge pull request #15144 from snipe/localization/updated_strings_2024_07_23
Updated translations
|
2024-07-23 18:17:45 +01:00 |
|
snipe
|
593554daed
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-23 18:14:19 +01:00 |
|
snipe
|
fecd877e8b
|
Migration
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-23 17:35:06 +01:00 |
|
snipe
|
ba6d8ae8c7
|
Switch to nb-NO from no-NO
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-23 17:15:44 +01:00 |
|
snipe
|
175862d3c9
|
Added route param to message
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-23 16:37:01 +01:00 |
|
Brady Wetherington
|
5eea08088d
|
Improve .env file checking to not validate SSL certificates
|
2024-07-23 16:03:02 +01:00 |
|
snipe
|
c752c2a125
|
Make the passport cookie name configurable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-22 14:22:19 +01:00 |
|
snipe
|
4ac4f9b0a9
|
Customize cookie name
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-22 14:17:16 +01:00 |
|
snipe
|
09abcb44bb
|
Remove cookie serialization
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-22 13:49:47 +01:00 |
|
snipe
|
7f566b9152
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2024-07-22 10:56:37 +01:00 |
|
snipe
|
30835fe9ba
|
Merge pull request #15134 from snipe/upgrade_bs_table
[Snyk] Upgrade bootstrap-table from 1.22.5 to 1.23.0 #15131
|
2024-07-22 10:50:53 +01:00 |
|
snipe
|
910e98b573
|
[Snyk] Upgrade bootstrap-table from 1.22.5 to 1.23.0 #15131
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-22 10:45:35 +01:00 |
|
snipe
|
4623e40077
|
Merge pull request #15133 from snipe/fixes/load_english_separately_for_table_locale
Load the english file again in case BS table doesn’t have a translation
|
2024-07-22 10:40:01 +01:00 |
|
snipe
|
20868b9ede
|
Load the english file again in case BS table doesn’t have a translation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-22 10:30:42 +01:00 |
|
snipe
|
efc84efabf
|
Merge pull request #15132 from snipe/fixes/disable_remote_login_force_via_env
Hides the “Disable Other Login Mechanisms” option via env
|
2024-07-22 10:20:34 +01:00 |
|
snipe
|
7c7fa96334
|
Pulled from the app.php as well
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-22 10:19:55 +01:00 |
|
snipe
|
e08acb851c
|
Removed env part, just check for the remote user login
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-22 10:18:33 +01:00 |
|
snipe
|
bbad84c6cc
|
Hides the “Disable Other Login Mechanisms” option via env
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-22 10:13:59 +01:00 |
|
snipe
|
f2acb98afa
|
Merge pull request #15128 from snipe/fixes/nicer_consumables_layout
Nicer consumables layout
|
2024-07-20 17:01:15 +01:00 |
|
snipe
|
38affea3f3
|
More updates
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:57:10 +01:00 |
|
snipe
|
cea31c5b11
|
Added more generic buttons with variables
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:53:01 +01:00 |
|
snipe
|
254e2f120b
|
Added clone to consumables
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:40:32 +01:00 |
|
snipe
|
2bfee0c29a
|
Few more tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:21:11 +01:00 |
|
snipe
|
c08bd8f88b
|
Nicer consumables layout
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:11:45 +01:00 |
|
snipe
|
9818c2f033
|
Merge remote-tracking branch 'origin/develop'
|
2024-07-20 08:08:51 +01:00 |
|
snipe
|
f63fd25ce0
|
Fixed default
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 08:08:29 +01:00 |
|
snipe
|
57ecdd6765
|
Merge remote-tracking branch 'origin/develop'
|
2024-07-20 07:43:37 +01:00 |
|
snipe
|
9d890b35c6
|
Merge pull request #15127 from snipe/fixes/small_default_avatar_tweaks
Fixes #15076 - Removes ability to remove the default avatar from disk
|
2024-07-20 07:42:39 +01:00 |
|
snipe
|
8fc5c0b5be
|
Use other default avatar, not in the avatars directory
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 07:34:40 +01:00 |
|