1165 Commits (7ce6c1d0add64c3a99b0750d2eef56ade016aaf4)

Author SHA1 Message Date
psychobunny 1e3acc0caf up persona 8 years ago
Julian Lam d18cfced96 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak a8add6477c Fix merge conflicts 8 years ago
Peter Jaszkowiak 484a800327 Merge branch master into develop 8 years ago
Peter Jaszkowiak f16a40d29e Add nodebb file to linter 8 years ago
Peter Jaszkowiak 010473e5cc Merge branch 'master' into patch-pitaj 8 years ago
Peter Jaszkowiak 2c418fd2af Use npm bootstrap 8 years ago
Peter Jaszkowiak 0ef30e91ba Use ace-builds npm package instead of vendor
ace can be referenced as an r.js module, reduces acp bundle size
8 years ago
pichalite 4c89497cc4 Closes #5521 8 years ago
Julian Lam ef2b245a82 bump mentions 8 years ago
Julian Lam 7afe8a32f6 Merge branch 'master' into develop 8 years ago
Julian Lam a450cb869d up themes 8 years ago
Julian Lam 4b3dcd1a02 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Julian Lam 9714e3c26b Up MongoDB dependency to v2.2.25
This is a PR to see if tests go 💥
8 years ago
Julian Lam 7f8f197e60 Merge branch 'master' into develop 8 years ago
Misty (Bot) da1858f674 Incremented version number 8 years ago
Julian Lam 1ebbbdd3f9 Merge remote-tracking branch 'origin/master' into develop 8 years ago
psychobunny 8a6665a26c up lav, closes #5525 8 years ago
Julian Lam 860999fa6c Merge remote-tracking branch 'origin/master' into develop 8 years ago
psychobunny 9dc54f801e up persona 8 years ago
psychobunny 5aa45e9181 up persona 8 years ago
barisusakli 1c1d97dd54 up spam be gone 8 years ago
psychobunny 9f2e5e9c4b closes #4685 8 years ago
Julian Lam 793555a344 Merge branch 'master' into develop 8 years ago
Julian Lam f732d6c1b9 Merge pull request #5501 from RoiEXLab/add-osd-functionality
Add OpenSearchDocument XML (#5399)
8 years ago
Julian Lam af2d9fb85b Merge branch 'master' into develop 8 years ago
barisusakli f6721c249f up composer 8 years ago
RoiEX 431f5e1f0f Add missing dependency
This deoendency is required by rss, but travis doesn't seem to notice that
8 years ago
Julian Lam b1ceec7571 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Misty (Bot) 00a67b97ce Incremented version number 8 years ago
Julian Lam 72e77772db Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak dd2b930824 Resolve merge conflicts, minify only `.js` files 8 years ago
Julian Lam 14398a2d90 up markdown 8 years ago
Julian Lam 672d7352bb Merge branch 'master' into develop 8 years ago
Julian Lam e427f1663e Merge pull request #5456 from NodeBB/sounds-refactor
Sound system improvements
8 years ago
Peter Jaszkowiak f3a8256f35 ESlint strict 8 years ago
Julian Lam f7f5b2c8d9 Merge remote-tracking branch 'origin/master' into develop 8 years ago
barisusakli e009ce5609 closes #5443 8 years ago
barisusakli a427bba9cb up persona 8 years ago
Peter Jaszkowiak c75391f9f5 Sound system improvements
- Fix sound ACP uploads
- Display soundpack names with sound files
- Soundpacks can have sounds with identical names
- Link sounds during build step
- Generate map of sound name to file name during build step
- Change how soundpacks work. It's now done via a field in plugin.json
8 years ago
psychobunny 45063ed683 Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop 8 years ago
psychobunny 36bf54a4b8 bump tjs 8 years ago
barisusakli fd88e9fdff up composer 8 years ago
barisusakli 9b3741bc63 up composer 8 years ago
barisusakli c285eb7fcd closes #5450 8 years ago
Julian Lam fcaefbadca Merge remote-tracking branch 'origin/master' into develop 8 years ago
barisusakli 867fd99fb6 closes #4625 8 years ago
Julian Lam 1e33a659ef up persona 8 years ago
barisusakli b9244110d9 up dbsearch 8 years ago
Julian Lam daa63909f3 Merge remote-tracking branch 'origin/master' into develop 8 years ago