Unknwon
|
39931f8e00
|
Allow mail with self-signed certificates
|
2014-10-09 18:08:07 -04:00 |
|
Unknwon
|
1aa76bd279
|
Fix #532, add system notice
|
2014-10-08 18:29:18 -04:00 |
|
Unknwon
|
fc18741cc7
|
Fix #524
|
2014-10-07 07:02:53 -04:00 |
|
Unknwon
|
64c68220d2
|
Fix #264
|
2014-10-06 17:50:00 -04:00 |
|
Unknwon
|
91e5c24a31
|
Fix #522
|
2014-10-06 10:36:32 -04:00 |
|
Unknwon
|
263d409326
|
Basic xss prevention
|
2014-10-04 17:15:22 -04:00 |
|
Unknwon
|
405ee14711
|
Fix SMTP auth logic
|
2014-10-03 13:12:54 -04:00 |
|
Unknwon
|
f03b6be8f9
|
Work on #516
|
2014-10-01 07:40:48 -04:00 |
|
Unknwon
|
2a031c1365
|
Fix #515
|
2014-09-30 04:39:53 -04:00 |
|
Unknwon
|
3cfa4a581c
|
Bug: 500 when transfer repository to collaborator
|
2014-09-29 04:04:48 -04:00 |
|
Unknwon
|
5e747bc877
|
Clean old dockerfiles
|
2014-09-28 03:31:50 -04:00 |
|
Unknwon
|
49193bebd2
|
UI: Confirmation box
|
2014-09-28 01:38:25 -04:00 |
|
Unknwon
|
b8368f98ff
|
Add directory level commit message
|
2014-09-26 08:55:13 -04:00 |
|
Unknwon
|
f69761563b
|
Fix bug on transfer repo
|
2014-09-25 16:36:19 -04:00 |
|
Unknwon
|
25268577a5
|
Fix download archive issue
|
2014-09-24 17:43:33 -04:00 |
|
Unknwon
|
ebb05475ed
|
Fix #495 and cannot view repository by tag
|
2014-09-23 13:06:25 -04:00 |
|
Unknwon
|
135d3733b3
|
Feature: Integrate crypto/tls/generate_cert.go command
|
2014-09-22 17:30:58 -04:00 |
|
Unknwon
|
3f707b3f32
|
Add basic submodule support
|
2014-09-22 17:01:19 -04:00 |
|
Unknwon
|
196efecaaa
|
Fix #491
|
2014-09-22 11:04:46 -04:00 |
|
Unknwon
|
4a01bb8fa4
|
Mirror bug fix
|
2014-09-21 12:19:50 -04:00 |
|
Unknwon
|
7ba9257a7f
|
Add suburl support
|
2014-09-19 20:11:34 -04:00 |
|
Unknwon
|
8a09256941
|
Mirror fix and fix #481
|
2014-09-17 14:22:51 -04:00 |
|
Unknwon
|
0d9c41be7d
|
Work on #476
|
2014-09-16 10:10:33 -04:00 |
|
Unknwon
|
c1ceec45da
|
Fix mirror UI style and work on #475
|
2014-09-16 08:32:13 -04:00 |
|
Unknwon
|
632b1b694d
|
Fix #465
|
2014-09-15 09:56:12 -04:00 |
|
Unknwon
|
b9560374cd
|
UI fix
|
2014-09-13 22:12:11 -04:00 |
|
Unknwon
|
cfed11f092
|
Bug: Transfer repository doesn't update the count
|
2014-09-12 18:29:58 -04:00 |
|
Unknwon
|
fdc8c34258
|
Fix clone panel z-index
|
2014-09-10 11:32:14 -04:00 |
|
Unknwon
|
33659ed9a5
|
Fix #452
|
2014-09-09 10:17:35 -04:00 |
|
Unknwon
|
0ddb1eb769
|
Finish new install page, almost ready for 0.5 release
|
2014-09-07 19:02:58 -04:00 |
|
Unknwon
|
ab7206d6b7
|
Fix #348
|
2014-09-05 17:28:09 -04:00 |
|
Unknwon
|
830efc90da
|
update docs and mirror bug fix
|
2014-09-02 07:11:39 -04:00 |
|
Unknwon
|
7e36bf448d
|
Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts:
dockerfiles/README.md
|
2014-08-31 15:11:55 +08:00 |
|
Unknwon
|
9bc63bda7d
|
Finish all new admin pages.
|
2014-08-30 20:49:51 +08:00 |
|
Unknwon
|
d2aff9a46a
|
Continue working on new admin pages
|
2014-08-29 20:50:43 +08:00 |
|
Unknwon
|
8829174574
|
Finish new admin users pages
|
2014-08-29 15:32:52 +08:00 |
|
Unknwon
|
9baf2b38d0
|
Bug fix on organization
|
2014-08-27 16:39:36 +08:00 |
|
Unknwon
|
74b31566cf
|
Finsih add/remove repo in organization
|
2014-08-26 18:11:15 +08:00 |
|
Unknwon
|
f2c263c54f
|
fix #367
|
2014-08-25 09:45:39 +08:00 |
|
Unknwon
|
21a1b8e5a3
|
Finish new edit team page, add member to team
|
2014-08-24 21:09:05 +08:00 |
|
Unknwon
|
b765229a6d
|
Fix code style
|
2014-08-23 20:30:29 +08:00 |
|
Unknwon
|
bba707de36
|
Finish team list, create new team, join/leave team page
|
2014-08-16 16:21:17 +08:00 |
|
Unknwon
|
36b4c57ff1
|
Finish new organization members and invitation page
|
2014-08-15 18:29:41 +08:00 |
|
Unknwon
|
5acc948562
|
Page: /org/:orgname/settings
|
2014-08-14 14:12:21 +08:00 |
|
Unknwon
|
5fbf8531e6
|
Finish new home page of organization
|
2014-08-10 20:11:18 -07:00 |
|
Unknwon
|
9820b8e134
|
Finish new hooks list page
|
2014-08-09 10:29:51 -07:00 |
|
Unknwon
|
e8c9bb2c66
|
Finish new collaboration page
|
2014-08-07 06:40:05 -04:00 |
|
Unknwon
|
a8e05fdf1b
|
Use toolbox
|
2014-08-06 17:21:24 -04:00 |
|
Unknwon
|
fa0a389dc4
|
Fix bare repo bug
|
2014-08-05 19:40:01 -04:00 |
|
Unknwon
|
755eec745f
|
Finish new repo settings page
|
2014-08-02 13:47:33 -04:00 |
|
Unknwon
|
dabf5b057c
|
Finish new migrate page
|
2014-08-01 00:06:19 -04:00 |
|
Unknwon
|
7bbf644dd5
|
Convert captcha, cache, csrf as middlewares
|
2014-07-31 17:25:34 -04:00 |
|
Unknwon
|
3428baa3b5
|
Mirror fix on template
|
2014-07-30 10:02:31 -04:00 |
|
Unknwon
|
5c4bc3c848
|
Huge updates!!!!! Be careful to merge!!!!
|
2014-07-26 02:28:04 -04:00 |
|
Unknwon
|
8dd07c0ddd
|
New UI merge in progress
|
2014-07-26 00:24:27 -04:00 |
|
Unknown
|
0f907301b7
|
Fix #285
|
2014-07-12 00:55:19 -04:00 |
|
Unknown
|
63cc14062a
|
Paging function for users and repositories
|
2014-07-07 04:15:08 -04:00 |
|
Unknown
|
097c8e05e6
|
Able to set timeout for process monitor
|
2014-07-06 17:32:36 -04:00 |
|
Unknown
|
be8ac7fb75
|
fix #273
|
2014-07-04 16:48:36 -04:00 |
|
Unknown
|
465dc962b5
|
Finish create organization team
|
2014-07-02 16:42:16 -04:00 |
|
Unknown
|
e4ea5cf598
|
Finish Teams page
|
2014-06-29 16:30:41 -04:00 |
|
Unknown
|
6e448b0714
|
Finish delete organization
|
2014-06-28 00:40:07 -04:00 |
|
Unknown
|
19e9104289
|
Organization settings page
|
2014-06-27 03:37:01 -04:00 |
|
Unknown
|
e0f9c628c5
|
Add create organization
|
2014-06-25 00:44:48 -04:00 |
|
Unknown
|
b2801a2e98
|
Fix #165
|
2014-06-24 13:55:47 -04:00 |
|
Unknown
|
47d29a1ee0
|
Mirror fix on #248
|
2014-06-23 16:22:34 -04:00 |
|
Unknown
|
314193029a
|
Use constants to name template file
|
2014-06-22 23:11:12 -04:00 |
|
Unknown
|
ad5ec45dd6
|
Fix #165
|
2014-06-21 00:51:41 -04:00 |
|
Unknown
|
6c8d630bef
|
Add database log adapter
|
2014-06-20 00:25:23 -04:00 |
|
Unknown
|
f147ad619a
|
Basic process manager
|
2014-06-19 01:08:03 -04:00 |
|
Unknown
|
d952b4200c
|
Add corn rask monitor panel
|
2014-06-13 13:01:52 -04:00 |
|
Unknown
|
e07674bff1
|
Support edit release and save as draft
|
2014-06-12 17:47:23 -04:00 |
|
Unknown
|
fb0972afad
|
Fix #199
|
2014-06-12 09:35:51 -04:00 |
|
Unknown
|
a3e1383cac
|
Add gogs fix location command
|
2014-06-10 19:11:53 -04:00 |
|
Unknown
|
302c863cda
|
Fix #242
|
2014-06-08 04:45:34 -04:00 |
|
Unknown
|
4f2f3c2857
|
Code convention
|
2014-06-05 22:07:35 -04:00 |
|
Unknown
|
63baf76ab2
|
Fix #214
|
2014-06-03 12:51:53 -04:00 |
|
Unknown
|
eaa7d71fc7
|
Fix #232
|
2014-06-02 21:59:56 -04:00 |
|
Unknown
|
afc6cbc479
|
Update tag
|
2014-06-01 11:06:03 -04:00 |
|
Unknown
|
2657f88d9a
|
Fix #222
|
2014-05-31 17:15:04 -04:00 |
|
Unknown
|
617bbe3fee
|
Fix #218
|
2014-05-30 06:34:24 -04:00 |
|
Unknown
|
ab13a29cb5
|
Fix #209
|
2014-05-28 01:53:06 -04:00 |
|
Unknown
|
ff48aeddef
|
Little bug fix
|
2014-05-25 20:57:01 -04:00 |
|
Unknown
|
5543a0b6dc
|
增加版本标识确保二进制和模板文件处于同个版本
|
2014-05-25 20:33:30 -04:00 |
|
Unknown
|
688ec6ecbd
|
Fixed #209
|
2014-05-25 20:11:25 -04:00 |
|
Unknown
|
dce17c86ac
|
Almost done issue label #200
|
2014-05-24 03:05:41 -04:00 |
|
Unknown
|
b1bdbd7f94
|
Almost done issue label #200
|
2014-05-24 02:31:58 -04:00 |
|
Unknown
|
5e9a45f74a
|
Code convention
|
2014-05-21 21:37:13 -04:00 |
|
Unknown
|
93f8f92523
|
Finish create new label
|
2014-05-18 18:07:04 -04:00 |
|
Unknown
|
956f011dd3
|
Fix #186
|
2014-05-16 13:41:08 -04:00 |
|
Unknown
|
be82716b66
|
Clean old LDAP code
|
2014-05-15 23:03:26 -04:00 |
|
Unknown
|
b0084b1adc
|
Litte bug fix
|
2014-05-14 08:30:35 -04:00 |
|
Unknown
|
98dbbae2ef
|
Fix #166
|
2014-05-13 12:40:32 -04:00 |
|
Unknown
|
54e95fa367
|
Finish add new milestone
|
2014-05-12 14:06:42 -04:00 |
|
Unknown
|
c5dbc24ca4
|
UI fix
|
2014-05-11 07:43:57 -04:00 |
|
Unknown
|
23a857d107
|
Add repo info to web hook post
|
2014-05-08 08:18:03 -04:00 |
|
Unknown
|
7407f9caf3
|
Finish issue design
|
2014-05-07 12:09:30 -04:00 |
|
Unknown
|
8ca14e2109
|
Improve delete SSH key
|
2014-05-06 16:28:52 -04:00 |
|
Unknown
|
e573855a4f
|
Fix #98, support web hook
|
2014-05-06 11:50:31 -04:00 |
|
Unknown
|
816c0ed5e7
|
Fix import path
|
2014-05-05 02:42:52 -04:00 |
|
Unknown
|
7b60756f2c
|
Fix Collaborators cannot commit
|
2014-05-03 01:37:49 -04:00 |
|
Unknown
|
a9e6d49dc6
|
Fix #159
|
2014-05-02 17:30:59 -04:00 |
|
Unknown
|
3bd5fc6d6f
|
Add command dump and move to cmd did
|
2014-05-01 21:21:46 -04:00 |
|
Unknown
|
75109bbd65
|
Fix panic when no master branch
|
2014-05-01 12:03:10 -04:00 |
|
Unknown
|
eb463000a9
|
Clean files
|
2014-05-01 03:27:26 -04:00 |
|
Unknown
|
49dc57e336
|
Add /api/v1/users/search
|
2014-04-30 23:48:01 -04:00 |
|
Unknown
|
b36448a537
|
Merge branch 'dev' of github.com:gogits/gogs into dev
|
2014-04-30 03:44:32 -04:00 |
|
Unknown
|
48bfbb7ddf
|
Mirror changes
|
2014-04-30 03:44:28 -04:00 |
|
Lunny Xiao
|
a85f242030
|
Merge branch 'dev' of github.com:gogits/gogs into dev
|
2014-04-30 10:24:00 +08:00 |
|
Lunny Xiao
|
cdc843f06b
|
add fix command for upgrade
|
2014-04-30 10:23:43 +08:00 |
|
Unknown
|
2401e68d7e
|
Prepare for v0.3.1 hotfix
|
2014-04-28 21:53:40 -04:00 |
|
Unknown
|
62d23e9154
|
HTTP no follow and offline mode
|
2014-04-27 01:05:13 -06:00 |
|
Unknown
|
9dfb7de371
|
Fix #102
|
2014-04-26 01:22:22 -06:00 |
|
Unknown
|
2a9da4b8e5
|
Fix #92
|
2014-04-22 03:41:47 -04:00 |
|
Unknown
|
ea29a9b846
|
API fix
|
2014-04-21 02:24:35 -04:00 |
|
Unknown
|
006c45e21d
|
Mirror change
|
2014-04-20 20:52:00 -04:00 |
|
Unknown
|
eda3f8b3b3
|
Mirror updates
|
2014-04-19 06:00:08 -04:00 |
|
Unknown
|
bda8fdc5f4
|
fix bug when logout without activate
|
2014-04-18 21:14:35 -04:00 |
|
Unknown
|
7ad05ce210
|
Fix #80
|
2014-04-16 04:12:31 -04:00 |
|
Unknown
|
7d656ee2e3
|
Update docs
|
2014-04-15 15:34:26 -04:00 |
|
Unknown
|
57f84fb051
|
UPDATE DOCS
|
2014-04-14 02:50:13 -04:00 |
|
Unknown
|
d2b53dd43b
|
Add weibo oauth
|
2014-04-13 21:00:12 -04:00 |
|
Unknown
|
9d983f27d6
|
go vet
|
2014-04-13 03:14:43 -04:00 |
|
Unknown
|
5c2da610a2
|
Move binding as subrepo
|
2014-04-13 01:57:42 -04:00 |
|
Unknown
|
90f6aa8cd1
|
Add repo mirror and import
|
2014-04-12 20:35:35 -04:00 |
|
Unknown
|
33aa4f7438
|
Support private repo
|
2014-04-11 21:47:39 -04:00 |
|
Unknown
|
d6dac160df
|
Pages in commits list page
|
2014-04-11 20:23:34 -04:00 |
|
Unknown
|
ed546912e5
|
fix #52 fix #34
|
2014-04-10 23:41:10 -04:00 |
|
Unknown
|
45462662e9
|
Add flash
|
2014-04-10 16:36:50 -04:00 |
|
Unknown
|
af552596cf
|
Work on form resubmit
|
2014-04-10 14:37:43 -04:00 |
|
Unknown
|
5d4025cb5a
|
Add go get meta support
|
2014-04-09 21:42:25 -04:00 |
|
Unknown
|
5f6bd323f5
|
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
models/oauth2.go
|
2014-04-09 14:15:09 -04:00 |
|
Unknown
|
115a349131
|
Fix #67
|
2014-04-08 12:41:33 -04:00 |
|
Unknown
|
9ea9818d32
|
Fix issue with log in with GitHub but need more error handle after
|
2014-04-07 12:56:40 -04:00 |
|
Unknown
|
e7c8a3cb8d
|
Add salt for every single user
|
2014-04-06 16:10:57 -04:00 |
|
Unknown
|
794cd27db3
|
Fix bug related to log
|
2014-04-06 13:07:34 -04:00 |
|
Unknown
|
3ebc9b991a
|
Use gogits/session for oauth2
|
2014-04-05 11:22:14 -04:00 |
|
Unknown
|
e41ab839c7
|
Use session for rolling back
|
2014-04-04 18:55:17 -04:00 |
|
Unknown
|
e9c4156c87
|
Add: rename user
|
2014-04-03 16:33:27 -04:00 |
|
Unknown
|
d9005ee970
|
Improve issue mail content
|
2014-04-02 10:38:30 -04:00 |
|
Unknown
|
b0e7dd6864
|
Update README
|
2014-04-01 21:19:19 -04:00 |
|
Unknown
|
03cc39ea12
|
Mirror fix on #45
|
2014-03-30 09:39:44 -04:00 |
|
Unknown
|
107a1eadac
|
Finish close and reopen issue, install page, ready going to test stage of v0.2.0
|
2014-03-29 17:50:51 -04:00 |
|
Unknown
|
beb1761d7c
|
Mirror fix
|
2014-03-29 06:55:51 -04:00 |
|
Unknown
|
cb05b8325c
|
Update config option
|
2014-03-28 08:39:35 -04:00 |
|
Unknown
|
f76eb8a666
|
IP: RC Code Review
|
2014-03-27 15:24:11 -04:00 |
|
Unknown
|
f470c241d6
|
IP: RC Code Review
|
2014-03-27 11:37:33 -04:00 |
|
Unknown
|
7ab94fe816
|
Fix issue on windows
|
2014-03-26 09:22:08 -04:00 |
|
Unknown
|
ed9b7d2db9
|
More on diff page
|
2014-03-26 07:24:20 -04:00 |
|
Unknown
|
c1a3d4fefb
|
Add mail notify for creating issue
|
2014-03-25 21:37:18 -04:00 |
|
Unknown
|
2fa8d0c8dd
|
Added create issue
|
2014-03-25 12:12:27 -04:00 |
|
Unknown
|
eeb793524f
|
Check run user
|
2014-03-25 06:52:56 -04:00 |
|
Unknown
|
59bbddb318
|
Mirror fix
|
2014-03-24 07:36:38 -04:00 |
|
Unknown
|
97debac185
|
SSL enable config option
|
2014-03-23 08:40:40 -04:00 |
|
Unknown
|
ad31893bbb
|
Update README
|
2014-03-22 20:25:39 -04:00 |
|
Unknown
|
61e2922601
|
Working on issues
|
2014-03-22 13:50:50 -04:00 |
|
Unknown
|
fd1831052c
|
Update session
|
2014-03-22 09:21:57 -04:00 |
|
Unknown
|
76cd448e79
|
Add admin delete user
|
2014-03-22 06:20:00 -04:00 |
|
Unknown
|
d40499e7fa
|
Finsih mail resend limit
|
2014-03-21 10:09:57 -04:00 |
|
Unknown
|
06631ab91f
|
Basic admin data table, models changes
|
2014-03-20 16:04:56 -04:00 |
|
Unknown
|
3b387336bf
|
Add Repository/user name filter
|
2014-03-20 11:41:24 -04:00 |
|
Unknown
|
4a6c56d2fd
|
Bug fix
|
2014-03-20 09:49:06 -04:00 |
|
Unknown
|
6f68620860
|
Pools limit concurrent nums
|
2014-03-19 21:05:48 -04:00 |
|
Unknown
|
cef9bbd530
|
Add complete log configuration
|
2014-03-19 04:08:25 -04:00 |
|
Unknown
|
e44d9ffd89
|
Delete commit and update getlastcommit
|
2014-03-18 00:14:05 -04:00 |
|
Unknown
|
e51afe4621
|
Add postgres support, clean code, code review
|
2014-03-17 14:03:58 -04:00 |
|
Unknown
|
0f68930892
|
Add latest commit in repo viewer
|
2014-03-17 00:57:18 -04:00 |
|
Unknown
|
ec65be79f0
|
Fix commit feed ui
|
2014-03-16 12:07:35 -04:00 |
|
Unknown
|
c3e0554fd7
|
Clean code
|
2014-03-16 02:53:41 -04:00 |
|
Unknown
|
50df58a893
|
Merge branch 'master' of github.com:gogits/gogs
|
2014-03-16 02:28:28 -04:00 |
|
Unknown
|
828c89de99
|
Clean code
|
2014-03-16 02:28:24 -04:00 |
|
Lunny Xiao
|
3035a38caa
|
add update
|
2014-03-16 12:18:34 +08:00 |
|
slene
|
fa5ad1e465
|
move templateFuncs to one file, add middleware context.
|
2014-03-15 19:01:50 +08:00 |
|
Unknown
|
adb17791bd
|
Add basic render of public act
|
2014-03-15 00:50:51 -04:00 |
|
Unknown
|
47edf7f4f9
|
Finish update password and profile
|
2014-03-14 01:12:07 -04:00 |
|
Unknown
|
57bc2d1ca0
|
Add update user profile back end, add new gitignore and license, add template data to public profile page
|
2014-03-13 03:39:18 -04:00 |
|
Unknown
|
27104ac89a
|
Add delete repo
|
2014-03-13 02:39:09 -04:00 |
|
FuXiaoHei
|
37fae304d3
|
single repository page ui, add spec handler to get repo
|
2014-03-13 13:14:43 +08:00 |
|
Unknown
|
12f81de349
|
Finish delete user
|
2014-03-11 11:40:47 -04:00 |
|
Unknown
|
fdc4151ff3
|
Finish create repo
|
2014-03-11 01:32:36 -04:00 |
|
Unknown
|
b4727c7601
|
Update create repo
|
2014-03-11 00:53:53 -04:00 |
|
Unknown
|
52837e3d36
|
Clean code
|
2014-03-10 20:53:30 -04:00 |
|
Unknown
|
897329a644
|
Add add and delete SSH key
|
2014-03-10 20:48:58 -04:00 |
|
Unknown
|
0d9b2f3860
|
Update CreateRepository
|
2014-03-09 20:06:29 -04:00 |
|
Unknown
|
76ce6f9848
|
Update repo.Create
|
2014-03-08 21:25:38 -05:00 |
|
Unknown
|
5a05d6633d
|
Merge utils to modules
|
2014-03-07 17:22:15 -05:00 |
|
Unknown
|
a2a59f8ad1
|
Change /user/profile URL to /user/:username
|
2014-03-07 17:08:21 -05:00 |
|
Unknown
|
ba5c7ea771
|
Add SignInRequire and SignOutRequire middleware
|
2014-03-07 16:05:18 -05:00 |
|
Unknown
|
56a7ab4da5
|
Finish log in user
|
2014-03-06 11:42:14 -05:00 |
|
Unknown
|
1249392c83
|
Finish register user
|
2014-03-06 11:10:35 -05:00 |
|
Unknown
|
c6f2c23b05
|
Add binding form for register user
|
2014-03-06 02:21:44 -05:00 |
|
Unknown
|
e59f90b8fe
|
Update
|
2014-03-03 19:03:08 -05:00 |
|
Unknown
|
e9487cb59c
|
Update
|
2014-03-02 15:25:09 -05:00 |
|
Lunny Xiao
|
9c3a8ff299
|
add run user
|
2014-02-25 18:58:55 +08:00 |
|
Lunny Xiao
|
b1b6def5bc
|
improved ssh supports
|
2014-02-20 14:53:56 +08:00 |
|
Unknown
|
4b92a6c2df
|
Add code of delete user
|
2014-02-19 13:04:31 -05:00 |
|
Lunny Xiao
|
be0ba9ea88
|
add ssh supports(unfinished)
|
2014-02-19 17:50:53 +08:00 |
|
Unknown
|
b455478df8
|
Finish register user
|
2014-02-18 17:31:16 -05:00 |
|
Unknown
|
3eb1ab9e8b
|
Add UI for register user
|
2014-02-17 18:38:50 -05:00 |
|
Unknown
|
b1c5adc2f2
|
Setup templates structure
|
2014-02-14 20:14:22 -05:00 |
|