Commit Graph

12133 Commits (0c1376c884fd3eee181ce9bcafe910b7a0dfee30)
 

Author SHA1 Message Date
Julian Lam e3db66d29a updated versioning for v0.9.4
barisusakli 46b1756c97 up deps
Julian Lam 95d6895f13 Merge pull request from pichalite/master
fix Mac platform case
barisusakli e9c488d489 closes
barisusakli 92fba4f396 closes
barisusakli f512cb543f closes
barisusakli 878b7b21ee closes
barisusakli e4cae9391c moved ips down
pichalite eba107cef4 fix Mac platform case
psychobunny e37cbca977 closes
psychobunny e8b1903586
psychobunny afbf7de92a up persona
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 27d4426e06 up persona
psychobunny 911892c5b0 closes
psychobunny 99719414fe closes
psychobunny e069150625 closes
pichalite 991d85cae2 account for search input when calculating recent list height on expanded chats
psychobunny efb6a9fe7e added option to skip asset compilation on initial grunt startup with --skip flag
psychobunny b18052210d closes
psychobunny 637c20f44d closes
Julian Lam 946a082eaa latest translations and fallbacks
psychobunny 072089e39c up persona
psychobunny b8eb19b991 closes
psychobunny 75917e25b3 closes
psychobunny 1dba781923 closes
psychobunny 92810527ea closes
psychobunny a3530340a9 Merge pull request from pichalite/issue-4228
throw error in chat if no users in room
psychobunny cd0cb5c5f1 closes
Julian Lam ff8e1b52e0 fixed
Julian Lam 322d4052b0 chat controls now hidden instead of taking up space in chat modal
psychobunny a0a98e64b7 closes
psychobunny 4a12a06745 closes
psychobunny d0862911d3 closes
Julian Lam 3b76b0343b Revert "fixes NodeBB/nodebb-theme-persona#218"
This reverts commit ee529d92d3.
barisusakli 2b90040c31 closes
barisusakli 6951dc1fe2 closes
barisusakli 58a849f206 up composer default
barisusakli 738b892074 closes
barisusakli 4608b8f07b closes
barisusakli 46c8101c5c closes
pichalite 6ecc05afd4 throw error in chat if no users in room
psychobunny 18bc7713ef Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny 933115a853 almost had a heartattack when I saw 121 changed files in this conflict
# Conflicts:
#	src/meta/templates.js
Julian Lam 2cf42f55f5 latest translation
psychobunny 914fc1543e meta/templates.js refactor
psychobunny da5494fdf1 allow recursive base templates
ex. custom theme based off lavender which is based off vanilla
Julian Lam 13dfe6cd51 Merge pull request from pichalite/issue-4241
don't mention guest on reply