gregoirenovel
|
e5869f2bec
|
Remove delayed_job_web version lock
Now that the security patches have been patched
|
2018-06-01 10:42:40 +02:00 |
|
gregoirenovel
|
661010100d
|
[Fix #1536] Remove stringupcasepatch
|
2018-05-31 11:49:25 +02:00 |
|
Frederic Merizen
|
fd168c4a72
|
[Fix #1972] Make devise mails async
|
2018-05-28 12:02:13 +02:00 |
|
gregoirenovel
|
a8ac59dd4c
|
Remove constraint on rails
|
2018-05-24 18:17:34 +02:00 |
|
gregoirenovel
|
5a880b5663
|
Remove constraint on uglifier
|
2018-05-24 18:17:34 +02:00 |
|
gregoirenovel
|
cf0eec6cd6
|
Remove the fixed version for guard-livereload
|
2018-05-24 18:17:34 +02:00 |
|
Paul Chavard
|
a8e7038ab5
|
Add aasm
|
2018-05-17 14:46:48 +02:00 |
|
Paul Chavard
|
27292f7b77
|
Update flipflop to latests released version
|
2018-04-26 09:48:58 +02:00 |
|
Paul Chavard
|
482b306920
|
Show enabled features for admins in manager
|
2018-04-25 15:42:45 +02:00 |
|
gregoirenovel
|
049a2d88b9
|
Bump rails to 5.2 final
|
2018-04-24 16:07:19 +02:00 |
|
Paul Chavard
|
49d9833473
|
add flipflop gem
|
2018-04-18 16:51:21 +02:00 |
|
Paul Chavard
|
cee6101008
|
Fix chromedriver on CI
|
2018-04-18 15:34:42 +02:00 |
|
Paul Chavard
|
714ebda2fe
|
Add SignatureService
|
2018-04-04 18:44:08 +02:00 |
|
Paul Chavard
|
f35aef0eb6
|
Use Typhoeus and set agressive timeouts
|
2018-03-26 16:53:42 +02:00 |
|
gregoirenovel
|
97a2c9321f
|
Unlock ffi now that a bug has been resolved
|
2018-03-14 17:46:22 +01:00 |
|
Mathieu Magnin
|
25c5873a86
|
Go back to official smartlisting gem
|
2018-03-14 17:06:29 +01:00 |
|
Frederic Merizen
|
c23419359b
|
Fix XSS in delayed job web admin
https://github.com/ejschmitt/delayed_job_web/issues/101
|
2018-03-07 17:04:47 +01:00 |
|
simon lehericey
|
b59e23a619
|
Gemfile: Add chromedriver-helper
|
2018-02-27 10:14:55 +01:00 |
|
gregoirenovel
|
a6c321e428
|
Remove an unused gem
|
2018-02-23 16:45:38 +01:00 |
|
Paul Chavard
|
c876d5e5a2
|
Lock ffi version to fix builds on Mac
|
2018-02-22 15:50:35 +01:00 |
|
gregoirenovel
|
29d9b03672
|
Bump rails to 5.2.0.rc1
|
2018-02-07 16:18:42 +01:00 |
|
gregoirenovel
|
7d6b5f8426
|
Revert "Point to a forked devise to fix build errors"
This reverts commit 1b58bfad3e.
|
2018-02-01 17:08:17 +01:00 |
|
gregoirenovel
|
1b58bfad3e
|
Point to a forked devise to fix build errors
|
2018-01-31 12:18:24 +01:00 |
|
Frederic Merizen
|
0ce26055d8
|
[#1374] Revert "Merge pull request #1373 from betagouv/fix_pagination"
This reverts commit 5a56fe0182, reversing
changes made to 31aabcd6b6.
|
2018-01-30 15:04:21 +01:00 |
|
Paul Chavard
|
fdd6cedeb8
|
Remove data_provide and data_date_format attributes
|
2018-01-30 13:49:16 +01:00 |
|
Mathieu Magnin
|
da784aa8e9
|
[Fix #1370] downgrade spreadsheet architecture to support date in ODS
|
2018-01-29 18:14:57 +01:00 |
|
simon lehericey
|
691b12688d
|
Revert "[#1360] Upgrade SmartListing to fork of 1.2.1"
This reverts commit 506a505477.
|
2018-01-29 17:43:30 +01:00 |
|
Frederic Merizen
|
506a505477
|
[#1360] Upgrade SmartListing to fork of 1.2.1
|
2018-01-25 17:47:10 +01:00 |
|
gregoirenovel
|
a2f4e8b283
|
factory_girl is now factory_bot
|
2018-01-23 17:15:42 +01:00 |
|
gregoirenovel
|
2761f8ac86
|
Bump rspec-rails
|
2018-01-23 16:26:56 +01:00 |
|
gregoirenovel
|
5340b4ed0d
|
Bump turbolinks
|
2018-01-23 16:26:56 +01:00 |
|
gregoirenovel
|
12b6d30326
|
Bump sass-rails
|
2018-01-23 16:26:56 +01:00 |
|
gregoirenovel
|
89a39e2964
|
Bump rails
|
2018-01-23 16:26:56 +01:00 |
|
gregoirenovel
|
3f1af527cc
|
Bump prawn_rails
|
2018-01-23 16:26:56 +01:00 |
|
gregoirenovel
|
3d20b24baf
|
Bump prawn
|
2018-01-23 16:26:56 +01:00 |
|
gregoirenovel
|
571612f922
|
Bump draper
|
2018-01-23 16:26:56 +01:00 |
|
gregoirenovel
|
4c87b62565
|
Bump deep_cloneable
|
2018-01-23 16:26:56 +01:00 |
|
Mathieu Magnin
|
469aca999b
|
Revert "Remove data_provide and data_date_format attributes"
This reverts commit 273b3f2faf.
|
2018-01-19 13:20:53 +01:00 |
|
Paul Chavard
|
273b3f2faf
|
Remove data_provide and data_date_format attributes
|
2018-01-18 15:13:48 +01:00 |
|
gregoirenovel
|
b51cef6cee
|
Use an unreleased warden to avoid a devise error
The fix to the following issue
https://github.com/hassox/warden/issues/147
has yet to be integrated into an official release
|
2018-01-18 10:47:11 +01:00 |
|
Paul Chavard
|
6a43248cb3
|
Fix CSS injection
|
2018-01-16 14:02:10 +01:00 |
|
Paul Chavard
|
a6cdf714a6
|
Use capybara-selenium with headless chrome
|
2018-01-16 14:02:10 +01:00 |
|
Mathieu Magnin
|
b2b26b73ab
|
[Fix #1098] Add administrate gem
|
2018-01-10 13:44:00 +01:00 |
|
Mathieu Magnin
|
62d8381ef7
|
Remove will paginate
|
2018-01-03 14:35:48 +01:00 |
|
Frederic Merizen
|
6d223aee06
|
Make Rubocop check for focused specs
|
2017-12-22 17:05:57 +01:00 |
|
Mathieu Magnin
|
46b14e97ed
|
[Fix #1096] Add omniauth gem to connect with Github
|
2017-12-22 11:10:24 +01:00 |
|
Mathieu Magnin
|
40227b9f5a
|
Add workflows
|
2017-12-15 17:38:38 +01:00 |
|
gregoirenovel
|
2e5a0f5026
|
Remove the newrelic gem and configuration
|
2017-12-04 10:33:41 +01:00 |
|
Mathieu Magnin
|
ff44fbe523
|
Add carrierwave i18n gem
|
2017-11-28 15:07:09 +01:00 |
|
gregoirenovel
|
84ba3f7ac0
|
Add the skylight gem
|
2017-11-16 17:52:02 +01:00 |
|
gregoirenovel
|
b2f63f7f38
|
Delete redis and actioncable
|
2017-10-12 07:21:02 +02:00 |
|
Mathieu Magnin
|
7b20395b63
|
Remove sidekiq traces
|
2017-09-27 16:47:32 +02:00 |
|
Mathieu Magnin
|
b9869d861f
|
Add and install delayed_job_web gem
|
2017-09-27 16:47:32 +02:00 |
|
Mathieu Magnin
|
68506fe2c7
|
Add and install daemons gem
|
2017-09-27 16:47:32 +02:00 |
|
Mathieu Magnin
|
8965c668d9
|
Add and install delayed_cron_job gem
|
2017-09-27 16:47:32 +02:00 |
|
Mathieu Magnin
|
608419701e
|
Add and install delayed_job gem
|
2017-09-27 16:47:32 +02:00 |
|
Mathieu Magnin
|
47db8f9c7d
|
Add Kaminari gem for pagination
|
2017-09-22 10:19:25 +02:00 |
|
Simon Lehericey
|
0a1edce5e0
|
Add rack_mini_profiler
|
2017-07-25 14:35:54 +02:00 |
|
gregoirenovel
|
a11e2a7180
|
Add brakeman to the gemfile
|
2017-07-20 18:28:20 +02:00 |
|
Simon Lehericey
|
9d48249660
|
Attestation: uninterlaced png file to be compatible with Prawn
|
2017-07-10 10:52:27 +02:00 |
|
Simon Lehericey
|
e60ce35ae8
|
[Fix #196] Attestation: join the attestation to the closed mail
Add a upper limit to the attachment size as it could be a problem with Mailjet and receiver
(https://www.mailjet.com/support/what-is-the-size-limit-for-attachments-files-sent-via-mailjet,289.htm)
If the attestation cannot be sent, it is logged in sentry
|
2017-06-16 12:11:10 +02:00 |
|
Simon Lehericey
|
d7ff3d6139
|
[Fix #196] AttestationTemplate: add model
|
2017-06-16 11:35:13 +02:00 |
|
Simon Lehericey
|
5855c2552a
|
[Fix #196] Config: install prawn
|
2017-06-14 11:43:19 +02:00 |
|
gregoirenovel
|
6f884e9740
|
Add the rubocop gem
|
2017-06-13 11:29:02 +02:00 |
|
gregoirenovel
|
250c47e145
|
[Fix #126] Remove the now useless as_csv gem
|
2017-05-04 17:01:24 +02:00 |
|
gregoirenovel
|
5937e2a35f
|
Add the scss_lint gem
|
2017-04-20 10:35:54 +02:00 |
|
gregoirenovel
|
c54f95ecbb
|
Add haml-lint to the Gemfile
|
2017-04-10 17:55:55 +02:00 |
|
gregoirenovel
|
beea66ad30
|
Remove the sqlite3 gem
We now run tests with PostgreSQL
|
2017-04-10 17:54:29 +02:00 |
|
gregoirenovel
|
074c6fe72b
|
Use scenic in all environments
|
2017-04-10 16:17:33 +02:00 |
|
Mathieu Magnin
|
08442e64a3
|
Update turbolinks
|
2017-04-03 15:43:41 +02:00 |
|
Mathieu Magnin
|
6a8ca67a83
|
Merge branch 'develop' into auto_archive_on_date
|
2017-03-27 15:35:52 +02:00 |
|
gregoirenovel
|
5910d28a02
|
Revert "Remove therubyracer gem (unused)"
This reverts commit acc5fff05d.
|
2017-03-22 14:37:14 +01:00 |
|
Mathieu Magnin
|
c2a27c6f6a
|
Merge branch 'develop' into auto_archive_on_date
|
2017-03-22 11:32:56 +01:00 |
|
gregoirenovel
|
9c91cbe78d
|
Group the scenic gem declaration
|
2017-03-22 11:07:49 +01:00 |
|
gregoirenovel
|
ed11b66778
|
Remove brakeman for now
|
2017-03-22 11:07:48 +01:00 |
|
gregoirenovel
|
f393b96dea
|
Remove rubocop for now
|
2017-03-22 11:07:48 +01:00 |
|
gregoirenovel
|
d41dabe00a
|
Remove the simplecov gem (unused)
|
2017-03-22 11:07:47 +01:00 |
|
gregoirenovel
|
6404c7a422
|
Remove the selenium-webdriver gem (unused)
|
2017-03-22 11:07:47 +01:00 |
|
gregoirenovel
|
3eef853d59
|
Use single-quotes everywhere in the Gemfile
|
2017-03-21 19:07:42 +01:00 |
|
gregoirenovel
|
4dc4f669e8
|
Improve the Gemfile comments’ formatting
|
2017-03-21 19:07:41 +01:00 |
|
gregoirenovel
|
4675a84f9e
|
Add spacing in the Gemfile
|
2017-03-21 19:07:41 +01:00 |
|
gregoirenovel
|
4c3e5a6fad
|
Remove the jbuilder gem (unused)
|
2017-03-21 19:07:41 +01:00 |
|
gregoirenovel
|
acc5fff05d
|
Remove therubyracer gem (unused)
|
2017-03-21 19:07:41 +01:00 |
|
gregoirenovel
|
ff1709468a
|
Move dotenv-rails directly into the dev/test Gemfile group
|
2017-03-21 19:07:40 +01:00 |
|
gregoirenovel
|
abfb6772cf
|
Remove commented instructions in the Gemfile
|
2017-03-21 19:07:40 +01:00 |
|
gregoirenovel
|
0483fe028f
|
Remove the parallel_test gem
|
2017-03-21 19:07:40 +01:00 |
|
gregoirenovel
|
f1b1f5102e
|
Remove the railroady gem (unused)
|
2017-03-21 19:07:40 +01:00 |
|
Simon Lehericey
|
1fa1e9e8e8
|
select_multiple: add select2
|
2017-03-15 17:51:34 +01:00 |
|
Mathieu Magnin
|
6f9edbd36c
|
Fix routes.rb require order
|
2017-03-15 15:09:43 +01:00 |
|
Mathieu Magnin
|
24d17dc0f3
|
Sidekiq worker to archive procedures automatically + tests
|
2017-03-15 12:40:59 +01:00 |
|
Mathieu Magnin
|
e501c2f23b
|
Merge pull request #37 from sgmap/add_new_relic
Add new relic
|
2017-03-09 18:15:23 +01:00 |
|
Mathieu Magnin
|
19e3d336e9
|
Using dotenv for local env variables
|
2017-03-09 17:38:20 +01:00 |
|
Mathieu Magnin
|
53b8c4aaa4
|
Add new relic
|
2017-03-07 11:34:25 +01:00 |
|
Simon Lehericey
|
6be76095c6
|
Conf: reactivate spring and guard
|
2017-03-05 22:17:17 +01:00 |
|
Simon Lehericey
|
8bccf375e1
|
Tests: adapt migration to sqlite
Add sqlite
Remove scenic from tests
|
2017-02-28 17:01:58 +01:00 |
|
Mathieu Magnin
|
8a3df4979b
|
remove byebug and guard until it works
|
2017-02-14 12:05:08 +01:00 |
|
Mathieu Magnin
|
308a037f19
|
Add clickable links in champ description and use bootstrap layout for forms
|
2017-02-14 11:13:48 +01:00 |
|
Mathieu Magnin
|
2bc5ee88f7
|
Change controller name according to model name, add simple_form
|
2017-01-24 15:53:42 +01:00 |
|
Mathieu Magnin
|
d5e4f45d7d
|
Add xray-rails in dev mode
|
2017-01-18 13:59:14 +01:00 |
|
Xavier J
|
f98bb90f08
|
Bootstrap Action Cable and Unicorn
|
2016-12-22 21:49:31 +01:00 |
|
Xavier J
|
2fccbbf4f0
|
Delete un-use code
|
2016-12-19 15:08:00 +01:00 |
|
Xavier J
|
cd5803e981
|
Update api-pie gem
|
2016-12-15 11:15:53 +01:00 |
|
Xavier J
|
28c6a33df3
|
Update Webconsole Gem
|
2016-12-15 11:13:23 +01:00 |
|
JC
|
22a59123c1
|
Adding launchy to put save_and_open_page in capybara specs, fixing many red tests by removing/changing expectations according to new UI. Need to pursue on spec/features/backoffice/flux_de_commentaires_spec.rb (not priority), and spec/controllers/root_controller_spec.rb (unkonw)
|
2016-12-13 16:11:11 +01:00 |
|
JC
|
4a5c053ae5
|
Continue on dossier#show
|
2016-11-28 18:34:31 +01:00 |
|
Xavier J
|
d09a47ae23
|
First iteration navbar tableau de bord
|
2016-11-23 15:21:42 +01:00 |
|
Xavier J
|
647eaa4ba8
|
Merge branch 'develop' into develop_v2
# Conflicts:
# Gemfile.lock
# db/schema.rb
|
2016-11-17 16:55:41 +01:00 |
|
JC
|
23b928f160
|
Adding limit (200) for dossier exportation
|
2016-11-15 17:06:40 +01:00 |
|
Xavier J
|
6a261d125a
|
New color for navbar
|
2016-11-15 14:10:43 +01:00 |
|
Xavier J
|
1420c8425e
|
Fix mina version
|
2016-11-15 11:45:21 +01:00 |
|
Xavier J
|
b3b03a2449
|
Fix features tests
|
2016-11-15 11:01:58 +01:00 |
|
JC
|
0ac3c5fc86
|
Merging develop branch updated
|
2016-11-15 10:46:33 +01:00 |
|
Xavier J
|
5750eb1aa5
|
Fix major DEPRECATION WARNING for spec/controllers/admin/*.rb
|
2016-11-15 05:19:30 +01:00 |
|
Xavier J
|
d7fdf22abb
|
First fixed
|
2016-11-14 17:33:45 +01:00 |
|
XjulI1
|
9b9e2be8d8
|
Merge pull request #4 from sgmap/postgresql-full-text-search-2
PostgreSQL full text search
|
2016-11-08 15:17:57 +01:00 |
|
JC
|
8fe92b1465
|
Hack rubyzip version from Gemfile.lock, then install spreadsheet_architect
|
2016-11-07 14:07:34 +01:00 |
|
Xavier J
|
2f68d540e3
|
Migrate to ruby 2.3.1
|
2016-11-07 11:23:21 +01:00 |
|
Julien Portalier
|
31272cf0f5
|
Fix: rebased off the develop branch (not master)
Remove textacular gem, drop `db/structure.sql` (no special indices)
and regenerates `db/schema.rb`
|
2016-11-04 17:14:09 +01:00 |
|
Julien Portalier
|
0ea69cfc3e
|
PostgreSQL full text search [WIP]
|
2016-11-04 15:34:21 +01:00 |
|
Xavier J
|
1f1b235283
|
Fix bug Chrome datepicker
|
2016-09-22 11:31:24 +02:00 |
|
Xavier J
|
cd4848a916
|
Update Gems Devise and Uglifier for security alert
|
2016-09-14 18:34:19 +02:00 |
|
Xavier J
|
f07606a373
|
IE 9 alert
|
2016-08-30 11:42:33 +02:00 |
|
Xavier J
|
b661a2eb38
|
Updated test for new user status UI
|
2016-08-22 16:10:48 +02:00 |
|
Guillaume Lazzara
|
6cf6832c01
|
Migrate to Rails 4.2.7.1
|
2016-08-18 16:06:38 +02:00 |
|
Xavier J
|
c06dc48883
|
Disable terminal notifier guard
|
2016-07-26 15:36:28 +02:00 |
|
Guillaume Lazzara
|
5324484f3f
|
Add task for cloud storage migration
|
2016-07-01 14:45:50 +02:00 |
|
Guillaume Lazzara
|
7af7859334
|
Implement procedure cloning
|
2016-06-15 11:34:05 +02:00 |
|
Guillaume Lazzara
|
833d7790c2
|
Add support for remote OVH cloud storage
|
2016-05-13 16:08:51 +02:00 |
|
Xavier J
|
1a3c19f48c
|
First test
|
2016-04-14 16:50:13 +02:00 |
|
Guillaume Lazzara
|
f4d3038f56
|
Add brakeman in gemfile
|
2016-03-24 16:44:33 +01:00 |
|
Guillaume Lazzara
|
7a82c4b25f
|
Update rails to 4.2.5.2
|
2016-03-03 18:31:14 +01:00 |
|
Xavier J
|
9c1268fdd5
|
Add statistiques API for dashboard
|
2016-02-29 15:15:44 +01:00 |
|
Xavier J
|
2a6da54320
|
add gem api-pie
Error : stack level too deep
|
2016-02-22 19:42:47 +01:00 |
|
Xavier J
|
913905001e
|
Revert swagger docs
|
2016-02-22 17:53:00 +01:00 |
|
Guillaume Lazzara
|
bd5a39ff17
|
Add CSV output for Dossier API
|
2016-02-19 16:59:39 +01:00 |
|
Xavier J
|
c3410c104b
|
Swagger docs
|
2016-02-18 18:02:07 +01:00 |
|
Xavier J
|
20a41ef172
|
Use gem bootstrap-wysihtml5 on textarea
|
2016-02-18 11:56:54 +01:00 |
|
Xavier J
|
61ee40aa76
|
test 1
|
2016-02-12 13:49:32 +01:00 |
|
Xavier J
|
5bb98a2863
|
Activation : reset user password
|
2016-02-08 19:32:18 +01:00 |
|
Xavier J
|
1e784075a9
|
Revert "Set specific version for gems in gemfile."
This reverts commit 2ca23ea8e0.
|
2016-02-04 14:04:14 +01:00 |
|
Guillaume Lazzara
|
2ca23ea8e0
|
Set specific version for gems in gemfile.
|
2016-02-02 18:41:03 +01:00 |
|
Xavier J
|
30438df244
|
Add swagger-docs gem to generate ison swagger files
|
2016-02-02 18:11:44 +01:00 |
|
Xavier J
|
47932890cc
|
Add sort list on demo page
|
2016-01-07 11:41:03 +01:00 |
|
Xavier J
|
3c18882407
|
Create facade for dossier into user and gestionnaire views
|
2015-12-24 15:10:20 +01:00 |
|
Tanguy PATTE
|
3ea381413f
|
Merge branch 'develop' of github.com:sgmap/tps into develop
|
2015-12-21 17:52:00 +01:00 |
|
Tanguy PATTE
|
ab30891cae
|
add active_model_serializers gem
|
2015-12-21 17:50:16 +01:00 |
|
Xavier J
|
506ce2dee4
|
add parallels tests
|
2015-12-21 10:45:50 +01:00 |
|
Xavier J
|
a65f271a60
|
Add mailer Welcome
|
2015-12-14 16:09:20 +01:00 |
|
Xavier J
|
527026a6b7
|
add therubyracer gem
|
2015-12-10 11:57:32 +01:00 |
|
Xavier J
|
2eb01bdf42
|
Add paginate for user dossiers
|
2015-11-26 12:29:34 +01:00 |
|
Tanguy PATTE
|
bcf712828e
|
add guard livereload
|
2015-11-20 13:54:56 +01:00 |
|
Tanguy PATTE
|
2d8ffc949d
|
add guard gem
|
2015-11-19 11:37:29 +01:00 |
|
Tanguy PATTE
|
40d5802d4a
|
start france connect
|
2015-10-05 16:42:29 +02:00 |
|
Tanguy PATTE
|
78e86f00ea
|
[#884] add user
|
2015-09-23 10:02:01 +02:00 |
|
Tanguy PATTE
|
5b9acf3875
|
[#878] add liste of dossier in backoffice
|
2015-09-22 11:56:14 +02:00 |
|
Tanguy PATTE
|
90c6459b09
|
remove duplicated gem
|
2015-09-02 17:37:32 +02:00 |
|
Tanguy PATTE
|
fe3f235860
|
include philippe notes
|
2015-09-02 17:34:13 +02:00 |
|
Tanguy PATTE
|
308fc5fb89
|
add raven gem
|
2015-09-01 14:58:48 +02:00 |
|
Tanguy PATTE
|
f27c5c40e6
|
add gem mina
|
2015-09-01 14:35:27 +02:00 |
|
Tanguy PATTE
|
c5a2c7848e
|
add gem unicorn and logstasher
|
2015-09-01 14:25:26 +02:00 |
|
Tanguy PATTE
|
52d5dc3d5d
|
add rubocop gem
|
2015-08-20 16:11:31 +02:00 |
|
Tanguy PATTE
|
147a27786e
|
add gem railroady
|
2015-08-17 11:12:59 +02:00 |
|
Tanguy PATTE
|
a807ba5ae9
|
rename ref piece jointe into type piece jointe
|
2015-08-14 12:06:26 +02:00 |
|
Xavier J
|
5dc8ae822f
|
Affichage des pièces jointes disponibles dans la console admin
|
2015-08-12 10:09:52 +02:00 |
|
Xavier J
|
7bd396a027
|
Merge branch 'master' of ssh://37.187.249.111:2200/opt/git/admi_facile
Conflicts:
.ruby-version
|
2015-08-11 15:40:26 +02:00 |
|
Tanguy PATTE
|
ff4152023f
|
remove gem sqlite3
|
2015-08-11 15:36:48 +02:00 |
|
Xavier J
|
58e1cdaa72
|
Ajout de rubocop
|
2015-08-11 15:08:18 +02:00 |
|
Xavier J
|
b5b83e939a
|
First Commit
|
2015-08-10 11:05:06 +02:00 |
|