Commit Graph

15453 Commits (bb11d286cecc796f4fc93915059ac0b978458177)
 

Author SHA1 Message Date
psychobunny fa25dcd6a5 move ACP category selector in line with pills
psychobunny 9cb5f71e08 also don't show category section in subcategory listing
psychobunny 65a015a1ad up lav
psychobunny 88d5f97280 closes
psychobunny 22891215cd Merge branch 'master' of https://github.com/NodeBB/NodeBB
Misty (Bot) 9031c5a2a6 Incremented version number - v1.5.1
psychobunny 179b11b7d2 ACP allow ctrl-click to open new in new tab when settings are unsaved
Baris Usakli 883b35243f fix lint
Baris Usakli d7684b042f fix tab
Baris Usakli 1fa52267d4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/src/admin/manage/category.js
Baris Usakli de5fe25e57 closes
Barış Soner Uşaklı 59b1d8fbae Merge pull request from NodeBB/_lodash
Switch from underscore to lodash
psychobunny 292c04a613 Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny dcbe4864a9 fix bad merge / dupe code
Peter Jaszkowiak d4e7db45b7 Use zipObject, more test-related ignores
Baris Usakli dc0971c122 up composer
Peter Jaszkowiak 3da2e1f07f Merge branch '_lodash' of github.com:nodebb/nodebb into _lodash
psychobunny dd90b14d64 up tjs
Misty (Bot) 25a84d7314 Latest translations and fallbacks
Peter Jaszkowiak dfbb96d47b Remove require.main.require
Peter Jaszkowiak 7127f34818 Fix indent
Barış Soner Uşaklı 9664033b73 add memory usage to info page
Barış Soner Uşaklı 932247f440 up deps
Barış Soner Uşaklı 8eb5564977 fix popular sort
Misty (Bot) 57c0861310 Latest translations and fallbacks
Barış Soner Uşaklı 850b33d630 up composer
Barış Soner Uşaklı 3049f5cf1f test
Barış Soner Uşaklı 6635b50c35 closes
Barış Soner Uşaklı 937d6dd4df fix acp privilege page not loading
Barış Soner Uşaklı eed784f1e6 Merge pull request from NodeBB/issues-bugs
Bugs and features only, comment out examples
Barış Soner Uşaklı 5e90e4db02 closes
Barış Soner Uşaklı 08aaabd33c closes
Peter Jaszkowiak 38d27e9347 Wrong URL
Peter Jaszkowiak afb79e97eb Ignore normalised image
Peter Jaszkowiak 3c2d4fe649 Switch from underscore to lodash
Peter Jaszkowiak 283951e810 Bugs and features only, comment out examples
Misty (Bot) 033c31719a Latest translations and fallbacks
Barış Soner Uşaklı 890c2eff70 style changes
Barış Soner Uşaklı bcc566fb68 remove unnecessary checks
Barış Soner Uşaklı f1b8492164 remove unnecessary checks
Barış Soner Uşaklı 6a742ead38 style
Barış Soner Uşaklı 8e31ec7199 closes
Barış Soner Uşaklı 3d1b1a9423 closes
Barış Soner Uşaklı dcf3db104b search style
Barış Soner Uşaklı 9ec65db539 closes
Barış Soner Uşaklı 271c10c9d7 dont create indices after every test
Barış Soner Uşaklı 21d2e6df12 Merge pull request from NodeBB/tests-after-each
Fix many "duplicate key" errors
Peter Jaszkowiak b171f3072b Fix many "duplicate key" errors
- Reset defaults after every test
- Remove individual `after(db.emptydb)` calls
- Fix async.every in groups test
- Update plugin list in socket tests
Barış Soner Uşaklı 5c51a91e85 fix reward claimable check
Barış Soner Uşaklı fb45b498a2 fix lint