Commit Graph

5681 Commits (f72e00a1b536fcf245e31d5e4418296640e00433)

Author SHA1 Message Date
Julian Lam 8013f124da fixes
Ben Lubar 395e71feee fix topic reply button
Julian Lam f4845631c0 Merge pull request from BenLubar/reply-quote-bounds
when clicking the reply button, limit the selection to the post's content
Ben Lubar c50f228acc when clicking the reply button, limit the selection to the post's
content.
Julian Lam b0f93f8525 Merge pull request from RaceProUK/master
Fixing 'Go to last read' popup text
NodeBB Misty 87bd0c69d7 Latest translations and fallbacks
Julian Lam 22f73a8f68 fixes
barisusakli 691802efad removed params
barisusakli e1a8c520ba closes
psychobunny 5008e211e2 closes
barisusakli e8b8f115b7 closes
Julian Lam ae7dc134e3 latest translations and fallbacks
barisusakli c6c1e2e217 closes
barisusakli 38c560019f
boomzillawtf d4464f6ab1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	public/src/client/topic/posts.js
boomzillawtf 6aa0f8eb8a fix : default to scroll to my post
psychobunny 0c1376c884 closes
psychobunny 5d77e37a3c closes
barisusakli 56ef1e9869 closes
RaceProUK 25f4400569 Reverting all but en-GB
RaceProUK 1423b1443d Fixing 'Go to last read' popup text
Since clicking the popup goes to the last _read_ post, not the last unread
barisusakli 0bf05a17bf closes
barisusakli 7e6e3b3a40 closes
barisusakli e2f78a9585 closes
barisusakli fd932462f6 edit profile language key
barisusakli e0f3ac8cb7 change to editedISO
RaceProUK fd854b134d Allow for a little scrolling before dismissing bookmark alert
This is just in case someone scrolls a little accidentally; the alert remains so they can still follow it if they want to
psychobunny f40ec978cb Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny 489bdcced6
psychobunny 3e14606226 added roomId to match the other hook
barisusakli 301f12d630 fix conditional
barisusakli f665a1e353 closes
psychobunny 9cb2f9e05f removed JS fake link
Barış Soner Uşaklı e9648daf7f Merge pull request from pichalite/issue-4386
fixes 
Barış Soner Uşaklı fe7d4999c9 Merge pull request from BenLubar/post-tools-stream
fix post tools not showing up for other users on new posts
barisusakli 4eb7468dcd already checked in scrollToPostIfSelf
pichalite 9c9e49e2f6 properly fix with styling
pichalite 497592965f fixes issue-4386
Ben Lubar bb88c82ffd fix post tools not showing up for other users on new posts (src/topics/posts.js has this condition already)
boomzillawtf 3d0012d730 Loads posts if appropriate, but doesn't scroll to new post according to the scroll to my post setting. Addresses .
barisusakli 9e44bd3d21 up themes
Barış Soner Uşaklı d5e875538b Merge pull request from boomzillawtf/master
Setting to show new post after reply
barisusakli c71ffed69c closes
boomzillawtf eb7c2d5872 Use scrollToMyPost setting with both pagination and infinite scroll
boomzillawtf ceb3b6ebe7 Add setting to avoid showing a post after it is submitted to keep the user's place on the page to address issue
Julian Lam 54e36f7c54 Update ajaxify logic w/ returnPath support
If returnPath is defined, and url is null, then ajaxify will
execute a replaceState instead of an ajaxification.

Used in cases where a separate route is pushed but you'll want to
return to the page you were on previously. (see: )
psychobunny c8b179e492 better settings for birthday datepicker
barisusakli c9cfe5b089 closes
barisusakli b6e22b7723 closes
Julian Lam 184a2c4540 IP blacklist functionality -- re:
Squashed commit of the following:

commit 5c42fd732d091fa66cf5b45a2af5e1697cc1efcd
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Mar 14 17:29:45 2016 -0400

    allowing blacklist.test to be called synchronously

commit 979faf2dba5e6f6e2ae1bd07341e63678438daf1
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Mar 14 17:01:14 2016 -0400

    added plain ipv6 support and finished middleware logic

commit d4b72fc1aadff34df3ed7dec52ca8d3c3728a078
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 16:05:31 2016 -0500

    WIP IP Banning logic middleware

commit f08b2553890c5522b6a1eaf521fe4e94df40574a
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 15:26:27 2016 -0500

    tweaks to ACP, rule validator

commit 868abacaa494e6b8a88bd4ea429b1b066a9ecb2e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 13:50:05 2016 -0500

    IP Banning ACP page, styling, save&load functionality
Julian Lam a275aaeaf5 fixes
Barış Soner Uşaklı 263b09f11a fix typo in group cover upload
Julian Lam d876763846 added logic to filter out prerelease versions of NodeBB from the update checker
Julian Lam b73af30a2b added git ignore file for modules directory
psychobunny 74449dc074 Merge branch 'pichalite-issue-4258'
psychobunny 50b813ae2f merging pull 4347
Stephan 944509406a Create jquery.timeago.de-short.js
Barış Soner Uşaklı e49af50ac8 Merge pull request from pichalite/issue-4340
check for last owner on user kick from group
barisusakli 3981e230c4 category children helper
barisusakli d67ec1d096 fix indent
barisusakli 05cc3fe4ef closes
barisusakli c156d1cb34 closes
pichalite e878b32444 closes
pichalite c1c5db4b77 check for last owner on user kick from group
barisusakli e11140b7ef retry once
Barış Soner Uşaklı bd6d44aeaa closes
psychobunny 3f912e2c6a closes
Julian Lam 72a05c1d07 disabling graph animation on mobile devices
Julian Lam 104d677271 latest translations and fallbacks
Barış Soner Uşaklı 3d55eec885 Merge pull request from samhax/delete-user-invites
Delete user invites from APM
samhax 37d53db693 Removed unused variable from click events.
barisusakli dc7a861a49 removed unused vars
barisusakli 7441c181b4 closes
barisusakli 7bf808d0f4 closes
barisusakli 07c1a822db closes closes
psychobunny 54d47e1e24 allow data-ajaxify=false for external links to override config.openOutgoingLinksInNewTab
HSam a62e31dc70 Finished the invite removal button changes.
HSam 48db16fba7 Finished adding a new delete to also remove the reference from the invites list on the APM.
Barış Soner Uşaklı cf681721d5 responseJSON is undefined on 502
Barış Soner Uşaklı 6828d4c239 closes
HSam 4d87f0276b In the process of adding the delete button to the invitation panel. Apparently, the delete method doesn't work with the invitation items, so I might need to add some extra logic.
barisusakli e03bacf032 fixes timeago
psychobunny 5d01060fbc closes
psychobunny 650890ad83 Revert "temp disable for #4302"
This reverts commit 974fa7b253.
barisusakli b2b104dab3 closes
barisusakli 974fa7b253 temp disable for
barisusakli a67f3d2a15 closes
psychobunny 45bc387749 Revert "fixes #4289"
This reverts commit c2b428cc95.
barisusakli 07266eab9e closes
psychobunny 09e5f053f0 action:post.tools.load
Julian Lam c2b428cc95 fixes
Julian Lam 9d0f53fcd6 closed
Julian Lam 783f570213 latest translations and fallbacks
barisusakli 4b5ec512b9 refactor/cleanup uploader.js
barisusakli 65dda58e0c renamed tpl
barisusakli df9558f1fa closes
pichalite cd99a46918 don't show rooms without messages
pichalite 571f364922 fix for post menu display on newPost
Barış Soner Uşaklı 5f3473142e fix reply as topic quoting
Julian Lam 4c5ebe4985 fixed
Julian Lam 99e9508131 fixed
Barış Soner Uşaklı 3e46ef8c35 closes
Julian Lam 13623a620b fixed
Julian Lam 432c3d777d Merge branch 'master' into fix-vendors
Julian Lam 3f2872979f added buzz
Julian Lam 44aae7daa5 removed hammer, updated semver, added mousetrap
Julian Lam 3871f6f191 removed chart.js lib from repo
Julian Lam e1323c0295 Updated js code so vendors can be added to the modules folder, so
they can be required properly and we can finally get rid of that
really annoying "mismatched anonymous" error in Require.js.

First module to make the transition: Chart.js
barisusakli 7ffbf35bcf closes
psychobunny 2b10ef97b2 closes
pichalite 5f6a1a0acd complete fixes for
Julian Lam db3446b1ca updated some of the graph colours
Julian Lam 088940d4c7 Squashed commit of the following:
commit 49e6c0040cc82c1e2684933a8e167ef14854aff8
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 16:12:15 2016 -0500

    added recording and charts for topic and post counts globally and by cid

commit e02ff70757f778aa016fbc42ef10a5da2d07a9d9
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 15:35:49 2016 -0500

    added labels to charts

commit e75d83bf3886e5183bcf5fcd848d71c513761e01
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 13:30:47 2016 -0500

    added per category graphs to ACP management page

commit e3f543200950925cc9e8bf33cccb592f949a100e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 12:36:11 2016 -0500

    updated analytics to move helper methods to analytics lib and sending per category analytics to ACP page

commit 01891d8f7c408925fcdad18dcaa941e5ebbeb9b2
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Feb 24 16:48:55 2016 -0500

    saving per-category analytics, and updated the writeData method to use async for "clarity"
psychobunny a320ec3efb closes
psychobunny 9e832e006a closes
barisusakli 8bc80abde6 removed notify typing code, not even working
barisusakli 78bb4776df fix crazy indents
barisusakli 3567f2ad55 closes
barisusakli 2fdb8fc5e1 closes
barisusakli 34f68a029a closes
barisusakli 9d045e70f5 change xregexp
Julian Lam 95d6895f13 Merge pull request from pichalite/master
fix Mac platform case
barisusakli f512cb543f closes
pichalite eba107cef4 fix Mac platform case
psychobunny e37cbca977 closes
psychobunny f51698804a closes
psychobunny b74022689f closes
psychobunny 582b69dbbc Merge pull request from pichalite/recent-chats
account for search input when calculating recent list height
psychobunny e069150625 closes
pichalite 991d85cae2 account for search input when calculating recent list height on expanded chats
psychobunny 637c20f44d closes
Julian Lam 946a082eaa latest translations and fallbacks
psychobunny 1dba781923 closes
psychobunny a3530340a9 Merge pull request from pichalite/issue-4228
throw error in chat if no users in room
Julian Lam 322d4052b0 chat controls now hidden instead of taking up space in chat modal
psychobunny a0a98e64b7 closes
Julian Lam 3b76b0343b Revert "fixes NodeBB/nodebb-theme-persona#218"
This reverts commit ee529d92d3.
barisusakli 6951dc1fe2 closes
barisusakli 4608b8f07b closes
pichalite 6ecc05afd4 throw error in chat if no users in room
Julian Lam 2cf42f55f5 latest translation
Julian Lam 13dfe6cd51 Merge pull request from pichalite/issue-4241
don't mention guest on reply
Julian Lam 20103b64ce Merge pull request from pichalite/groups
add missing translation in groups
pichalite fba4e93cfe remove translator
pichalite 872b33f0cc fix typo
Julian Lam 60a5a1b422 latest translations
Julian Lam a61fea862b Merge pull request from pichalite/issue-4159
fixes 
pichalite f22b218250 fixes
pichalite ca3fa023e8 fixes
pichalite a22d7290ec fix logout on user delete
pichalite 3024d2e661 don't mention guest on reply
pichalite f637521105 chat edit fixes
Timothy Fike c80bd0c413 Added app.newTopic
Make a new topic from anywhere. 
pichalite 9f760f9b55 translate string in groups
barisusakli 6b341a844d remove notifyTyping
pichalite 42239e119d search banned users only on /users/banned route
Barış Soner Uşaklı 573840ccbd changed to title raw
barisusakli 2fc385f723 closes , closes
psychobunny 759b183967 fixes a bug in instant updates on category view
barisusakli 6a98758a01 closes https://github.com/NodeBB/nodebb-theme-lavender/issues/60
barisusakli 8c3b52ef36 closes
barisusakli 3348d51f69 closes
Barış Soner Uşaklı 88e4591f88 closes
Barış Soner Uşaklı 82875de32d remove / from startsWith
Barış Soner Uşaklı d851443ea7 closes
barisusakli bc9c564650 closes
barisusakli 90b89a488e closes
Barış Soner Uşaklı d2df63f9a5 Merge pull request from pichalite/initiate-chat
Initiate chat from chat page
pichalite d81b6947f6 conditional change
pichalite d83b11dde3 add language string
pichalite 44d4c2bc7c hopefully I got everything right this time!!
barisusakli d7df6c0b06 remove more from config
barisusakli 5ac02a59ac remove some more config from api/config
barisusakli ebf820d571 remove from global config
pichalite 2723800628 indentation
pichalite 971c3eb0e1 indentation
pichalite 9901438001 indentation
pichalite 2c5e9dc4cf fix indent
pichalite 4b5d5b4bd9 search user and initiate chat from expanded chat page
psychobunny 46cfd03465 closes
Julian Lam 9a7ec01e15 Merge pull request from frissdiegurke/patch-2
Fix undefined S within translator
Barış Soner Uşaklı 303ac90dc5 Merge pull request from pichalite/master
use component
Ole R 91ec4c80c2 Oops, fix call of undefined
pichalite 776c60dc00 use component
Ole R 2bcd4e1e3f Fix undefined S within translator
If you `require(['string'], function (stringLib) { S = stringLib; })` it is an async call and thus you need to ensure any usage of `S` happens when this is resolved.
Julian Lam 47c61e883a tweaked styling for flags page a bit
Barış Soner Uşaklı b485b412a8 added title to flagged posts page
Julian Lam eb8b6af7fb Fix global mod priv check and styling for flags page
barisusakli 1ed3b40a1b fix calls
Barış Soner Uşaklı 2ce22caa41 Merge pull request from pichalite/master
remove unused code and use components
barisusakli e6cf8ec5cf more flagged posts shenanigans
barisusakli 1b9e18c6fc allow global mods to see banned users
pichalite ee47a13556 use components
pichalite e6e4b5784d remove unused code
psychobunny 2560e6345f Merge pull request from pichalite/master
use ajaxify.data.username instead of getting html
pichalite d133ff74bd use ajaxify.data.username instead of getting html
use ajaxify.data.username instead of getting html for toggleFollow
barisusakli 5e86d9f804 closes
barisusakli 2b5f9d075b closes
barisusakli f09ee86e42 closes
Julian Lam b7311dac65 removed css file @pichalite
Julian Lam c7647cfb72 Merge pull request from pichalite/master
ACP styling fixes
barisusakli c2e1426e57 fix syntax error, and actually show error if minification fails
barisusakli ae8837b44a generate notification path on demand
Julian Lam baaad13286 reverted latest change to translator match regex
- Fixes issue with parentheses in translations (closes )
- No longer marking translation keys invalid if they contain HTML,
  as that was probably not performant. Instead, parameters will
  simply be escaped via the StringJS library.
pichalite 0c5712411b fix for user icons when searching for users to add to group in acp>manage>group page
barisusakli 8220567b5b added topics to `action:topics.loaded` also fire it on category view
Julian Lam 5de0e74908 Notification paths are now sent back in socket call, so client-
side alert now shows more data and is clickable.
barisusakli 86d70eca74 closes
Julian Lam 32466d8bb1 tweaked paginator block to toggle when text is updated, and use ready class instead of invisible
pichalite a4d0026d93 ACP styling fixes
psychobunny 535dd82902 for previous commit
Julian Lam cedda11134 update theme minvers
Julian Lam 99315e1c73 updated translator so that language key parameters cannot contain
html in them (or more specifically, < and >)
Julian Lam 7eac1a93ae closes
barisusakli 1cf2b81f3d Revert "herp derp"
This reverts commit 9c9d805a32.
barisusakli 9c9d805a32 herp derp
barisusakli 767c798b2f log self account delete, logout on self account delete
Julian Lam f1ed3ad659 allowing favicon updating to be disabled via client side hook
pichalite 7010364e7e fix enable/disable button in ACP manage navigation page
Julian Lam 0368280e52 Merge pull request from manolino/patch-3
Update app.js
pichalite 511a4b7700 remove dashed border
barisusakli 24c56eb80a switch topic select to components
Julian Lam 07c55ee859 updated .fix-lists mixin
barisusakli e90cba65a8 closes
Manuel Valle 41963bb300 Update app.js
migrated global *translate* to a *require.js* module.
Manuel Valle 4c43276fce Update events.js
Tebbed indentation.
Manuel Valle 67d9323b9e Update events.js
Manuel Valle c9c761d70b Update events.js
This optimize previous commit. See [](https://github.com/NodeBB/NodeBB/pull/4078).  Added ```translator``` module instead of global ```translator```.
This solves warnings editing posts with *composer*.
Manuel Valle dbcb6f9796 Update events.js
Same problem as [](https://github.com/NodeBB/NodeBB/pull/4069).  Added a **translator** variable refering to **translator** module instead of global *translator*.
This solves warnings editing posts with *composer*.
Julian Lam 452bb953c9 Merge pull request from pichalite/master
fixes for rewards ACP page 
Julian Lam ff8fb0e9ab no need to set var, just use rjs
Julian Lam 6470f2ef53 Merge branch 'patch-1' of https://github.com/manolino/NodeBB into manolino-patch-1
Julian Lam 2cabf7a3d1 Merge pull request from pichalite/master
fixes 
barisusakli 32ca95319e closes
Julian Lam 9b02bb8f51 closes
Julian Lam 8608092bbb on new uploaded image, refresh profile edit page
Julian Lam 5a92b1a5cf change all instances of .avatar on new image upload
Julian Lam f18382a892 firing client-side hook on notification count update now
Julian Lam efa98d4858 language translations and fallbacks
Julian Lam 2d48faf5df Fixed
Also related to regression first caused by the fix to  from
fcb381f922

Also, added tests for translator. omg.
barisusakli 92b339ff1d much whitespace so wow
barisusakli 6802a76332 fix relative_path
barisusakli cb91587567 closes
Manuel Valle a60e3c63cf Update overrides.js
Inside **translate** function, **translator** refers to *global* genereting warnings. Added a **translator** variable refering to **translator** module.
This solves some problems using *bootbox* in my plugins and widgets
pichalite aaaab288ef ACP rewards page fix
pichalite ed74e590b5 Revert "fixes for rewards ACP page #3910"
This reverts commit 0c740293fc.
pichalite 0c740293fc fixes for rewards ACP page
pichalite ee529d92d3 fixes
barisusakli 46f2faaa05 closes
barisusakli ee9d0ac2da cleanup search, removed socketuser.loadSearchPage, use regular route
psychobunny 1a6f9dc3f4 Merge pull request from pichalite/master
Minor styling updates to ACP Categories page
pichalite 329e32901f style updates
barisusakli 694b96ea60 closes
psychobunny b3a98515e9 fixed ban/unban components
pichalite 90210350f9 Use Skin instead of Theme
psychobunny 7cc8390265 data.loggedIn for new posts
barisusakli ab6c84471b some search/sort changes
barisusakli 92f0e2d86a closes
added account/upvoted, account/downvoted, account/best
barisusakli ae9606f5ee closes
barisusakli da338a1341 fix typo
barisusakli 222ef14d7f added chat:autocomplete:init
barisusakli 1ad4128649 closes , closes
Julian Lam d67efa3a5b update core to allow composer to define static route
Barış Soner Uşaklı dd0560a4b8 closes
barisusakli 005db18120 closes
barisusakli 18013c5518 closes
psychobunny 70bbf41dc3 popular/tab component
Julian Lam 3664c94581 latest fallbacks
Julian Lam ebb954b0fa translations?
barisusakli 7ad90b4ef6 closes
Julian Lam fcb381f922 Fixes
Guests now trigger topic notifications, and the translator has
been updated so that translations inside translations are
handled in a way that doesn't cause the translator to explode.
Julian Lam 1660e13aed
Julian Lam a6d2700823 latest translations
barisusakli 51154c8726 closes
barisusakli 6be8675580 closes
barisusakli f8a114ba5c closes
barisusakli cf889b70bd closes
barisusakli 687d29a44b closes
barisusakli dffb57ba14 closes
Julian Lam ad9a1d0f2c closes
Squashed commit of the following:

commit 23de0708708ed190eafbcd6ea93d43333cb87aa3
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Dec 23 10:48:16 2015 -0500

    wired up session revocation, 

commit 45a3f18321b74a9b6893d404b6c870f1ec4d95cd
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Dec 23 09:49:27 2015 -0500

    session deletion via session uuid

commit 2bf87338cf9bfa2df0b299639421d8da7553c69a
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 22 13:53:35 2015 -0500

    WIP 

commit 623f45c3fa8b96f8b6eec0613eb7f9463348ab93
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 22 10:22:24 2015 -0500

    saving more metadata and displaying sessions in UCP 

commit d0567ed7cc33a1aea66e921b657f782038f32191
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 22 10:21:38 2015 -0500

    updated fontawesome to v4.5.0

commit 7131c97fe8ab42838eb2915a04e74f80f3d9a133
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 22 09:39:16 2015 -0500

    saving user-agent metadata into user session 

commit 661b7e6dba774b80b5dc6d04f89a79f809ff791e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 22 09:23:24 2015 -0500

    New user auth methods to add/revoke sessions, 
barisusakli ab0797a6d8 chat fixes
update bootstrap tags input
dont allow adding self to chat room
barisusakli df605babff closes
barisusakli abed319da2 closes
Julian Lam 85c1683a25 latest translations
sanatisharif f795ddc9cb Updated Persian translation
barisusakli 738b17cae6 closes
barisusakli 4bff714947 closes
dont remove topics if selection is in progress
barisusakli dff3d7f20e various group chat fixes
fix multiple modals using the same tagsinput
fix online user getting chat notification
fix owner not being able to remove users in the chat modal
barisusakli 1449d438f5 closes
barisusakli f0b333e8a1 closes
barisusakli 5e9a656709 Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat
Julian Lam 04879e6da2 updated jquery-timeago locales
Julian Lam 668adc5187 fixing bootswatch integration
Julian Lam af55f55b45 latest translations
barisusakli 26ac05dd5c Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat
Julian Lam a091067175 closes
Julian Lam 0af11c5c0c fallbacks for new notification groupings
barisusakli 5a26eb1c76 IS fix, timeago fix
barisusakli 3d79e0750b fix edit delete for rooms
barisusakli 992ca0a351 fix taskbar icon