Commit Graph

2172 Commits (0672c7276d548d9f745f73796e1fc825a9ef6ff1)

Author SHA1 Message Date
Julian Lam c9bb65133a Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 37f7d1d08a resolved issue
Baris Soner Usakli 22bc3e9571 added statuses into dropdown
Baris Soner Usakli 6fbed193f7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli aa856e2f5c closes
Julian Lam 77cacda0fa Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 748055ac52 hiding development block from ACP if not in dev mode
Baris Soner Usakli c122492470 added back the template if
Baris Soner Usakli 14b2fd050e Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli bdd4bb0003 closes #920'
Julian Lam 59d1a90820 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 1b794f00bd slovak updates
psychobunny 5b3862f58e updated links on ACP home page, part of
psychobunny 4647b88071 added optional forum terms of use to ACP, closes
psychobunny 347d402f48 closes
psychobunny e91ab5c660 closes
Julian Lam 4d23b46916 latest transifex changes
Julian Lam bb316bd949 new transifex strings
Julian Lam eff99ffabe fixed
Julian Lam 63437571b8 fixing header favicon to look for type as well
Julian Lam ec61d62c63 recommit to Transifex formatting
Julian Lam a137fb76ed Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam a940915e48 re-encoding some pt_BR language files in UTF-8
Baris Soner Usakli ab2b0e6560 fixed direct loading of popular page
Baris Soner Usakli 817546c6cf Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli a86ddc9934 closes
TedVJ 18051435e5 Fr translation - Flag
Baris Soner Usakli 36ae568349
Baris Soner Usakli e48014ba61 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 0f5b3ae859 added img-responsive to images in chat messages
Julian Lam 55b67ed735 Merge branch 'master' of github.com:designcreateplay/NodeBB
Conflicts:
	src/routes/api.js
Julian Lam 0376e3d574 renamed language directories to ICU standard, upgrade script, no longer promoting english at top of list in languages tab, en now en_GB, encompasses Canadian and English English
psychobunny 23c711947b added support for !array.length
psychobunny 0cca8e0bcf closes , support for array.length
Baris Soner Usakli efa45ad907 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 89e554b333 closes
psychobunny 112a9cb532 closes
psychobunny 303a32dce6 closes - app.alert strings are now passed through translator so we can finally start getting rid of the remainder of hardcoded strings
psychobunny c253760737 converted filter:posts.custom_profile_info to accept an array instead of building a string for better themability. closes
Baris Soner Usakli 8607ea9a84 notifications fix
Baris Soner Usakli a7d9944cc1 icons on register login in mobile menu
psychobunny 24d2ac270c changed notifications code to jq - prevents crashes if notification element does not exist
Julian Lam de751ed623 fixed - api calls hopefully no longer cached
Julian Lam fb2b54b314 refactored meta and link tag generation to template (yay frontend processing!)
cache busters now always added in template, instead of throughout code
Baris Soner Usakli 1a55f9217d turn off click events to prevent multiple calls'
Baris Soner Usakli 06ca569554 closes
Baris Soner Usakli d0702f663b disable scroll events on ajaxify'
Baris Soner Usakli 6a78221261 closes
Julian Lam fe8156793a Merge branch 'master' of github.com:henrock/NodeBB into henrock-master
Julian Lam 3f876fec80 added ajaxify.start and ajaxify.end client-side hooks
Julian Lam 38ee3fd5a3 don't bother firing hooks received by js unless a listener exists
Henrik Jerlenius 52ee5096af fixed translation on recent replies feed
Henrik Jerlenius 4f4fef3832 fixed another 'Fork' ;)
Henrik Jerlenius ec72818988 updated all swedish translations
Henrik Jerlenius 8fad39725b updated all swedish translations
Henrik Jerlenius b3718a1605 changed language info
Henrik Jerlenius 8784961e1e First commit on swedish translation
Julian Lam 133188f14c introducing cache buster to plugin CSS and loaded scripts
Baris Soner Usakli cccaf642a6 closes
Baris Soner Usakli ed401de169 closes
Baris Soner Usakli 5759b1b1a2 closes
Baris Soner Usakli f68b692ce4 closes
Baris Soner Usakli c06320e28b closes
Baris Soner Usakli c0184ba350 blocked
TedVJ 1cef31e47b Fr translation update
Julian Lam 4ae8824faf tweaks and formatting
Julian Lam 7edf041747 Merge branch 'master' of github.com:mattijle/NodeBB into mattijle-master
Julian Lam f51d525d9c errant semicolon
Julian Lam d924d01677 timeago fix for brasilian portugueso
Julian Lam aa81b25fe6 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 2d72956591 updated language files to match english pages.json
Julian Lam fac55160fa new translation strings for pages, proper unicode handling in parseFragment
Julian Lam e69f5fff3b added "pages" translation file to languages
TedVJ 9a876f7003 Fr Translation Update
Matti Leppänen 98c4b08f15 Merge remote-tracking branch 'upstream/master'
Leonardo Galani 90352cd858 adding brazilian portuguese language translations
Baris Soner Usakli 71ccd0854d fixes notification header icon
Baris Soner Usakli f874059fe9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 9cb232c198 added header tooltips
Julian Lam 8e1137b5dd Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam ef39c128c2 Removing Google Plus integration from core - adios!
Baris Soner Usakli 31a57cf0dd closes
Baris Soner Usakli d54e2fba9e closes
Matti Leppänen 4f495e2b46 quote gets added to the active composer instead of starting a new one.
Baris Soner Usakli c0e818afc6 closes
Baris Soner Usakli 26673d3ada delegated events in admin categories
Julian Lam 7e3c46db61 Removing Twitter SSO - toodles!
Julian Lam e7eab83d8f removing facebook SSO from core
Baris Soner Usakli 25442a89ca closes
Julian Lam 0c71707fb5 fixed
Julian Lam 0869765e2b Merge remote-tracking branch 'origin/master'
Julian Lam 22354227be hiding "Forgot Password" link using Plugins.hasListeners, instead of derpy config settings bool
Baris Soner Usakli 2560704839 recent unread cleanup
Baris Soner Usakli c6d48f477c fixes recent topic post notification
Baris Soner Usakli 14e68bc9e2 dropup for bottom post bar
Baris Soner Usakli 810095d287 fixed infinite loading on categories
Baris Soner Usakli 2988230b07 some more fixes, cant quote and see deleted messages
Julian Lam 5fde1eb3e7 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam d42beda3da added page selection if you click on the pipe
Baris Soner Usakli bf81159558 fixes a pagination bug
Baris Soner Usakli dcefad1427 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 1afd7ae332 trim pagination numberS
Julian Lam a240fc81ce fixed
Baris Soner Usakli 75f178636b more fixes
Baris Soner Usakli 1084523c92 lots of pagination work, query params, ajaxify to pids
Baris Soner Usakli 8744013013 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
Baris Soner Usakli 2e786cc4d1 closes , removed global translator, templates and server objects
Baris Soner Usakli b23960e8d7 fixes to category pagination
Baris Soner Usakli ef6fd35e85 lots of cleanup, moved pagination to requirejs module
Baris Soner Usakli aa73a10fc4 added pagination to vanilla topic template
Baris Soner Usakli 0580d0c8a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
Baris Soner Usakli 5f0c6e508d some cleanup
Baris Soner Usakli 606367701f pagination on posts
psychobunny 0a749023cb fixing if statements inside a @first / @last block
Baris Soner Usakli 8d007e7029 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
Baris Soner Usakli cf39c66017 some pagination work
Julian Lam e09132350d re-adding conditional to hide quote/reply block if no write perm
psychobunny 503e59b12b clean up conditionals only at the very end of parsing
Julian Lam 26848641cd restoring post/quote buttons pending template system fix for IFs
Julian Lam ab85ef6b7b fixed issue where back button stopped ajaxifying internally.
Julian Lam 459d5ddccd fixed - added proper detection so that onpopstate would not react if it was a proper page load
Julian Lam b587d7b5ad fixed issue where calls to ajaxify.go were sending in a "template" argument that had since been removed, navigating back to NodeBB from an external link now no longer clobbers the History stack.
Julian Lam ef450edfea Revert "possible fix to #840", please see
This reverts commit 1d666bf7f0.
Julian Lam dc7cd95f6d Merge branch 'master' of github.com:designcreateplay/NodeBB
Baris Soner Usakli f3bdc55348 little tweak to user search show timing and 10 users, sort after slicing
Baris Soner Usakli 1d666bf7f0 possible fix to
Baris Soner Usakli 3793ddc2e8 fixes user tooltips on infinit load
Julian Lam 2af14e47b1 Merge branch 'master' of github.com:designcreateplay/NodeBB
Baris Soner Usakli 824c5072e8 topics should be marked read correctly if you are already in it
Julian Lam a0e9e52e70 adding xregexp to ACP header
Baris Soner Usakli 47c32738a6 removed tests from acp
Julian Lam f02cd9df82 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
Conflicts:
	src/user.js
Matti Leppänen 4cfd970d5f Added Finnish language translation
Julian Lam 1e99945515 Merge branch 'yangwao-master'
Julian Lam f0e47e43bc fb and tw strings for traditional chinese
wao 7b150ab407 added Slovak language translation
Baris Soner Usakli 044382047d removed commented out section
Baris Soner Usakli 46fb6377ee fixed topic reply if title was 255, better notif text in unread and recent,removed console.log
Baris Soner Usakli 79803d2b3d Merge branch 'favourite-spy' of https://github.com/BitBangersCode/NodeBB into BitBangersCode-favourite-spy
MrWaffle d63ced8a5c Move to client side
MrWaffle b887b76c29 Implement favourite tooltip to show who favourited a post
Baris Soner Usakli 45d2affdfb closes
Baris Soner Usakli baa74958c5 can set image class for categories
Baris Soner Usakli eac6b23811 closes
Barış Soner Uşaklı c709fae251 Merge pull request from BitBangersCode/admin-group-fix
Admin group fix
Julian Lam 4c01fc4c0e Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 7db231ca54 traditional chinese language pack - 很好?
Baris Soner Usakli 9393a39452 fixes translation in recent
Josh 4c211b7110 Fixed tabbing/spacing
Josh Rickers 21f6b10023 fixed indenting
Josh Rickers f9e6fab3ea Fixed line spacing/tabbing
Julian Lam 53a1474785 second pass for , blocked for now
Julian Lam bafc8caaf5 first pass at
Josh Rickers 55b0270b34 Merge branch 'master' into admin-group-fix
Josh Rickers 4c36083354 Added yourid so it can be used in groups.js
Josh Rickers a91e464787 updated groups to stop you from removing yourself from the admin group
Baris Soner Usakli 56c789ed61 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli aa2978976c notif fix
Julian Lam 73d9d6e1d3 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 92706a6550 fixed
Baris Soner Usakli 74ccfd1e4d moved islatin out too
Baris Soner Usakli 8f8ea4de92 slug fix
Baris Soner Usakli 104ec7de6e last poster is visible, slugify check for latin
Baris Soner Usakli f107803550 fix
Baris Soner Usakli 039f02456d if user is in the topic when a new post comes in mark the topic read
Baris Soner Usakli 4cae491438 last one for the night
Baris Soner Usakli 93534832b9 small
Baris Soner Usakli 9cd2b36c97 minor fix to topic.tpl
Baris Soner Usakli a0b80e4061 shouldnt be in template
Baris Soner Usakli ccc62a202b dont go to top on search icon click
Baris Soner Usakli 0a1d45b0b9 default panle
Baris Soner Usakli 56fcae1cb2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 7c16a8be31 recent reply fix
Julian Lam cc236c1f72 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 39d9dd76dc removed preview button from ACP/themes
Baris Soner Usakli 55d4a5fe3a template fixes closes
Baris Soner Usakli 12a5b6b4c6 body margin for composer
Aziz Khoury 4fad334e18 Merge remote-tracking branch 'upstream/master'
Barış Soner Uşaklı 94f38d0622 Merge pull request from BitBangersCode/admin-fix
Confirmation when removing user from a group
Josh f7a290d0b3 removed function
removed function that did not work
Josh a86ff15f7b Removed code for yourid
removed code that will give the current user id in a var called yourid
Baris Soner Usakli 030cfbffa4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli ed1c276739 only drag chat modal from header
Josh f14ad11dd0 add remove user from group confirmation
Added confirmation request when removing user from a group.
Julian Lam 663aff4b24 fixed - bootswatch now using BootstrapCDN, scheme-independant URL
Aziz Khoury ba85ffb292 Merge remote-tracking branch 'upstream/master'
Julian Lam 2654a8e86a added cache buster to ACP theme
Julian Lam f9e8178d25 fixed timeagago for zh_cn
Aziz Khoury f74f01ca77 Changed User.create signature to accept a hash, added a couple of utility functions as well
Julian Lam d6ae91312e Merge branch 'master' of github.com:TheRealDrZ/NodeBB into TheRealDrZ-master
Conflicts:
	public/templates/composer.tpl
Julian Lam 95355f9036 added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary
Julian Lam 895bff9b62 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
Julian Lam cf69b9fcb3 fixed - issue where the bootswatch theme was loaded before vanilla, causing default bootstrap to override the bootswatch loaded bootstrap
akhoury 58525bd09c f'in arabs
Baris Soner Usakli 5a069f1076 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 84aa1ab527 motd string and class
Julian Lam 2cfe59f124 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam e542da1f52 added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins
Baris Soner Usakli 050ab738e4 fixed drop area top
Baris Soner Usakli d1ccc692ae pull right dropdowns