1313 Commits (d1e5944d3ff3c141acc251eef437a32f057bf31c)

Author SHA1 Message Date
Barış Soner Uşaklı c4e3d07940 feat: more merge fixes 5 years ago
Barış Soner Uşaklı 9a0cdd0eb2 feat: merge improvements wip 5 years ago
Julian Lam 09ee410375 fix: companion to nodebb/nodebb@4acb3fb21, fixes nodebb/nodebb#8387 5 years ago
Julian Lam bc71435856 fix: companion commit to nodebb/nodebb@4d60eac60f 5 years ago
Barış Soner Uşaklı 2c7b2f3f2e feat: add class to top as well 5 years ago
Barış Soner Uşaklı af9f20a0bf feat: add selected class to topic filter 5 years ago
Barış Soner Uşaklı 450459950e feat: dont display search options if user does not have privileges 5 years ago
Julian Lam fd65f45a24 feat: companion commit to nodebb/nodebb@8ea1634824 5 years ago
Barış Soner Uşaklı ad0cccbe7c fix: container 5 years ago
Barış Soner Uşaklı e65ec0fa15 feat: quick search changes 5 years ago
Julian Lam ec7146a11a feat: companion to nodebb/nodebb@525aae1ea2 5 years ago
Barış Soner Uşaklı 6ab532d910 feat: remove empty partial 5 years ago
Barış Soner Uşaklı c43c2ddbdb feat: add post-quick-reply language key 5 years ago
Barış Soner Uşaklı cde36609cc https://github.com/NodeBB/NodeBB/issues/8175 5 years ago
Barış Soner Uşaklı 91b46b1db4 fix: https://github.com/NodeBB/NodeBB/issues/8167 5 years ago
Barış Soner Uşaklı f76766a654 https://github.com/NodeBB/NodeBB/issues/8043 5 years ago
Andrew Rodrigues 5d29b46983 feat: add itemprop position for breadcrumbs 5 years ago
Andrew Rodrigues dfada97020
fix: https://github.com/NodeBB/NodeBB/issues/8130
update deprecated data-vocabulary.org to schema.org
5 years ago
Opliko 07d3317514 Add rel="noopener"
It's a good practice to make target="_blank" links to cross-origin destination not give any control over original window to the site that's opened if it's not needed. And it's not needed here.
Also, lighthouse complains about it, so this small change will improve the "Best Practices" score there :)
5 years ago
Julian Lam 30f0c1a4d3 fix: #494 5 years ago
Barış Soner Uşaklı ee7b79f202 fix: https://github.com/NodeBB/NodeBB/issues/8047 5 years ago
Baris Usakli d3cffde303 https://github.com/NodeBB/NodeBB/issues/8034 5 years ago
Julian Lam ec05411502 feat: template for nodebb/nodebb#8024 5 years ago
Barış Soner Uşaklı eb33ae7fa1 https://github.com/NodeBB/NodeBB/issues/8018 5 years ago
Barış Soner Uşaklı 48dfeef4d7 fix: move whitespace to the front 5 years ago
Baris Usakli f5a975aa1d add dropdown too change all categories at once 5 years ago
Aziz Khoury 5b536b8892 added loginFormEntry in the login form, to support captcha on login page (#490)
* added loginFormEntry in the login form, to support captcha on login page

* rm wrong class

* indentation fix?

* indentation fix?

* indentation fix?
5 years ago
Barış Soner Uşaklı d00133fa63 match search style to quick search 5 years ago
Barış Soner Uşaklı 2f64dd9bab fix: closes https://github.com/NodeBB/NodeBB/issues/7813 5 years ago
Julian Lam 4d9057460c feat: theme changes for nodebb/nodebb#7770 5 years ago
Barış Soner Uşaklı c53a1b0e7d fix typo 6 years ago
Barış Soner Uşaklı a55b3e74a0 https://github.com/NodeBB/NodeBB/issues/7791 6 years ago
Baris Usakli baf3a5cd70 feat: load->DOMContentLoaded 6 years ago
Julian Lam ab21ebd960 feat: theme changes for nodebb/nodebb#7330 6 years ago
Barış Soner Uşaklı 87f2215cd5 https://github.com/NodeBB/NodeBB/issues/7763 6 years ago
Barış Soner Uşaklı 3c00f80609 fix: groups page not rendering users 6 years ago
Barış Soner Uşaklı d4b578f0bd fix: dont display to regular users 6 years ago
Baris Usakli 1557323297 fix: flags page history 6 years ago
Barış Soner Uşaklı b3a6ef5b22
https://github.com/NodeBB/NodeBB/issues/7083 (#484) 6 years ago
Barış Soner Uşaklı 4a8f11c801 https://github.com/NodeBB/NodeBB/issues/7751 6 years ago
Julian Lam 69f4248f72
feat: functioning category dropdown in recent/unread/etc without js (#483)
* 10.1.0

* feat: WIP nojs category dropdown in recent

* feat: allowing new topic button to be clicked without js

It now opens a category dropdown which then sends user to
the discrete composer page.

WARNING: Does not work on tag.tpl. Needs core update to send
categories data through...

* fix: removed unneeded data-toggle attribute
6 years ago
Barış Soner Uşaklı 76363b80ba add sort to watched topics 6 years ago
Aziz Khoury 93fe46d5a5 feat: changing widget-* to data-widget-* (#479) 6 years ago
Barış Soner Uşaklı 1fa2af9920 fix tags not displaying on topics_list partial 6 years ago
Barış Soner Uşaklı 36e1e26502 add posts_list_item.tpl
show best and latest posts on profile
6 years ago
Baris Usakli 2b7f561082 closes #482 6 years ago
Julian Lam a86df050db
feat: change legacy begins to each (#478)
* refactor: change legacy begins to each

* fix: missed a couple ends

* fix: derped find-replace

* fix: referencing non-existent root object in categories teaser
6 years ago
Barış Soner Uşaklı d32e461481 https://github.com/NodeBB/NodeBB/issues/7659 6 years ago
Julian Lam b3a9fb8ce0 fix: missed a couple avatars 6 years ago
Julian Lam d460ce328c
refactor: theme changes for buildAvatar (nodebb/nodebb#7681)
* fix: using new avatar helper

* fix: using helper in flag details page

* feat: using new avatar helper

* fix: more changes to use buildAvatar

* fix: bump nbbpm.compatibility to exclude 1.12.x
6 years ago
Barış Soner Uşaklı 6cb435ef22 match templates 6 years ago
Barış Soner Uşaklı 308dbd19c5 Update category-selector.tpl 6 years ago
Baris Usakli 19fe41b64e https://github.com/NodeBB/NodeBB/pull/7568 6 years ago
Andrew Rodrigues a9dc5fa8a1 fix: https://github.com/NodeBB/NodeBB/issues/7576 6 years ago
Andrew Rodrigues a3ce44fab5 fix: accounts/edit/* allow form submission by pressing enter 6 years ago
Andrew Rodrigues 98c9280417 fix: missing multipart/form-data 6 years ago
Andrew Rodrigues 41574ea8e6 fix: additional change for uploading files in registration interstitial 6 years ago
Andrew Rodrigues e818563d05 feat: allow file uploading registration interstitial 6 years ago
Barış Soner Uşaklı 7b18448319 Merge branch 'master' of https://github.com/NodeBB/nodebb-theme-persona 6 years ago
Barış Soner Uşaklı 71dbd127b4 https://github.com/NodeBB/NodeBB/issues/7468 6 years ago
Andrew Rodrigues 67a69db907 fix: https://github.com/NodeBB/NodeBB/issues/7446 6 years ago
Baris Usakli ea3e7a2661 https://github.com/NodeBB/NodeBB/issues/7358 6 years ago
Sebastian Sycz 77962c81ba fix not showing IPs (#468) 6 years ago
Julian Lam e0328d0f37 closes #467 6 years ago
Baris Usakli 8c17089082 remove hr on last element 6 years ago
Barış Soner Uşaklı be861d1df9 quick search 6 years ago
Barış Soner Uşaklı c9d30350c4 quick search 6 years ago
Barış Soner Uşaklı 63e17fb55b Merge branch 'master' of https://github.com/NodeBB/nodebb-theme-persona 6 years ago
Barış Soner Uşaklı eed527fcb0 https://github.com/NodeBB/NodeBB/issues/7338 6 years ago
Peter Jaszkowiak 6127b23914 Fix #442: Improve chat controls UI 6 years ago
Barış Soner Uşaklı 7dd4066aa3 https://github.com/NodeBB/NodeBB/issues/7300 6 years ago
Peter Jaszkowiak 639c37a57e Fix #385: logo now has cachebuster 6 years ago
Julian Lam 1091482fcd nodebb/nodebb#7270 6 years ago
Julian Lam ade3862624 nodebb/nodebb#7270 6 years ago
Julian Lam ffce15000f theme changes for nodebb/nodebb#7266 6 years ago
Barış Soner Uşaklı 16856c33ad add hidden attribute https://github.com/NodeBB/NodeBB/issues/7100 6 years ago
Barış Soner Uşaklı de1fffb22a
Category watch state (#445)
* feat: pass data to client

* add state fix category new topics alert

* update watch tpl

* add UCP option for category watch state
6 years ago
Barış Soner Uşaklı 3ec8718d84 remove embeded move thread modal
its loaded when move topic is clicked
6 years ago
Barış Soner Uşaklı 88f790b818 add selected category 6 years ago
Barış Soner Uşaklı cd2d43799e alert wont push back topic list 6 years ago
Barış Soner Uşaklı 156ed251ef adjust width 6 years ago
Barış Soner Uşaklı a1a0246c3e a more compact advanced search 6 years ago
Barış Soner Uşaklı e7696a596b https://github.com/NodeBB/NodeBB/issues/6928 6 years ago
Barış Soner Uşaklı abe7d03d6c https://github.com/NodeBB/NodeBB/issues/6960 6 years ago
Barış Soner Uşaklı a605a536a2 remove delayimageloading setting 6 years ago
Barış Soner Uşaklı 95c46f5fa8 Merge branch 'master' of https://github.com/NodeBB/nodebb-theme-persona 6 years ago
Barış Soner Uşaklı a92d12bd09 add thumb for navigator 6 years ago
Sebastian Sycz e0211f1d9b Blocking chat/flag/block for guest 6 years ago
Sebastian Sycz 91b6062da3 Block changing items. (#439)
* Block changing items.

Buttons for editing, deleting, changing items blocked for guests and other users on our profile.

* Update header.tpl

* Update header.tpl
6 years ago
Barış Soner Uşaklı d4cf573c89 add tooltip 6 years ago
Barış Soner Uşaklı 3f79519403 Merge branch 'master' of https://github.com/NodeBB/nodebb-theme-persona 6 years ago
Barış Soner Uşaklı ae99aefdc3 add fa-fw 6 years ago
Julian Lam dc16a3fe98 fix: toPid link not working on subfolder installs
Was missing relative_path argument

Closes nodebb/nodebb#6948
6 years ago
Barış Soner Uşaklı d46002860b https://github.com/NodeBB/NodeBB/issues/6932 6 years ago
Barış Soner Uşaklı dbcaf86e14 Merge branch 'master' of https://github.com/NodeBB/nodebb-theme-persona 6 years ago
Barış Soner Uşaklı 517aa2661c fix user tooltip on search 6 years ago
Julian Lam dd29c0a17b feat: theme change for server-side skins 6 years ago
Barış Soner Uşaklı bb919e17cc add reply icon on mobile 6 years ago
Barış Soner Uşaklı dd2c767cc3 closeshttps://github.com/NodeBB/NodeBB/issues/6865 6 years ago
Julian Lam 3b6e6db02f feat: show spinner when loading sidebar, complements 8ebc7dcc1d 6 years ago
Barış Soner Uşaklı d32435975f add not-responsive class to user images 6 years ago
Julian Lam d4b20749d6 move slideout and chat menus to partials 6 years ago
Julian Lam 06a19b425c Revert "Fix #432"
This reverts commit 3598ffdb5b.
6 years ago
Julian Lam 3598ffdb5b Fix #432
Wrap logout button in form-group, was missing it when the button
was refactored to not require js.
6 years ago
Julian Lam 0cb7455a1f fixes #245 6 years ago
Barış Soner Uşaklı aa9d1e247c #360 6 years ago
Barış Soner Uşaklı 39110c4b82 Merge branch 'master' of https://github.com/NodeBB/nodebb-theme-persona 6 years ago
Barış Soner Uşaklı 07fe83e78e closes #363 6 years ago
André Zanghelini 2746ecf3df Move chat icons above message (#429) 6 years ago
Julian Lam 3d229223ba closes #397 6 years ago
Barış Soner Uşaklı f5e9eebbd1 https://github.com/NodeBB/NodeBB/issues/6822 6 years ago
Baris Usakli fd89e0c286 add nesting to categories on account/watched_categories 6 years ago
Baris Usakli f45e083ebc move watched categories 6 years ago
André Zanghelini 2a213a6c1e Add settings page to control watched categories (#422) 6 years ago
Barış Soner Uşaklı de81453885 Merge branch 'master' of https://github.com/NodeBB/nodebb-theme-persona 6 years ago
Barış Soner Uşaklı 79215282f7 dont add status if its not set 6 years ago
Julian Lam f942385e6e nodebb/nodebb#6691 6 years ago
Julian Lam d44ef3bd8e updated submit button to use language string in registerComplete.tpl 6 years ago
Barış Soner Uşaklı f6b0d30153 add user icons to ban page 6 years ago
Barış Soner Uşaklı 7b6c7fb41f add paginator to group members page 6 years ago
Julian Lam 870fd94707 new tpl for nodebb/nodebb#6678 6 years ago
Julian Lam 87d417624e theme changes for nodebb/nodebb#6726 6 years ago
Anil Mandepudi 67f0918460 Fixes #420 (#425)
* Fixes #420

* fix indent

* Update bottom-sheet.less

* Update bottom-sheet.less
6 years ago
Julian Lam d33d965ffb moved 'see all chats' link to chat/list component 7 years ago
Thomas Johnston a1a2346747 Adding "See all chats" link to mobile chat slideout 7 years ago
Dravere 106f5d7be3 Fixed the listing of custom profile info on posts (#423) 7 years ago
Julian Lam 00477b69b9 added close button to message-window in chats 7 years ago
Julian Lam a9b575e11b Revert "moved js back to header for interpolation, nodebb/nodebb#6664"
This reverts commit b03dd5d98e.
7 years ago
Julian Lam b03dd5d98e moved js back to header for interpolation, nodebb/nodebb#6664 7 years ago
Julian Lam 4541538ee7 theme changes for #6663 7 years ago
Andrew Rodrigues 155a18d90f
updated footer comment 7 years ago
Julian Lam 230c907ed1 reword comment in footer, re: nodebb/nodebb#6649 7 years ago
Julian Lam 974cbe521c theme changes for nodebb/nodebb##6560 7 years ago
Barış Soner Uşaklı 9cc461b6b1 https://github.com/NodeBB/NodeBB/issues/6624#issuecomment-401855330 7 years ago
Barış Soner Uşaklı d9ad68c2ab https://github.com/NodeBB/NodeBB/issues/6607 7 years ago
Barış Soner Uşaklı 8cc6115805 https://github.com/NodeBB/NodeBB/issues/6579 7 years ago
Barış Soner Uşaklı f8daf6a3fd removed name from data attribute 7 years ago
Julian Lam 5e38689d09 nodebb/nodebb#6425 7 years ago
Julian Lam 5b3c482a00 nodebb/nodebb#6533 7 years ago
Barış Soner Uşaklı 1e80a42b4e https://github.com/NodeBB/NodeBB/issues/6250 7 years ago
Barış Soner Uşaklı 369741d90b add IP 7 years ago
Barış Soner Uşaklı deaa058374 show pagination on uploads 7 years ago
Barış Soner Uşaklı 0daa17d668 https://github.com/NodeBB/NodeBB/issues/6529 7 years ago
Barış Soner Uşaklı 18fbe73ab3 https://github.com/NodeBB/NodeBB/issues/6464 7 years ago
Barış Soner Uşaklı 89991faf43 fix export urls https://github.com/NodeBB/NodeBB/issues/6524 7 years ago
Moritz Schmidt 96be61f0ec fix template typo (#416) 7 years ago
Julian Lam 599a1ef391 tpl changes for nodebb/nodebb#6487 7 years ago
Julian Lam 88f244e67b change manage room button text, nodebb/nodebb#6479 7 years ago
Julian Lam 681cf7209c nodebb/nodebb#6479 7 years ago
Julian Lam ccceca40e3 whitespace fixes 7 years ago
Julian Lam f31a6dedd0 updated UCP template for nodebb/nodebb#6463 7 years ago
Julian Lam 64b99ad004 tpl changes for nodebb/nodebb#6463 7 years ago
Barış Soner Uşaklı de3c9866b8 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Barış Soner Uşaklı 0a38e6afb3 https://github.com/NodeBB/NodeBB/issues/6433
show multiple badges on profile page as well
7 years ago
Julian Lam 03edf729b7 re: nodebb/nodebb#6408 7 years ago
Julian Lam b10501915a updates to consent tpl for nodebb/nodebb#6441 7 years ago
Barış Soner Uşaklı fa3d16392f change url to name 7 years ago
Barış Soner Uşaklı 267ab06380 https://github.com/NodeBB/NodeBB/issues/6431 7 years ago
Barış Soner Uşaklı 9a2837a545 changed icon to trash 7 years ago
Julian Lam 8ae70bc566 consent.tpl for nodebb/nodebb#6430 7 years ago
Barış Soner Uşaklı c093a15d62 profile menu link to uploads 7 years ago
Barış Soner Uşaklı 1b1ec220f0 user uploads page 7 years ago
Barış Soner Uşaklı 154f7b8ed3 multi badge changes 7 years ago
Barış Soner Uşaklı efb65cfce8 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Julian Lam 2da45f5a34 add noreferrer and noopener to anchors containing external links 7 years ago
Barış Soner Uşaklı 09a96bbf8c https://github.com/NodeBB/NodeBB/issues/6358 7 years ago
Julian Lam 39e1e2d513 moved settings link to below edit, in account menu 7 years ago
Barış Soner Uşaklı 7de7b63136 add match words to search.tpl 7 years ago
Julian Lam e98bf6dd18 fixes #6362 7 years ago
Julian Lam f8a0e9cbc4 changed chat send button text re: nodebb/nodebb#6192 7 years ago
Julian Lam 28a008063b fixes #410 7 years ago
Julian Lam 6abd32db8c minor style change to loading text in notifications and chats dropdown, nodebb/nodebb#6354 7 years ago
Julian Lam 52543fda85 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam 86c023ec3f flag page changes for nodebb/nodebb#6043 7 years ago
Andrew Rodrigues f510779fbd
ip blacklist is available to global mods as well 7 years ago
Julian Lam a5acacd27b Merge branch 'develop' 7 years ago
Barış Soner Uşaklı d6da70474b fix template 7 years ago
Barış Soner Uşaklı 98315ad1c6 https://github.com/NodeBB/NodeBB/issues/6334 7 years ago
Barış Soner Uşaklı 6601a5e9b0 https://github.com/NodeBB/NodeBB/issues/6338 7 years ago
Julian Lam b4900447ce added missing modal 7 years ago
Julian Lam 193fb30068 added button to post history, and added component to edit indicator in posts 7 years ago
Julian Lam 40c28bcf8b Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı 95b823bc2a https://github.com/NodeBB/NodeBB/issues/6311 7 years ago
Barış Soner Uşaklı 7b10f5ceb4 add acpLanguages 7 years ago
Barış Soner Uşaklı c0a3e78433 add classes to different stats 7 years ago
Julian Lam 079a6405df Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam 1a3f1f9d6f Moved account info to profile menu, hiding icon if not defined. 7 years ago
psychobunny 7e3b1a10cf hide topic votes on category view when reputation system is disabled 7 years ago
Barış Soner Uşaklı 1c78303381 https://github.com/NodeBB/NodeBB/issues/6287 7 years ago
Barış Soner Uşaklı bd3e5b079c https://github.com/NodeBB/NodeBB/issues/6248 7 years ago
Julian Lam 2bbd2ad37b nodebb/nodebb#6262 7 years ago
Julian Lam 29164c74ad RTL fixes for chat and chat modal, #6192 7 years ago
Baris Usakli 245c83c375 change move post modal 7 years ago
Julian Lam eb966cdf9c Merge branch 'master' into develop 7 years ago
Barış Soner Uşaklı 5a3e40b999 fix typo in template 7 years ago
Barış Soner Uşaklı d8e279ced7 add rep settings 7 years ago
Julian Lam 4c2e2f09da Squashed commit of the following:
commit 2b66f7cfccfeb7578b1ebdd6955464a29517566b
Author: Julian Lam <julian@nodebb.org>
Date:   Thu Jan 11 15:22:23 2018 -0500

    chat tweaks on persona and fixing taskbar integration for group chats

commit c4f6735025a981b4591f3d0b82e2897f72e43d4b
Author: Julian Lam <julian@nodebb.org>
Date:   Wed Jan 10 15:12:54 2018 -0500

    ported revamped vanilla chats page and modal to persona, nodebb/nodebb#6192
7 years ago
Julian Lam 4f3544ab5f Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı a0a880cecd https://github.com/NodeBB/NodeBB/issues/6212 7 years ago
Julian Lam f440ae6631 Merge branch 'master' into develop 7 years ago
Barış Soner Uşaklı d99209790f add missing space 7 years ago
Peter Jaszkowiak e5dc7b0fa0
Merge pull request #391 from RoiEXLab/alt-addition
Remove uneccessary text/css definition
7 years ago
Julian Lam cdcc3a9e91 theme changes for nodebb/nodebb#6181 7 years ago
Peter Jaszkowiak bff38277d2 Merge branch 'master' of github.com:nodebb/nodebb-theme-persona 7 years ago
Peter Jaszkowiak 73ead79389 NodeBB/NodeBB#6178 7 years ago
Julian Lam 9b0651f751 theme changes for nodebb/nodebb#6177 7 years ago
Julian Lam bdf1b6d785 exposing ability to upload image by url, always 7 years ago
Barış Soner Uşaklı b6741850e0 tpl changes 7 years ago
Barış Soner Uşaklı ab01abc804 add sort option 7 years ago
Barış Soner Uşaklı 53a837f61c add top template 7 years ago
Barış Soner Uşaklı 0f5029a7aa dont show alert if user doesnt have posting priv 7 years ago
Baris Usakli 58ea2fb3bb https://github.com/NodeBB/NodeBB/issues/4804 7 years ago
RoiEX 7099209173 Remove uneccessary declaration 7 years ago
Peter Jaszkowiak 8a789b9d22 Style improvements
- Remove menu button borders
- Make menu buttons full height
- Make overlay white instead of grey
7 years ago
Peter Jaszkowiak 7cc987ece2 Show setting in column, fix button width sizes 7 years ago
Peter Jaszkowiak 78580d7be1 Move chats to a separate slideout menu on the right side
- Switched to the Pulling library
- Moved nav menu to the left side, as is normal elsewhere
- Added chat button on right side
- Unread icon on it shows unread chats
- Added slideout menu on right for only chats
- Both sides will slide open and everything
- Switched to drawer menus instead of the previous reveal style menus
7 years ago
Julian Lam 456ecff1bc rework SSO associations table, closes nodebb/nodebb#5955 7 years ago
RoiEX 05b5ce7482 Fix another bunch of HTML violations (#383)
* Fix desciption

(Subdescription icon shrunk 4 pixels in size)

* Use valid HTML

* Change inline div to span

* change name attribute to id

* Use rem instead of pixels
7 years ago
Peter Jaszkowiak 9b87b90685 NodeBB/NodeBB#6087 7 years ago
Barış Soner Uşaklı 0788e6ee42
Notification delivery (#386)
* settings template change

* remove usused settings
7 years ago
Barış Soner Uşaklı 3e19a18b3c https://github.com/NodeBB/NodeBB/issues/6044 7 years ago
Julian Lam 54db7fb96e Merge branch 'master' into develop 7 years ago
Barış Soner Uşaklı e0d391dc49 add menu link to post queue 7 years ago
Julian Lam f8a0f1fa0c UX changes for nodebb/nodebb#6018 7 years ago
Barış Soner Uşaklı b076c023dd https://github.com/NodeBB/NodeBB/issues/6013 7 years ago
Baris Usakli c0090908fb Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	.gitignore
7 years ago
Baris Usakli 06e1c79ca5 https://github.com/NodeBB/NodeBB/issues/6005 7 years ago
Barış Soner Uşaklı 2dd3a3e251 closes https://github.com/NodeBB/NodeBB/issues/6009 7 years ago
Julian Lam 251f653ebd Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam c62aedbaf6 Support customHTML/customJS (#380)
* nodebb/nodebb#5980

- Introduced customHTML field
- Moved customJS to footer

* switched to using defer only for scripts in footer, nodebb/nodebb#5980
7 years ago
Baris Usakli ae7cbf5781 https://github.com/NodeBB/NodeBB/issues/5944 7 years ago
Julian Lam 47429db8a6 Restoring 788399c86d, nodebb/nodebb#5733, for develop branch
This reverts commit 5eb60bd110.
7 years ago
Julian Lam 5eb60bd110 Revert "moving minfile and custom scripts to the footer, nodebb/nodebb#5733"
This reverts commit 788399c86d.
7 years ago
Julian Lam e7494a19fb Merge branch 'develop' 7 years ago
RoiEX 1918214fb3 Merge branch 'master' into patch-1 7 years ago
RoiEX 6e6dd1e90b Inline span 7 years ago
Julian Lam 788399c86d moving minfile and custom scripts to the footer, nodebb/nodebb#5733 7 years ago
Baris Usakli 1f8ec3a9ac add clearfix 7 years ago
Julian Lam 5dd6d822d2 Merge branch 'develop' 7 years ago
Barış Soner Uşaklı 62bf56a9f0 https://github.com/NodeBB/NodeBB/issues/5888 8 years ago
Barış Soner Uşaklı ed85ff0854 if there are not categories/filters dont show dropdowns 8 years ago
Barış Soner Uşaklı a0ff93514d add display_flag_tools 8 years ago
Barış Soner Uşaklı 78bd73122a change data attribs 8 years ago
Julian Lam 64cdca5444 theme changes for nodebb/nodebb#5873 8 years ago
Barış Soner Uşaklı 045b659be6 fix missing template names 8 years ago
Julian Lam 9552bf086e removing breadcrumbs from chat 8 years ago
Julian Lam 7fda459594 re: nodebb/nodebb#5862, added new components and moved chat message list to its own partial 8 years ago
Baris Usakli 5c368b6db9 https://github.com/NodeBB/NodeBB/issues/5857 8 years ago
Julian Lam bbb2a87a72 closes NodeBB/nodebb-theme-persona#370 8 years ago
Baris Usakli bda5cc36cd https://github.com/NodeBB/NodeBB/issues/5775 8 years ago