Commit Graph

4496 Commits (394497c9d5d6cb514f8f9c9a01f48d8af9d59bea)

Author SHA1 Message Date
Julian Lam 394497c9d5 Merge branch 'categories-parent-acp' of https://github.com/NicolasSiver/NodeBB into NicolasSiver-categories-parent-acp
Julian Lam f0064ac11f updated to latest translations
psychobunny f1f028b89c Merge pull request from yariplus/patch-1
Fix specificity on ACP widget panel heading.
psychobunny 18bfa44586 fixed menu items not being highlighted when active in acp
psychobunny 2dfb9837a7 log
Barış Soner Uşaklı 507fb225a2 removed console.log
Barış Soner Uşaklı 4420e7a9fc closes , closes
psychobunny 05c5196965 closes
Nicolas Siver a17c65ee9f move item template to file
Barış Soner Uşaklı b717da0229 Merge pull request from pitaj/master
Fixed translator backwards compatibility issue
barisusakli 045d9df81f closes
Nicolas Siver 1bfb41bccb sorting tree
Nicolas Siver a77641c3ca add new vendor script for sorting
Nicolas Siver 46ce3aae9f tree view
psychobunny a355fbfc81 closes
psychobunny d51407834d closes
psychobunny b96018b0f5 closes
Julian Lam af8732fcb9 latest translations and fallbacks
Julian Lam f9053c077d updated groups ACP styling and template to use a table, like categories
Conflicts:
	src/views/admin/manage/groups.tpl
Julian Lam 06f7172c65 closes
Barış Soner Uşaklı 03bc317065 Merge branch 'master' of https://github.com/NodeBB/NodeBB
Conflicts:
	src/views/admin/manage/groups.tpl
Julian Lam b45335c6ba updated groups ACP styling and template to use a table, like categories
Barış Soner Uşaklı 7bed4c40d6 closes
Julian Lam 8f7416d1cb updated acp category privilege settings so that not all groups are shown in privilege table, closes
Julian Lam 3b891ed7d8 closes
Julian Lam 3055ee96a1 latest translations and fallbacks
psychobunny f698d28dfb one last fix for
psychobunny 7b81c5db9f
psychobunny 79fd5a4d8e closes
psychobunny 63a2a20fd3 remove the old history.pushState hack for mobile composer
psychobunny 55bed3464e if mobile, go to /compose route
Julian Lam f6181e6481 fixes
Ole R. 22e227a6cd fixed error-report within translator.js
reported by [rex-huang](https://community.nodebb.org/user/rex-huang), see https://community.nodebb.org/topic/4520/error-handling-is-wrong-in-translator-js
Timothy Fike 8414e31730 Fix specificity on panel heading.
Needs to be specific so I can put an accordion inside. 😎
barisusakli 4f37d268b6 removed sort by username
barisusakli 5f23f04423 Merge remote-tracking branch 'origin/master' into user-search
barisusakli fbdae8fe1d return time and matchcount on page switch
barisusakli aa577f4adc part 1
no upgrade script yet
Julian Lam 93df7f14d8 latest translations and fallbacks
Julian Lam 05049946d4 updated error strings
psychobunny 60f9fc17ae
psychobunny 56e5f505a0 no need to yell! :p
Julian Lam ec91efdd2d latest translations and fallbacks
barisusakli 30a9b66b31 fix room enter
barisusakli 10de7a92e4 dont let joining other uid rooms
psychobunny 9c2a98486a fixed tag topic count color in ACP
psychobunny a88ad903af action:ajaxify.dataLoaded
barisusakli b292aeea72 closes
also dont allow loading posts of a topic if its deleted via
topics.loadMore
barisusakli be1865da2d closes
barisusakli 0083d4ff1c return user settings in api