Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert 466 dependabot/bundler/sidekiq unique jobs 7.1.33 #474

Merged
merged 23 commits into from
Feb 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b75751c
Merge branch 'dev' for release 6.3.4
nflorentin Nov 23, 2023
180410c
Merge branch 'dev' for release 6.3.5
gnepud Dec 4, 2023
cb36494
Merge branch 'dev' for release 6.3.6
nflorentin Dec 6, 2023
ebd2a54
Merge branch 'dev' for release 6.3.6
nflorentin Dec 6, 2023
d9e4568
(bug) unable to show wallet payment mean for invoice
gnepud Dec 11, 2023
11205bb
update Gemfile
gnepud Dec 11, 2023
c75fa4b
(quality) Cleanup unused feature
Dec 15, 2023
1331190
update changelog
gnepud Dec 15, 2023
5a88ff5
(feat) show invoice payment method in accounting line
gnepud Dec 21, 2023
04c5dc5
(bug) PayZen amount of subscription compute error for Coupon validity…
gnepud Dec 28, 2023
be034c1
(bug) unable to create Stripe coupon with duration = forever
gnepud Dec 28, 2023
dac874d
(i18n) updated translations
gnepud Dec 28, 2023
4fcdd51
update Changelog
gnepud Dec 28, 2023
32c5b01
Version 6.3.7
gnepud Dec 28, 2023
c2c71b2
Merge branch 'dev' for release 6.3.8
gnepud Dec 29, 2023
c770ab3
Merge branch 'dev' for release 6.3.9
gnepud Jan 8, 2024
9e5740b
Merge branch 'dev' for release 6.3.10
gnepud Jan 19, 2024
5da7f82
Merge branch 'dev' for release 6.3.11
gnepud Feb 2, 2024
f5d8278
Merge branch 'dev' for release 6.3.11
gnepud Feb 2, 2024
154aa97
Merge branch 'dev' for release 6.3.12
gnepud Feb 12, 2024
48604b3
Merge branch 'dev' for release 6.3.13
gnepud Feb 19, 2024
a523b56
Bump sidekiq-unique-jobs from 7.1.23 to 7.1.33 (#466)
dependabot[bot] Feb 23, 2024
cde1bcb
Revert "Bump sidekiq-unique-jobs from 7.1.23 to 7.1.33 (#466)"
gnepud Feb 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
(quality) Cleanup unused feature
Vincent authored and gnepud committed Dec 28, 2023
commit c75fa4b954e8af0b7dbef3b2eafd44283486718f
3 changes: 0 additions & 3 deletions app/frontend/src/javascript/controllers/admin/members.js
Original file line number Diff line number Diff line change
@@ -165,9 +165,6 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',

if ($scope.enableUserValidationRequired) { $scope.member.memberFilters.push('not_validated'); }

// should we display the username in the list?
$scope.displayUsername = (settingsPromise.show_username_in_admin_list === 'true');

// Admins ordering/sorting. Default: not sorted
$scope.orderAdmin = null;

3 changes: 1 addition & 2 deletions app/frontend/src/javascript/models/setting.ts
Original file line number Diff line number Diff line change
@@ -219,8 +219,7 @@ export const registrationSettings = [
] as const;

export const adminSettings = [
'feature_tour_display',
'show_username_in_admin_list'
'feature_tour_display'
] as const;

export const pricingSettings = [
4 changes: 2 additions & 2 deletions app/frontend/src/javascript/router.js
Original file line number Diff line number Diff line change
@@ -1037,7 +1037,7 @@ angular.module('application.router', ['ui.router'])
groupsPromise: ['Group', function (Group) { return Group.query().$promise; }],
tagsPromise: ['Tag', function (Tag) { return Tag.query().$promise; }],
authProvidersPromise: ['AuthProvider', function (AuthProvider) { return AuthProvider.query().$promise; }],
settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['feature_tour_display', 'user_validation_required', 'show_username_in_admin_list']" }).$promise; }]
settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['feature_tour_display', 'user_validation_required']" }).$promise; }]
}
})
.state('app.admin.members_new', {
@@ -1198,7 +1198,7 @@ angular.module('application.router', ['ui.router'])
"'link_name', 'home_content', 'home_css', 'phone_required', 'upcoming_events_shown', 'public_agenda_module'," +
"'renew_pack_threshold', 'pack_only_for_subscription', 'overlapping_categories', 'public_registrations'," +
"'extended_prices_in_same_day', 'recaptcha_site_key', 'recaptcha_secret_key', 'user_validation_required', " +
"'user_validation_required_list', 'machines_module', 'user_change_group', 'show_username_in_admin_list', " +
"'user_validation_required_list', 'machines_module', 'user_change_group', " +
"'store_module', 'machine_reservation_deadline', 'training_reservation_deadline', 'event_reservation_deadline', " +
"'space_reservation_deadline', 'reservation_context_feature']"
}).$promise;
22 changes: 0 additions & 22 deletions app/frontend/templates/admin/settings/compte.html
Original file line number Diff line number Diff line change
@@ -105,28 +105,6 @@ <h3 class="m-l" translate>{{ 'app.admin.settings.captcha' }}</h3>
</div>
</div>

<div class="panel panel-default m-t-md">
<div class="panel-heading">
<span class="font-sbold" translate>{{ 'app.admin.settings.accounts_management' }}</span>
</div>
<div class="panel-body">
<div class="row">
<h3 class="m-l" translate>{{ 'app.admin.settings.members_list' }}</h3>
<p class="alert alert-warning m-h-md" translate>
{{ 'app.admin.settings.members_list_info' }}
</p>
<div class="col-md-10 col-md-offset-1">
<boolean-setting name="'show_username_in_admin_list'"
settings="allSettings"
label="'app.admin.settings.show_username_in_admin_list' | translate"
on-success="onSuccess"
on-error="onError">
</boolean-setting>
</div>
</div>
</div>
</div>

<div class="panel panel-default m-t-md">
<div class="panel-heading">
<span class="font-sbold" translate>{{ 'app.admin.settings.account.customize_account_settings' }}</span>
1 change: 0 additions & 1 deletion app/helpers/settings_helper.rb
Original file line number Diff line number Diff line change
@@ -166,7 +166,6 @@ module SettingsHelper
user_change_group
user_validation_required
user_validation_required_list
show_username_in_admin_list
family_account
child_validation_required
store_module
1 change: 0 additions & 1 deletion config/locales/app.admin.en.yml
Original file line number Diff line number Diff line change
@@ -1859,7 +1859,6 @@ en:
extended_prices_info_html: "Spaces can have different prices depending on the cumulated duration of the booking. You can choose if this apply to all bookings or only to those starting within the same day."
extended_prices_in_same_day: "Extended prices in the same day"
public_registrations: "Public registrations"
show_username_in_admin_list: "Show the username in the list"
projects_list_member_filter_presence: "Presence of member filter on projects list"
projects_list_date_filters_presence: "Presence of date filters on projects list"
project_categories_filter_placeholder: "Placeholder for categories filter in project gallery"
1 change: 0 additions & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
@@ -721,7 +721,6 @@ en:
flickr: "flickr"
machines_module: "Machines module"
user_change_group: "Allow users to change their group"
show_username_in_admin_list: "Show the username in the admin's members list"
store_module: "Store module"
store_withdrawal_instructions: "Withdrawal instructions"
store_hidden: "Store hidden to the public"
2 changes: 0 additions & 2 deletions db/seeds/settings.rb
Original file line number Diff line number Diff line change
@@ -686,8 +686,6 @@

Setting.set('extended_prices_in_same_day', false) unless Setting.find_by(name: 'extended_prices_in_same_day').try(:value)

Setting.set('show_username_in_admin_list', false) unless Setting.find_by(name: 'show_username_in_admin_list').try(:value)

Setting.set('store_module', false) unless Setting.find_by(name: 'store_module').try(:value)

Setting.set('store_hidden', true) unless Setting.find_by(name: 'store_hidden').try(:value)
6 changes: 0 additions & 6 deletions test/frontend/__fixtures__/settings.ts
Original file line number Diff line number Diff line change
@@ -508,12 +508,6 @@ export const settings: Array<Setting> = [
last_update: '2022-11-28T16:01:00+0200',
localized: 'Adresse requise'
},
{
name: 'show_username_in_admin_list',
value: 'false',
last_update: '2022-11-21T15:20:03+0100',
localized: "Afficher le nom d'utilisateur dans la liste des membres de l'administrateur"
},
{
name: 'store_module',
value: 'true',