693 Commits (109fe895b3398c7f78020fad628394d3e69c5e37)

Author SHA1 Message Date
psychobunny 2a88e08977 and one last derp 10 years ago
psychobunny 556d817cc5 forgot to return 10 years ago
psychobunny 458ee7cca8 acute ocd attack 10 years ago
psychobunny bfaeee2531 linting 10 years ago
psychobunny b511bc37fb don't initialize taskbar until dom is ready 10 years ago
Barış Soner Uşaklı 36ac6f849f Merge pull request #2397 from joe1chen/bug-fix-topic-search
Bug fix - Topic search broken due to encodeURIComponent being called too early
10 years ago
psychobunny b480bff3fd moved taskbar markup out of JS and into modules/taskbar.tpl 10 years ago
barisusakli d9d44aee2b #2334 10 years ago
barisusakli b3544f644a relative path upload fixes #2403 10 years ago
Joseph Chen f02fd88eaf Bug fix - Topic search broken due to encodeURIComponent being called too early. 10 years ago
barisusakli 2e1a098cfa fix multi selection if category has sub categories 10 years ago
Julian Lam 74630b3a79 closed #2360 10 years ago
Julian Lam 93f414892b closed #2361 10 years ago
Julian Lam e0436d73c3 #2361 10 years ago
Julian Lam 8e0e2a04be restored the toolbar on mobile composer, #2293 10 years ago
Julian Lam dfc7c7aa7f #2350 :shipit: 10 years ago
Julian Lam 0e9fdc9a09 fixed #2350 -- chat modal now opens, but input is disabled 10 years ago
barisusakli e09328c74d #2346
dont bring modal to front if u receive a message
10 years ago
barisusakli 38874345b7 closes #2346 10 years ago
barisusakli 6353ed57a9 duh fixing my fail from last night 10 years ago
barisusakli e97bfc139b #1848 10 years ago
Julian Lam adfb89a2ad closed #2321 10 years ago
barisusakli 433769eb36 closes #2146
first tab (recent) shows last 50 messages instead of just last 24 hours
10 years ago
barisusakli 1b268c94c0 if there is no postData.tid dont notify, ie topic post 10 years ago
barisusakli 4c90c9a759 closes #2291 10 years ago
barisusakli f295083a08 fix upload error messages 10 years ago
psychobunny a24dde863b moved src/client/modules/admin/selectable to src/admin/modules/selectable #2250 10 years ago
barisusakli e95c68e7d6 fix bookmark 10 years ago
psychobunny 8abf2835a5 removed modules/admin and moved mousetrap + keybindings out of client #2245 10 years ago
barisusakli e1f67052d0 closes #2244 10 years ago
psychobunny 7396c363d7 press / to highlight search input box 11 years ago
psychobunny ba4392cda0 selectable - shift clicking deselects items in a group 11 years ago
psychobunny eb5630caa7 refactored selectable to use 'selected' instead of 'dropped'; fixed position relative bug 11 years ago
psychobunny 7a2ccf6031 hardcoded parentElement by accident
so that's why it doesn't work on other pages. derp
11 years ago
psychobunny 9c67d5742e added event callbacks for onSelected and onUnselected 11 years ago
psychobunny 13c9da6bff selectable - click/shiftclick to select as well 11 years ago
psychobunny bcdb87f488 fixed selectable 11 years ago
psychobunny 2db93c9219 created selectable module for selecting / grouping elements 11 years ago
barisusakli 6a996bd718 closes #2210 11 years ago
Julian Lam 1eb9016a77 fixed #2207 11 years ago
barisusakli b8df95da98 check message 11 years ago
Schamper 883422760d Fix settings save message 11 years ago
Julian Lam 625247611b closed #1959 11 years ago
barisusakli cd99654477 closes #2046 11 years ago
psychobunny d081ecf368 fixed chatModal centering 11 years ago
psychobunny da0eff6a4e double click the chat header to maximize 11 years ago
barisusakli 48c3619028 lowered chat zindex 11 years ago
barisusakli 8c600ae15d stop tag autocomplete ajaxify 11 years ago
Julian Lam aee8b87385 composer tweaks, hiding navbar when mobile composer is open 11 years ago
barisusakli f377868764 closes #2064 11 years ago
barisusakli 63a7766ac1 closes #2027 11 years ago
barisusakli 0f258859a7 closes #2067 11 years ago
barisusakli 4066607388 closes #2052 11 years ago
Julian Lam 8bac0bf361 Merge branch 'csrf-excision' into hashtalk 11 years ago
Julian Lam a061079995 fixed all POST routes to use new csrf middleware 11 years ago
psychobunny ca7f35dd5e trimming alert title/message 11 years ago
barisusakli 9a96458f79 closes #2053 11 years ago
barisusakli 493d0dea1e part 1 of notif refactor 11 years ago
Julian Lam 40e5ad075f started work on #2082 11 years ago
barisusakli 273db693e7 closes #2051 11 years ago
barisusakli b7ee875b12 user.isOnline fix
wont hit db on every user socket connect or user disconnect
11 years ago
barisusakli 6b39e328f5 chat fix 11 years ago
barisusakli e495db3065 dont make a copy of chat message 11 years ago
barisusakli 625766ba85 dont send typing notif on each keyup 11 years ago
barisusakli 171f02101d closes #2035, closes #2036 11 years ago
barisusakli ae6d5e72f4 closes #2015 11 years ago
Julian Lam 1f06e4f5a2 added secret key bindings for admins to reload and restart their NodeBBs :shipit: 11 years ago
Julian Lam 063a4e5628 finished up UX integration for in-topic searching, added mousetrap lib to capture ctrl-F only in topic view, closed #1800 11 years ago
Julian Lam 5d22806ded more topic searching work (working example, needs UX tie-in) 11 years ago
Julian Lam cd10248226 basic topic searching via search bar working 11 years ago
barisusakli fdf19f9025 closes #2022 11 years ago
barisusakli 69ce425ae5 closes #2021 11 years ago
Julian Lam e497290dbc removed commented-out code 11 years ago
Julian Lam fcbdc5e271 added recompilation of templates to NodeBB Reloading - #2010 11 years ago
barisusakli c57b0a2199 closes #2013 11 years ago
barisusakli ca90afd544 #1992
(drunk) not even done yet
11 years ago
barisusakli d852f284da closes #1948 11 years ago
barisusakli 1cf5c3145a doing it properly this time
mainPost always has index 0
11 years ago
barisusakli 41ed52a414 moved newlines from language file to core 11 years ago
psychobunny eb297d7eab client side hooks: action:composer.topics.post, action:composer.posts.reply, action:composer.posts.edit 11 years ago
Filips Alpe 378fd095eb Leave the chat window within the screen
On smaller screens, the top of the chat window can appear so high that it is outside the screen, this fixes that.
11 years ago
Julian Lam 77e0cb170f removed console.log 11 years ago
barisusakli da780cdee7 closes #1920 11 years ago
barisusakli 6e335ff29a removed debug 11 years ago
barisusakli f71bd41408 more fixes 11 years ago
barisusakli d7520508e3 #1375 part1 11 years ago
barisusakli 297f523f18 closes #1899 11 years ago
barisusakli e961e3c552 reduced hightlight duration by 2 seconds 11 years ago
Barış Soner Uşaklı 485f14ef7f Merge pull request #1873 from frissdiegurke/patch-2
[Settings] fixed data-empty usage within checkboxes
11 years ago
barisusakli 89bb11a58c closes #1880 11 years ago
frissdiegurke 021e5bfcc5 [Settings] fixed data-empty usage within checkboxes 11 years ago
barisusakli a4975cab33 closes #1825, closes #1674 11 years ago
Julian Lam bf2cba028d fixed #1851 11 years ago
barisusakli 8ff34e4dc2 parseint tid 11 years ago
barisusakli 161069c390 closes #1840 11 years ago
barisusakli 6d8cc5648c some tag hooks/filters 11 years ago
Julian Lam 23c4b8ca35 only showing ACP setting saved alert if no callback is passed in 11 years ago
Julian Lam cac3ebc9e5 vertically centering modal when opened 11 years ago
Julian Lam c259e0407e closed #1807 11 years ago
Julian Lam 4404387218 Merge branch 'master' into chat-route 11 years ago
barisusakli bb9caa7228 removed dupe 11 years ago
Julian Lam 95102f7e74 jshinting 11 years ago
Julian Lam 71916f0691 marathon bugfixing with @barisusakli re: #1788 11 years ago
Julian Lam 55afa17651 getting chats working between both page and modal, yay #1788 11 years ago
Julian Lam a031bc2721 highlighting of the user with whom you are currently chatting with #1788 11 years ago
Julian Lam 07a82ec12c more WIP 11 years ago
barisusakli c5ccf4333b translate helpers 11 years ago
barisusakli dcbed4e935 closes #1763
show alert if email not confirmed, clicking alert will send confirmation
email
11 years ago
barisusakli 684f858415 closes #1772 11 years ago
barisusakli 64f680a0a3 action:chat.loaded hook 11 years ago
barisusakli 1b31f5b2ca single arrows wont go all the way to bottom 11 years ago
barisusakli c9c68f8cbe move cursor to end 11 years ago
barisusakli 105acc0197 not used 11 years ago
barisusakli 56830d773e cleaned up resizeStop 11 years ago
Julian Lam b338ac2a4c fixing space-indentation, modifying behaviour a little bit so that the maximized position is not saved, and minimizing can return back to the previous saved position 11 years ago
Julian Lam 517c70951f Merge branch 'patch-3' of github.com:mani95lisa/NodeBB into mani95lisa-patch-3 11 years ago
barisusakli a9e5e82431 closes #1758 11 years ago
Mani Wang 1050efbe65 make expand postContainer more easier
If user don't know drag to expand and move 0 after down, then think user clicked and toggle postContainer's height between max and default 400.
11 years ago
barisusakli 1cabf885a2 closes #1730
postCount != lastPostIndex unfortunately, that will need some rethinking
11 years ago
barisusakli b822e8babc render preview on image upload 11 years ago
barisusakli 67186edda7 fix drag drop 11 years ago
barisusakli 9240f65f20 moved resize code, removed old tab code 11 years ago
barisusakli c3e4d11f69 closes #1719 11 years ago
barisusakli 1296cd58b9 closes #1723 11 years ago
barisusakli c296aaeb8a discard language string 11 years ago
barisusakli 36ed21ad72 closes #1739 11 years ago
barisusakli 35d1aacc45 no success alert on posting and editing #1721 11 years ago
barisusakli 7d1ba0eb7c closes #1718 11 years ago
barisusakli 6303ac4a90 closes #1716, #1717 11 years ago
Julian Lam c41bb05711 final pass #1720, closed #1720 11 years ago
barisusakli 9151040250 side by side preview 11 years ago
barisusakli 13854e8774 closes #1603 11 years ago
barisusakli bf18e70d66 small fix to title escape 11 years ago
barisusakli 4c2765a79c closes #1679 11 years ago
barisusakli ce1934e566 closes #1684 11 years ago
barisusakli b9139ef263 some escaping and fixed uploads in progress 11 years ago
barisusakli 3f9fa0137c taskbar text incase <script> is title 11 years ago
psychobunny b43602f5b6 closes https://github.com/NodeBB/NodeBB/issues/1631 11 years ago
psychobunny 35e72dbb37 load composer-mobile.tpl if in xs/sm environment, for https://github.com/NodeBB/NodeBB/issues/1657 11 years ago
barisusakli b9c30aa42d possible fix to #1660
modified the tagsinput source to use keypress instead of keydown for the
confirmKeys
11 years ago
barisusakli 178f567659 closes #1655 11 years ago
barisusakli 6bd4524a79 fixed share for category 11 years ago
barisusakli 573cb4b4d7 fixed share links 11 years ago
barisusakli 55dbc5c823 closes #1612
changed post links to "topic/<topic_id>/<topic_slug>/<post_id>"
11 years ago
barisusakli aa0b9f9029 semicolon 11 years ago
barisusakli 09d4f4b47b leaving tags box will create tag 11 years ago
psychobunny 3ba51b05f7 fixing the minified version of string.js instead 11 years ago
psychobunny 65f3fa1bbc fixing string.js compatibility 11 years ago
psychobunny 281aa0049c init, attempt to increase cold load speed 11 years ago
barisusakli e1ad2537b6 fixes navigator progress bar 11 years ago
barisusakli dbf07f786d closes #1565 11 years ago
barisusakli 66701afdaa closes #1559
fixes the notification image too, the property was called image not
picture
11 years ago
barisusakli fa1275c03a closes #1557 11 years ago
barisusakli 90cea84af9 max 5 tags per topic
asdasd
11 years ago
barisusakli df73ceaeb7 closes #1556
added tag input box to composer when creating a topic
added new routes for viewing tags 'tags' and 'tags/:tagname'
respectively
post_bar.tpl shows the tags of the topic
can edit the main post to remove or add new tags
added a new menu item to header to go to the tags page
11 years ago
barisusakli b30dee2601 no need to store titleEl 11 years ago
barisusakli 9ba0dc3363 closes #1539 11 years ago
barisusakli 20a707e6c1 uploads cleanup 11 years ago
barisusakli e869a6a15a composer refactor 11 years ago
Julian Lam b1534b7798 removing allowGuestPosting logic in NodeBB 11 years ago
barisusakli 629648bc7d closes #1535 11 years ago
Julian Lam 7dffc2a2e9 moving chat timestamp to top of message, not end 11 years ago
barisusakli c5d9a68b4b closes #1445 11 years ago
psychobunny 240932dd80 add cursor: pointer if alert's clickfn is defined 11 years ago
psychobunny f2a692add7 some linting of settings.js 11 years ago
psychobunny c3e4c7dea1 using var instead of const for < IE10 compatibility
@frissdiegurke
11 years ago
psychobunny 2b4da7ebcd Merge pull request #1514 from frissdiegurke/master
added number-type to settings framework. persist expanded object on serv...
11 years ago
Julian Lam 65dd79c84e socket logic for #1149 -- handling of help tab in ACP 11 years ago
psychobunny f7fe0aa680 moved documentation out of alerts 11 years ago
barisusakli d0be73a4d4 closes #1503 11 years ago
FrissDieGurke ab2c0cfa9f added number-type to settings framework. persist expanded object on server-side sync if changed 11 years ago
barisusakli 8ee866fc9d closes #1513 11 years ago
barisusakli 4c28de659c closes #1504 11 years ago
barisusakli d304bab4f1 dont change height if sizing horizontally #1508 11 years ago
psychobunny 2ba2ef5320 closes #1498 11 years ago
psychobunny a0fcdfe629 closes #1502 11 years ago
barisusakli 933aa5dfcb #1501 11 years ago
FrissDieGurke c4606e7009 minified settings-framework wrapper-length 11 years ago
FrissDieGurke c23df60e1b removed unnecessary method + doc within Settings Framework 11 years ago
barisusakli ab15dba0de closes #1472 11 years ago
barisusakli f3d0d70867 closes #1471 11 years ago
psychobunny 6f0e749b60 Merge pull request #1462 from frissdiegurke/master
added new settings-system
11 years ago
psychobunny 882589acae moved findBootstrapEnvironment into utils 11 years ago
Ole Reglitzki 4da8121827 jsbeautify 11 years ago
Ole Reglitzki d76ba519d4 added new settings-system 11 years ago
psychobunny 4b18403fa6 moving controls object into its own module 11 years ago
psychobunny 775e6ec8ce comopser bugfix 11 years ago
psychobunny 090ecaffd1 closes #1444 11 years ago
barisusakli caa0c45a11 closes #1441 11 years ago
barisusakli 6f2ea3eafc closes #1439 11 years ago
Julian Lam 46c281db3d Merge pull request #1409 from miksago/formatting-dispatch-table
Composer: Implement formatting bar dispatch table
11 years ago
psychobunny ad8239aa31 alerts - parse globals before translating 11 years ago
Micheil Smith ae9f675b80 Composer: Use formatting dispatch table for inserting uploads and pictures 11 years ago
Micheil Smith bf7de0d051 Composer: Switch to using a dispatch table for buttons
Note: for now, it looks a little messy, but once I merge wrapSelectionInTextareaWith and insertIntoTextarea, it won't be. Promise.
11 years ago
barisusakli d431c94ed8 added variable to replying to string 11 years ago
barisusakli e12beccc09 closes #1371
adds a dropdown to category view to move/pin/lock/delete multiple topics
11 years ago
barisusakli f9897daad1 all notifications are translated now closes #1388 11 years ago
barisusakli 04488a9a14 closes #1139 11 years ago
barisusakli d832a6f805 closes #1381 11 years ago
psychobunny 3c711d72fb regex - no need to escape special characters inside [] 11 years ago
psychobunny e5486db1ae Merge branch 'code-quality' of https://github.com/miksago/NodeBB into miksago-code-quality
Conflicts:
	src/database.js
11 years ago
barisusakli 8aa4f053e8 converted translator.get to translator.translate 11 years ago
barisusakli fc8e97448c load sounds on demand, refactored sounds 11 years ago
Julian Lam 29ec14efa0 fixed #1365 11 years ago
barisusakli a091e06fe3 more work for #1368 11 years ago
Micheil Smith 8da45b72a9 Composer: Rework formatting bar logic 11 years ago
Micheil Smith 78e1e4fbac Composer: simplify code with early returns 11 years ago
Micheil Smith 3e82cab398 Add missing new lines at end of files. 11 years ago
Micheil Smith 66d1f2505f Composer: Pass radix argument to parseInt 11 years ago
Micheil Smith 85cab3aec8 Composer: Escape special characters in regex 11 years ago
Micheil Smith e860b0dd4c Composer: Remove unused variables 11 years ago
barisusakli e2d0d4db5c added error and success language files
removed some code from server side that was emitting alerts
11 years ago
barisusakli 5ddf70a671 closes #1273 11 years ago
barisusakli 0cd13b7b66 closes #1273 11 years ago
barisusakli 6b7049cdae closes #1333 11 years ago
barisusakli 5209c614fc add taskbar to body 11 years ago
barisusakli b5f4503e9f fixed share url 11 years ago
barisusakli e7a791ab74 removed unused globals from share module 11 years ago
barisusakli 273f499cc2 moved the duplicated sharing code to requirejs module 11 years ago
barisusakli 1d3c25fdcc moved alert to its own requirejs module 11 years ago
barisusakli 35eebbf20a chat message fix 11 years ago
psychobunny 7678eaf528 fixes #1296 11 years ago
psychobunny 4f04bd82a6 some fixes 11 years ago
barisusakli 3a69a191ff closes #1285 11 years ago
barisusakli 3493be4ef0 closes #1268 11 years ago
barisusakli abc7fd54f3 added class to chat messages 11 years ago
barisusakli 0c744a947e chat will use timeago 11 years ago
barisusakli d6223406e9 added space between uploading and number 11 years ago
Julian Lam da1a1d5930 adding callback to settings.load, and omitting password validation check on user creation if no password is entered (e.g. SSO login) 11 years ago
barisusakli 0f66e80a5a added setting to disable notification sounds 11 years ago
Julian Lam 61afee98c3 updates to new settings mechanism, updating markdown minver, minor linting for upgrades.js, and upgrade stmt for markdown migration 11 years ago
barisusakli 10d8eed7b9 closes #1229 11 years ago
Julian Lam 16f1db4f5d fireEvent reflection socket call, tweaks to Sounds page in ACP 11 years ago
Julian Lam 14a0b45ae8 securing settings.save socket listeners behind admin namespace 11 years ago
Julian Lam c1ccc81400 ACP integration for Sounds 11 years ago
Julian Lam eeb3bdc7f7 Merge branch 'master' of github.com:designcreateplay/NodeBB 11 years ago
barisusakli 4cadd8da7a missing radix 11 years ago
barisusakli 367a9aa022 composer jshint 11 years ago
Julian Lam 0ea14324ac adding missing files 11 years ago
Julian Lam 6d03f713c5 "Sounds" tab in Settings page... WIP, needs fixing. 11 years ago
Julian Lam 553cabdcfa refactored sound system so that they can be specified in ACP, updated soundfile to work in FF, which fixes #1209 11 years ago
barisusakli 970639274e fixes image uploads
if images had special regex characters in them upload text was failing
11 years ago
Julian Lam 2826381b20 draft saving in composer -- resolved #1197 11 years ago
barisusakli c320051a1e chat jshint 11 years ago
Julian Lam 4343f240d0 moving async back to proper vendor folder 11 years ago
Julian Lam 2f1707e772 Merge branch 'master' of github.com:designcreateplay/NodeBB 11 years ago
psychobunny 1e9850b6b9 vendor* 11 years ago
psychobunny df29410c08 moving async back to require.js modules/vendor folder 11 years ago
Julian Lam 3dc4fd9fd9 added sounds for incoming and outgoing chat, and new notification 11 years ago
Julian Lam f65a7f96ff moving async to proper vendor folder 11 years ago
Julian Lam a9b78d2600 minimizing the composer should unregister it 11 years ago
Julian Lam f2ffc2b533 properly referencing the tid of the composer instead of blindly checking templates.get('topic_id') 11 years ago
Julian Lam 7ef84e0daa switched to 'ping active' system 11 years ago
Julian Lam b3d7ae1c86 showing who is replying in the active users block 11 years ago
Julian Lam dfd13fac0d Merge branch 'master' of github.com:designcreateplay/NodeBB 11 years ago
Julian Lam 44ac7ec262 added new hooks for rendering help messages in composer, removed markdown text from translation 11 years ago
akhoury 1b207d8276 IE8 support, general cleanups, from native to $ objects ... 11 years ago
Julian Lam f5d1ba4231 closed #1113 11 years ago
Baris Soner Usakli e3d01df6a2 closes #980 11 years ago
Baris Soner Usakli 6e5a6b8784 upgraded categories to sorted set, score is the order set from acp, check if category topic exists before posting 11 years ago
Baris Soner Usakli d6d9776cde added toPid to posts 11 years ago
Baris Soner Usakli cfe5b6aa4a check if thumEl exists before trim 11 years ago
Baris Soner Usakli 29ba015d69 fixed topic thumbs 11 years ago
akhoury 63c9269240 merged composer and some other files with master 11 years ago
akhoury 25207852e8 added topics thumbnails support 11 years ago
psychobunny 163b0f964e Merge remote-tracking branch 'origin/master' into Widgets 11 years ago
psychobunny 37d673028a added async to client side 11 years ago
Julian Lam 0d7e47ded7 closed #1057 11 years ago
Baris Soner Usakli 8518f26adb closes #1023 11 years ago
Baris Soner Usakli e1f016c075 closes #1046 11 years ago
Julian Lam 3b4985efe5 tx translation update 11 years ago
Baris Soner Usakli 83ad454c3e better error message if image upload fails, #1052 11 years ago
Baris Soner Usakli 92ebf2975a possible fix for #1050 11 years ago
Baris Soner Usakli 0ec9f3835f fixed js error in composer 11 years ago
Julian Lam 9e64f4e303 passing in a picture into notifications now 11 years ago
Julian Lam ef45ae9ba3 fixed the rotating bell in notifications loading LOL 11 years ago
Baris Soner Usakli 075c6c01f2 upload changes, show progres in composer 11 years ago
Baris Soner Usakli c703dba3dd closes #1009 11 years ago
Baris Soner Usakli 4ff62f4e30 closes #1005 11 years ago
Baris Soner Usakli 20dd194171 show error in composer if upload fails 11 years ago
Julian Lam 97e52fd169 adding new client-side hook and post_uuid to composer template 11 years ago
Julian Lam 55b39f1eff second pass, #981 11 years ago
Julian Lam b6e96541e7 first pass, #981 11 years ago
Baris Soner Usakli e18d9dc1b4 closes #975 11 years ago
Baris Soner Usakli 26849ba2b7 added hooks for image uploads into user and admin routes 11 years ago
Baris Soner Usakli 378ccc3cb7 removed imgur from core 11 years ago
Baris Soner Usakli 388532eedc closes #943 11 years ago
Julian Lam d7b44789fc updating stati to use sibling classes 11 years ago
Baris Soner Usakli 2cdddd2637 closes #925 11 years ago
Baris Soner Usakli 9e22b7c8fd focus composer text area after drag resize 11 years ago
Baris Soner Usakli 63a3bfd51d after drag focus input in chat, closes #924 11 years ago
Baris Soner Usakli 97e0e48b07 closes #714, closes #824 11 years ago
Baris Soner Usakli 0f5b3ae859 added img-responsive to images in chat messages 11 years ago
Baris Soner Usakli 89e554b333 closes #906 11 years ago
Baris Soner Usakli 8607ea9a84 notifications fix 11 years ago
psychobunny 24d2ac270c changed notifications code to jq - prevents crashes if notification element does not exist 11 years ago
Baris Soner Usakli ed401de169 closes #896 11 years ago
Baris Soner Usakli f68b692ce4 closes #863 11 years ago
Baris Soner Usakli c06320e28b closes #870 11 years ago
Julian Lam 4ae8824faf tweaks and formatting 11 years ago