Nick Winter
|
dac4f05fd9
|
Improved legibility of gold font. Moved Done button to not conflict with gold display.
|
2014-04-27 14:19:39 -07:00 |
|
Nick Winter
|
fa0e7f04f7
|
Fixed a thing.
|
2014-04-26 14:21:26 -07:00 |
|
Scott Erickson
|
fed5d681f2
|
Merge branch 'master' into feature/loading-views
|
2014-04-26 12:54:37 -07:00 |
|
Nick Winter
|
834c27bbd7
|
Show spell palette for Thangs with apiProperties that aren't programmable.
|
2014-04-25 16:57:42 -07:00 |
|
Nick Winter
|
d8d2a57c38
|
Listed a few new levels.
|
2014-04-25 15:00:46 -07:00 |
|
Scott Erickson
|
3dc3f62473
|
Merge branch 'master' into feature/loading-views
Conflicts:
app/views/editor/components/main.coffee
|
2014-04-25 14:31:58 -07:00 |
|
Nick Winter
|
2a2ddd068e
|
Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com.
|
2014-04-24 14:23:15 -07:00 |
|
Nick Winter
|
b9173a5ea5
|
Fixed #913, I think. (This was just built into marked.)
|
2014-04-24 12:24:22 -07:00 |
|
Michael Schmatz
|
c408196814
|
Fix for runtime errors
|
2014-04-23 16:44:31 -07:00 |
|
Nick Winter
|
86aa4cd0fe
|
Updated janky include_flow skip levels.
|
2014-04-23 16:11:47 -07:00 |
|
Michael Schmatz
|
7419b269f1
|
Merge pull request #894 from codecombat/feature/worker-lint
Background linting/transpilation/hasChangedSignificantly
|
2014-04-22 12:05:03 -07:00 |
|
Michael Schmatz
|
6122d31e28
|
Removed web worker logging listener
|
2014-04-22 12:03:33 -07:00 |
|
Michael Schmatz
|
3110e6e56a
|
Renamed test_worker to aether_worker
|
2014-04-22 11:58:27 -07:00 |
|
Michael Schmatz
|
392dbb9f8d
|
Removed superfluous comment
|
2014-04-22 11:51:51 -07:00 |
|
Michael Schmatz
|
3bbedbc100
|
Added background transpile
|
2014-04-22 11:46:17 -07:00 |
|
Nick Winter
|
675db1b76f
|
Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents.
|
2014-04-22 11:11:08 -07:00 |
|
Michael Schmatz
|
e0f8d1343e
|
Fixed race condition
|
2014-04-22 11:04:56 -07:00 |
|
Michael Schmatz
|
81809956b8
|
hasChangedSignificantly async refactor
Still checking for bugs
|
2014-04-22 08:54:35 -07:00 |
|
Ting-Kuan
|
692693c181
|
Merge branch 'master' into feature/loading-views
Conflicts:
app/locale/en.coffee
app/views/editor/level/edit.coffee
app/views/kinds/CocoView.coffee
app/views/play/ladder/ladder_tab.coffee
app/views/play/ladder_view.coffee
app/views/play/level/level_loading_view.coffee
|
2014-04-19 01:15:04 -04:00 |
|
Michael Schmatz
|
a7867e5e2d
|
Added background linting
Background hasChangedSignificantly is soon!
|
2014-04-18 14:59:08 -07:00 |
|
Ting-Kuan
|
1c1cf2f189
|
Fix loading of Level.
|
2014-04-17 19:23:35 -04:00 |
|
Nick Winter
|
46487f55a4
|
Fixed up some styles for job profile page, and prevented long links from destroying things with poor wrapping.
|
2014-04-17 11:34:55 -07:00 |
|
Ting-Kuan
|
2e50d7b15d
|
Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views
Conflicts:
app/views/play/ladder/ladder_tab.coffee
app/views/play/ladder_view.coffee
|
2014-04-16 11:38:05 -04:00 |
|
Nick Winter
|
f762d95ab8
|
ModelModal and simple leaderboard pagination.
|
2014-04-15 15:01:54 -07:00 |
|
Ting-Kuan
|
af399f4415
|
Merge branch 'master' into feature/loading-views
|
2014-04-15 13:34:20 -04:00 |
|
Nick Winter
|
e908ae2fb4
|
Fixed #772.
|
2014-04-14 14:49:38 -07:00 |
|
Nick Winter
|
1794e5e040
|
Fixed #813 (sort of).
|
2014-04-14 11:18:02 -07:00 |
|
Nick Winter
|
8aa36178af
|
Fixed #769. Added some analytics timing tracking. Added replacement for $.browser.
|
2014-04-13 20:31:23 -07:00 |
|
Nick Winter
|
a9725f2dc6
|
A bit of error handling.
|
2014-04-13 14:48:36 -07:00 |
|
Ting-Kuan
|
77c4c586dd
|
Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815
Conflicts:
app/locale/en.coffee
|
2014-04-12 17:13:06 -04:00 |
|
Ting-Kuan
|
508b570fea
|
Merge branch 'master' into feature/loading-views
Conflicts:
.gitignore
app/locale/en.coffee
app/models/SuperModel.coffee
app/views/editor/thang/edit.coffee
app/views/kinds/CocoView.coffee
|
2014-04-12 17:07:30 -04:00 |
|
Ting-Kuan
|
7ae3bd5a60
|
Fix style and supermodel based on #815.
Fix ladder_view and ladder_tab.
Change error handling functions in CocoView.
|
2014-04-12 16:29:49 -04:00 |
|
Nick Winter
|
f0aa5e1d5e
|
Fixed #681 by removing full-screen button in Safari.
|
2014-04-11 18:19:52 -07:00 |
|
Nick Winter
|
10bb17c38a
|
Added getThangByID method to Thang. Handled a few error corner cases with the time popup.
|
2014-04-11 14:03:13 -07:00 |
|
Scott Erickson
|
e3a1f170cf
|
Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader
Conflicts:
app/views/kinds/CocoView.coffee
app/views/play/level/level_loading_view.coffee
|
2014-04-11 11:19:16 -07:00 |
|
Ting-Kuan
|
a5e6496a7c
|
Make resources as static class to avoid loading multiple times.
Clean debug message.
|
2014-04-10 16:59:08 -04:00 |
|
Michael Schmatz
|
42bf2996af
|
Made Aether ignore variable hoisting
See #813
|
2014-04-10 10:36:32 -07:00 |
|
Nick Winter
|
76054345d7
|
Fixed #805.
|
2014-04-09 09:04:59 -07:00 |
|
Nick Winter
|
13f34341b2
|
Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat
|
2014-04-06 14:55:14 -07:00 |
|
Scott Erickson
|
978c84bc89
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-03 18:43:36 -07:00 |
|
Scott Erickson
|
3b3b825be0
|
Set up a new loading/progress system for views.
|
2014-04-03 18:43:29 -07:00 |
|
Nick Winter
|
9a70abb104
|
Don't need to explicitly skip Mobile Artillery's next level now.
|
2014-04-03 16:37:24 -07:00 |
|
Nick Winter
|
670f94cc22
|
Fixed #418, no more print/save dialogues evaaarr.
|
2014-04-02 14:42:34 -07:00 |
|
Aditya Raisinghani
|
44979c074d
|
Integrated nanoscroller.
|
2014-04-03 03:10:06 +05:30 |
|
Dominik Kundel
|
1c6aea9c1c
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-31 20:35:32 +02:00 |
|
Nick Winter
|
a79fe37ca1
|
Merged; made a couple tweaks.
|
2014-03-29 17:30:12 -07:00 |
|
Dominik Maier
|
fb607d06fa
|
Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670
|
2014-03-30 00:38:45 +01:00 |
|
Nick Winter
|
c58a1682f4
|
Fixed #519 for real, I think.
|
2014-03-29 14:09:45 -07:00 |
|
Nick Winter
|
5bcaf2c746
|
Fixed #64 (I hope; let's UX test.)
|
2014-03-28 17:06:21 -07:00 |
|
Nick Winter
|
cf81d51a89
|
Fixed #46.
|
2014-03-28 15:23:12 -07:00 |
|
Nick Winter
|
c4a56dc9a5
|
Added a thing which highlights the guide every 5 minutes until clicked. Fixed #11.
|
2014-03-28 12:22:53 -07:00 |
|
Nick Winter
|
62867534a7
|
Fixed #727.
|
2014-03-28 09:52:07 -07:00 |
|
Dominik Kundel
|
267d033997
|
initial coffeescript support. No proper highlighting of executing parts and errors are not displayed inline
|
2014-03-28 14:42:08 +01:00 |
|
Dominik Kundel
|
35a16b47ff
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-28 14:37:14 +01:00 |
|
Nick Winter
|
b0b37aa9d8
|
Made play/pause and scrubber look even more disabled when disabled.
|
2014-03-27 15:07:37 -07:00 |
|
Nick Winter
|
2677751dc5
|
Merge branch 'lbox-prog' of git://github.com/Shrihari/codecombat into Shrihari-lbox-prog
|
2014-03-27 14:58:06 -07:00 |
|
Nick Winter
|
127c4a4e0f
|
Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging.
|
2014-03-27 13:36:33 -07:00 |
|
Scott Erickson
|
fae9034dfc
|
Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master
Conflicts:
app/models/SuperModel.coffee
|
2014-03-26 14:29:16 -07:00 |
|
swapnesh
|
1118324b41
|
Migrate from .on, .once to .listenTo, .listenToOnce
|
2014-03-26 03:25:11 +05:30 |
|
Dominik Kundel
|
fe8a4901de
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/locale/de.coffee
bower.json
|
2014-03-25 17:07:36 +01:00 |
|
Shrihari
|
aee18523b0
|
Fix for #506
|
2014-03-25 13:28:22 +05:30 |
|
Scott Erickson
|
2c329a256f
|
Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties.
|
2014-03-24 14:42:56 -07:00 |
|
Scott Erickson
|
f55cef5ced
|
Merge branch 'migrateBBevents' of https://github.com/Shrihari/codecombat into Shrihari-migrateBBevents
|
2014-03-24 10:38:57 -07:00 |
|
Shrihari
|
f085b0d319
|
Refactored cast-button events
|
2014-03-24 22:41:27 +05:30 |
|
Shrihari
|
0160538b44
|
More migrations
|
2014-03-24 22:28:34 +05:30 |
|
Shrihari
|
69ee16f77f
|
Fixed wrong migrations
|
2014-03-24 21:37:09 +05:30 |
|
Nick Winter
|
92c87dc4ad
|
Merge branch 'fix/scroll-spell-debug-view' of git://github.com/gintau/codecombat into gintau-fix/scroll-spell-debug-view
|
2014-03-24 08:28:48 -07:00 |
|
Ting-Kuan
|
e9118142db
|
Fix issue #662
|
2014-03-24 10:54:59 -04:00 |
|
Shrihari
|
67f5270bfc
|
Migrate .on, .once - Batch 1
|
2014-03-24 12:23:41 +05:30 |
|
Nick Winter
|
dbeb3d445b
|
Give focus back to spell view on palette click.
|
2014-03-23 16:48:30 -07:00 |
|
Nick Winter
|
656b34fc34
|
Fixed comment gutter icons jumping all over the place.
|
2014-03-23 16:00:23 -07:00 |
|
Nick Winter
|
96fe1e42f0
|
Merge pull request #657 from adi2412/reloadCode
Made changes to reloadAllCode to reload only the team's code.
|
2014-03-22 10:36:17 -07:00 |
|
Aditya Raisinghani
|
bee5d528ec
|
Made changes to reloadAllCode to reload only the team's code.
|
2014-03-22 22:56:41 +05:30 |
|
dpen2000
|
b1b0579cb3
|
Save autocastDelay as a setting on User re #627
|
2014-03-21 22:46:14 +00:00 |
|
Scott Erickson
|
b6c9b6276c
|
Tweaked logging of sprite building.
|
2014-03-19 17:11:45 -07:00 |
|
Scott Erickson
|
74e068af0b
|
Fixed some bugs from the migration from _.cloneDeep to $.extend
|
2014-03-18 13:47:51 -07:00 |
|
Scott Erickson
|
37a9b7f319
|
Switching from the slow _.cloneDeep to the fast $.extend
|
2014-03-18 13:08:26 -07:00 |
|
Dominik Kundel
|
c55b608886
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/templates/play/level/modal/editor_config.jade
|
2014-03-17 19:39:38 +01:00 |
|
Nick Winter
|
6c2a78c060
|
Show videos in HD if possible. Use ready state on level loader.
|
2014-03-17 05:52:19 -07:00 |
|
Nick Winter
|
833c310a91
|
Merge pull request #579 from ItsLastDay/popover
Fix for issue #496
|
2014-03-17 04:30:57 -07:00 |
|
Mikhail Koltsov
|
df3739517d
|
fixed issue #496
|
2014-03-17 12:28:49 +04:00 |
|
Scott Erickson
|
db4ae0cd2d
|
Made some tips show up more rarely.
|
2014-03-17 00:12:11 -07:00 |
|
Scott Erickson
|
7555dce172
|
Tweaked the loading page progress bar.
|
2014-03-17 00:05:45 -07:00 |
|
Scott Erickson
|
dc4252a94d
|
Moved the tips into the level loader screen and gave them i18n.
|
2014-03-16 22:01:21 -07:00 |
|
Scott Erickson
|
de34896a9a
|
Playback is now disabled during casting. Also cleaned out some remaining hover logic.
|
2014-03-16 21:43:14 -07:00 |
|
Scott Erickson
|
e88c79681d
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-16 21:04:44 -07:00 |
|
Scott Erickson
|
c663bd74cf
|
Tweaks to the scrubber. Sliding it around no longer changes its play state; it only pauses playback if you click.
|
2014-03-16 21:04:36 -07:00 |
|
Nick Winter
|
9a64fb5dac
|
Work on /multiplayer modal.
|
2014-03-16 20:32:24 -07:00 |
|
Dominik Kundel
|
6a983dcb8c
|
changed name of event triggered when config is changed and introduced new event when language is changed
|
2014-03-17 02:14:04 +01:00 |
|
Nick Winter
|
6db33fd967
|
Brawlwood protectAPI on!
|
2014-03-16 17:07:10 -07:00 |
|
Dominik Kundel
|
ce6533de59
|
changing ace edit mode based on setting
|
2014-03-15 23:14:57 +01:00 |
|
Dominik Kundel
|
46133ab85d
|
added select statement for programming language
|
2014-03-15 22:00:29 +01:00 |
|
Nick Winter
|
b2efb1bba5
|
More work on the loading view.
|
2014-03-14 19:44:19 -07:00 |
|
Nick Winter
|
efd0d82dea
|
Working on new loading view design.
|
2014-03-14 17:06:08 -07:00 |
|
Nick Winter
|
5c76ca71e3
|
Added configuring of behaviors to the editor config.
|
2014-03-14 10:14:48 -07:00 |
|
Nick Winter
|
3c0b496033
|
Fix for if aceConfig doesn't exist yet.
|
2014-03-14 07:46:36 -07:00 |
|
Nick Winter
|
c28d2bb576
|
Merge pull request #545 from dkundel/master
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
|
2014-03-14 07:35:11 -07:00 |
|
Dominik Kundel
|
7e955c72b8
|
apply config to editor
|
2014-03-14 02:49:58 +01:00 |
|
Dominik Kundel
|
8a5aeb6227
|
save editor config to database
|
2014-03-14 02:09:11 +01:00 |
|
Nick Winter
|
42a8862fa9
|
Merge pull request #541 from dkundel/master
Easy use of coordinates as discussed in #10 and minor fixes
|
2014-03-13 18:05:04 -07:00 |
|
Dominik Kundel
|
6f2a04c5c0
|
added new editor config modal
|
2014-03-14 00:54:06 +01:00 |
|
Dominik Kundel
|
f618338d32
|
added button to access new modal for editor config
|
2014-03-14 00:53:29 +01:00 |
|
Dominik Kundel
|
4cbdc3cb4b
|
highlight lines after insertion
|
2014-03-14 00:52:18 +01:00 |
|
Nick Winter
|
e2d2e96cf5
|
Fixed several bugs with Thang selection and the SpellView and HUD.
|
2014-03-13 15:35:28 -07:00 |
|
Nick Winter
|
c8103154a9
|
Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.
|
2014-03-13 09:02:19 -07:00 |
|
Nick Winter
|
28d56f526e
|
Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces.
|
2014-03-12 20:59:19 -07:00 |
|
Michael Schmatz
|
6eda2d24a5
|
Commented out line 133
|
2014-03-12 17:52:05 -07:00 |
|
Michael Schmatz
|
aea9e9d1a6
|
Spectate view is nearing completion
|
2014-03-12 17:51:13 -07:00 |
|
Dominik Kundel
|
8990b9d194
|
paste coordiante if click + shift
|
2014-03-13 01:50:59 +01:00 |
|
Nick Winter
|
ac8f12ef20
|
I don't think we need this template any more.
|
2014-03-12 16:03:32 -07:00 |
|
Nick Winter
|
49ab47e3fe
|
Allowing shift+space to insert spaces as well as end scripts. Not ideal yet, 'cause we can't selectively not insert the space when canceling a script.
|
2014-03-12 10:01:31 -07:00 |
|
Nick Winter
|
2e354a7f11
|
Fixed #519, pressing esc while loading level, and CocoSprites updating actions and other things unnecessarily while paused. Watch for bugs with that last one.
|
2014-03-12 09:10:36 -07:00 |
|
Nick Winter
|
b560827e32
|
Working on cleaning up some server errors.
|
2014-03-11 19:17:58 -07:00 |
|
Dominik Kundel
|
c7ca878c69
|
added class property that got missing
|
2014-03-12 01:26:11 +01:00 |
|
Dominik Kundel
|
714c6ddf9b
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-11 23:50:51 +01:00 |
|
Dominik Kundel
|
4c7da1ea69
|
update Gutter only if changed
|
2014-03-11 23:47:27 +01:00 |
|
Nick Winter
|
234b3f105d
|
Reworked ladder game victory modal main call to action to actually submit game for ranking.
|
2014-03-10 10:36:28 -07:00 |
|
Nick Winter
|
6a71e97204
|
Improvements to HUD actions.
|
2014-03-10 09:37:05 -07:00 |
|
Nick Winter
|
39c4657204
|
Fixed HUD showing actions backwardly. Added rank numbering to leaderboard.
|
2014-03-08 15:43:56 -08:00 |
|
Nick Winter
|
68099bbd7c
|
Victory modal for ladder games takes you back to the ladder matches.
|
2014-03-07 21:20:09 -08:00 |
|
Alexei Nikitin
|
98b36d299c
|
Update article model
|
2014-03-08 05:05:35 +04:00 |
|
Nick Winter
|
b6ae73ef29
|
Merge pull request #492 from Shrihari/issue464
Fixed Spell Debug View width bug
|
2014-03-07 16:14:57 -08:00 |
|
Scott Erickson
|
13b9a9cb58
|
Added dungeon arena tutorial to a few hardcoded places.
|
2014-03-07 15:16:13 -08:00 |
|
Shrihari
|
5274f22467
|
Fixed Spell Debug View width bug
|
2014-03-08 01:10:12 +05:30 |
|
Nick Winter
|
6e47416d24
|
Fixed some level IDs.
|
2014-03-06 19:09:15 -08:00 |
|
Nick Winter
|
2d69abf674
|
Merge pull request #481 from dkundel/master
Proposed UX improvement for #6
|
2014-03-05 13:45:14 -08:00 |
|
Dominik Kundel
|
a033a80722
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-05 22:18:53 +01:00 |
|
Dominik Kundel
|
b0d571c7ad
|
highlight only the executing statement
|
2014-03-05 22:17:34 +01:00 |
|
Scott Erickson
|
0a8d5b5b97
|
Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master
|
2014-03-05 10:35:06 -08:00 |
|
Shrihari
|
f6324807b3
|
Moved "Skip (esc)" next to Continue button
|
2014-03-05 23:36:18 +05:30 |
|
Dominik Kundel
|
d16d024782
|
further changes in design of highlighting lines in code
|
2014-03-05 17:06:46 +01:00 |
|
Shrihari
|
0ec431f90a
|
Moved 'skip tutorial' text to locales.
|
2014-03-05 13:46:21 +05:30 |
|
Dominik Kundel
|
a0e39480e3
|
new UI design for executing and executed lines in ACE editor
|
2014-03-05 02:00:38 +01:00 |
|
Nick Winter
|
4556536df4
|
Hooked up new HUD icons.
|
2014-03-04 11:15:31 -08:00 |
|
Nick Winter
|
65d9186ef1
|
Fixed actions showing up under dialogue bubbles on repeated toggling.
|
2014-03-03 16:55:36 -08:00 |
|
Nick Winter
|
7b25eeec47
|
HUD properties now flow into columns more evenly, have max styling.
|
2014-03-03 16:45:03 -08:00 |
|
Nick Winter
|
86fd098159
|
Localized WizardSprite movement hey handling to WizardSprite file.
|
2014-03-03 07:28:40 -08:00 |
|
Nick Winter
|
f2f0a993af
|
Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat
|
2014-03-03 07:22:44 -08:00 |
|
Nick Winter
|
82b250b9a3
|
protectAPI off again for Brawlwood, too slow for now.
|
2014-03-02 17:51:57 -08:00 |
|
Nick Winter
|
a8ef87c9ea
|
Fixed a few bugs; re-enabled protectAPI for Brawlwood.
|
2014-03-02 16:06:22 -08:00 |
|
Muhammed Thanish
|
da2ebf857a
|
Increase delay
|
2014-03-02 14:02:30 +05:30 |
|
Muhammed Thanish
|
d7e031fd00
|
Use key.isPressed() to get movement direction
|
2014-03-02 03:27:06 +05:30 |
|
Muhammed Thanish
|
7ea9260322
|
Use WizardSprite
|
2014-03-02 01:45:49 +05:30 |
|
Nick Winter
|
2f130da090
|
HUD supports more hudProperties. Palette looks at programmableObjectProperties. Fixed bug with level editor frames advancing.
|
2014-03-01 11:06:44 -08:00 |
|
Muhammed Thanish
|
8cc8103288
|
Add keyboard shortcuts to move the wizard
|
2014-03-01 19:58:15 +05:30 |
|
Scott Erickson
|
4de425bd58
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-02-28 13:59:33 -08:00 |
|
Scott Erickson
|
10795df7d9
|
Renamed hardcoded project-dotas to brawlwoods.
|
2014-02-28 13:59:02 -08:00 |
|
Nick Winter
|
52903cc0de
|
Using String and Array docs when appropriate now.
|
2014-02-28 12:43:31 -08:00 |
|
Nick Winter
|
6db8051122
|
Only show action timeline when 'action' is in the hudProperties.
|
2014-02-28 11:38:41 -08:00 |
|
Scott Erickson
|
d12b923eaf
|
Made a casting progress bar on the canvas to test vs having it shown in the cast button.
|
2014-02-28 11:05:41 -08:00 |
|