Skip to content

conflict resolved with development #2715

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.

Sign up for GitHub

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

Closed
iamibrahimriaz wants to merge 23 commits into from
Closed

conflict resolved with development #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7368684
fix: prevent Section Name input from losing focus on every keystroke
RabbiIslamRony Feb 10, 2026
91cab8f
Fix unlimited expiration emails bug
Armanul46 Feb 15, 2026
c4c3ff7
parsed enquiry submission time to UTC
devShamim Feb 15, 2026
ac0ace2
parsed enquiry submission time to UTC
devShamim Feb 16, 2026
de82499
updated package.json
devShamim Feb 16, 2026
ef02f96
Move deleted listing to trash from user dashboard
Armanul46 Feb 16, 2026
7b36324
Add expiration date and never expires option to listings bulk edit
Armanul46 Feb 16, 2026
093fc4e
Add 11 missing Font Awesome 5 regular SVG icons
RabbiIslamRony Feb 17, 2026
d42a5a5
fixed security issue
Armanul46 Feb 18, 2026
72ab6f0
fixed security issue in guest user submission
Armanul46 Feb 18, 2026
54b41f7
Merge pull request #2698 from RabbiIslamRony/fix/section-name-input-f…
Armanul46 Feb 22, 2026
3fcf161
Merge pull request #2700 from sovware/fixed/email-loop
Armanul46 Feb 22, 2026
443bf47
Merge pull request #2703 from Armanul46/improve/delete-listing
Armanul46 Feb 22, 2026
703138a
resolved git conflicts
devShamim Feb 22, 2026
d65bd75
Merge pull request #2701 from devShamim/fix/enquiry-time
Armanul46 Feb 22, 2026
ed45e4c
Merge pull request #2708 from RabbiIslamRony/fix/missing-fa-regular-s…
Armanul46 Feb 22, 2026
9179486
Merge pull request #2705 from Armanul46/improve/bulk-edit
Armanul46 Feb 22, 2026
8fde497
Merge pull request #2710 from Armanul46/fixed/broken-access
Armanul46 Feb 22, 2026
c477492
fix: resolve text alignment issues on single listing page
RabbiIslamRony Feb 22, 2026
379211a
conflict fixed
RabbiIslamRony Feb 22, 2026
70b00db
Merge pull request #2713 from RabbiIslamRony/single-listing-text-alig…
Armanul46 Feb 22, 2026
5358ba3
Merged with development
iamibrahimriaz Feb 23, 2026
2a7cd43
Merge branch 'conditional-field' into conditional-field-on-directory-…
RabbiIslamRony Feb 23, 2026
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
67,778 changes: 24,739 additions & 43,039 deletions assets/css/admin-main.css
View file
Open in desktop

Large diffs are not rendered by default.

67,780 changes: 24,743 additions & 43,037 deletions assets/css/admin-main.rtl.css
View file
Open in desktop

Large diffs are not rendered by default.

42,665 changes: 23,125 additions & 19,540 deletions assets/css/all-listings.css
View file
Open in desktop

Large diffs are not rendered by default.

27,399 changes: 27,397 additions & 2 deletions assets/css/all-listings.min.css
View file
Open in desktop

Large diffs are not rendered by default.

42,664 changes: 23,126 additions & 19,538 deletions assets/css/all-listings.rtl.css
View file
Open in desktop

Large diffs are not rendered by default.

27,399 changes: 27,397 additions & 2 deletions assets/css/all-listings.rtl.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2,974 changes: 1,518 additions & 1,456 deletions assets/css/formgent-integration.css
View file
Open in desktop

Large diffs are not rendered by default.

2,972 changes: 1,518 additions & 1,454 deletions assets/css/formgent-integration.rtl.css
View file
Open in desktop

Large diffs are not rendered by default.

42,665 changes: 23,125 additions & 19,540 deletions assets/css/public-main.css
View file
Open in desktop

Large diffs are not rendered by default.

27,399 changes: 27,397 additions & 2 deletions assets/css/public-main.min.css
View file
Open in desktop

Large diffs are not rendered by default.

42,664 changes: 23,126 additions & 19,538 deletions assets/css/public-main.rtl.css
View file
Open in desktop

Large diffs are not rendered by default.

27,399 changes: 27,397 additions & 2 deletions assets/css/public-main.rtl.min.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/arrow-alt-circle-down.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/arrow-alt-circle-left.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/arrow-alt-circle-right.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/arrow-alt-circle-up.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/calendar-alt.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/comment-alt.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/file-alt.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/grin-alt.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/list-alt.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/money-bill-alt.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/font-awesome/svgs/regular/trash-alt.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5,208 changes: 5,207 additions & 1 deletion assets/js/add-listing.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading