Commit Graph

2159 Commits (0179a55ee46165b62954cb367886b98a1545fd31)
 

Author SHA1 Message Date
Baris Usakli 0179a55ee4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 04ed1df0ef closes , allow guest posting. enabled from admin/settings, defaults to disabled
Julian Lam de66ee1a89 updated error when no test db is defined -- also made an invalid "db" option a fatal error. Before, it was just defaulting to 0! Wiped out my test db hahaha
Julian Lam e8c4bda984 Merge pull request from deniswolf/redis-refactoring
Use separate db for testing
Julian Lam 7074b75b9d extra console.log
Julian Lam 857756f636 silly closures...
Julian Lam e4c62200de fixing screenshot previews in admin/themes
Denis Wolf 89ec677d54 redismock: notify developer about test db config
Denis Wolf 8ff656430d tests: check if we are able to use test db wrapper at all
Denis Wolf db22394976 redis.js - cleanup
Denis Wolf ef5548a749 tests: categories.js is using testing db now
Denis Wolf 14c3bb7d63 redismock.js - wrapper for using test db instead of production
Baris Soner Usakli 1a415b60be fixed online page to match the changes made to the template
Julian Lam 85fa68bd92 upping minver for mentions plugin, fixing bad url in admin/topics
Julian Lam e41ca491ff fixed use of divs inside a UL... how weird heh.
Julian Lam bb5962cda0 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 2de878821b addressed , dynamicaly loaded topics now have proper delete/lock/pin
states
psychobunny 5bea2999ef cleanup
Baris Soner Usakli 67e9bf74a7 fixes unread page in mobile
Baris Soner Usakli ed42012058 closes , need to wait for transitions to end before ajaxifying or the overlays stays there (drunk)
Baris Soner Usakli 9b7c9e4a81 camel case for user.js methods
psychobunny 85daacdf7a remove reference to deprecated mobileMenu
psychobunny 17ea41fdae category - use jQuery for graceful degradation
psychobunny ffd2a18837 updated cerulean to 0.0.4
Julian Lam 5d7f38f99f Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam e762267e03 fixed screenshots for themes
psychobunny a71870de28 pass in site description as well for potential themes to take advantage of
Baris Soner Usakli 7eba0b85f4 fixed andrews fail
psychobunny 30a45ee78e prevent a potentially badly written theme.json from blowing up your forum
psychobunny ca9cd36067 fix for switching back to a theme without a custom template dir
psychobunny 1d5a208896 themes - added ability to route custom templates serverside
Baris Soner Usakli 60e2938b58 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 89540172b2 closes
psychobunny bbb716723f templates - basic implementation of conditionals
<!-- IF variable -->
show me
<!-- ENDIF variable -->
psychobunny 842cd17979 themes - added ability to route custom templates
Barış Soner Uşaklı e0e32efd26 Merge pull request from deniswolf/utils-cleanup
Utils.js cleanup
Denis Wolf a127fcd056 utils.js - detect node/browser with IF, not silent TRY/CATCH
Denis Wolf c614af2cd9 utils.js - removed unused *trim shims - it's better to bring them when and if needed
Denis Wolf c2abff6e6d utils.js - strict mode, missing semicolon, braces etc
Baris Usakli 4444d2ee6a removed whitespace
Julian Lam 463bc1374c Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam d9a60fc2ef rejigging format of notif page
Baris Usakli 22a3b227a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 12f3f1a45c show admin link in header if user is admin, closes
Julian Lam 84d4c2944c Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 0a9b918c75 fixed notifications not exiting (whoops)
Julian Lam 8ddf200ce7 Merge branch 'cli-help' of https://github.com/RefinedSoftwareLLC/NodeBB into RefinedSoftwareLLC-cli-help
Conflicts:
	app.js
Julian Lam 207ff98211 Merge pull request from JetMaddox/master
Disable Framing on all sites.

I'm merging this ***conditionally*** - at some point, we wish to introduce integration with CMSes like WordPress. An easy way to achieve this would be placing NodeBB in an iframe.

At that point in time, we'll want to make this a configurable option via admin panel.
Julian Lam 1fb09a9c8c merging @deniswolf's new tests, and double-checking that generateUUID still works
Julian Lam 67f9b22c86 Merge branch 'master' of https://github.com/deniswolf/NodeBB