Commit Graph

2128 Commits (60e2938b5839dee7eea17ac552bf2bfecf93d0b3)
 

Author SHA1 Message Date
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
Julian Lam 8b5cf0c696 Merge branch 'notif_pruning'
Julian Lam 26d9cc56d3 added cronjob for notifications
Julian Lam 930a9c8bca completed notifications pruning method
Baris Usakli 51a9bd9e56 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli ac12bd0b8f closes
Julian Lam d7651d1504 Merge branch 'master' into notif_pruning
Julian Lam 7e1f996079 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 1af4a9abb4 upped mentions plugin minver
Julian Lam ed7c9348b7 interim commit
Baris Usakli ccf4ed1235 topics and posts counters will update for everyone
Julian Lam b22ee67612 Merge branch 'master' into notif_pruning
Baris Usakli b5a953b16c fixes topics going into wrong category
Baris Usakli 7613f02eff closes
Baris Soner Usakli 78a3dd68ea hide the no topics warning when a new topic is posted on /unread
Baris Soner Usakli afc0e25b26 closes
Baris Soner Usakli 82e14eef35 closes
Denis Wolf 81e9c9807f utils.js - missing semicolon, strict equality
Denis Wolf 02e2b53a1d TESTS: Utils.js: tests for validations, uuid generation
Denis Wolf babe9b6f54 valid jshint config with globals for tests only
Baris Soner Usakli 52f198481b closes , if the file path doesnt exists logger was crashing
Baris Soner Usakli 252187f1fe Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 99812c33e7 closes
Julian Lam 97c5f6009d closes
RefinedSoftwareLLC 5e15f8683e Update app.js
Only check if file exists when no other supported --arguments are given.
Display that 0.0.0.0 is Any Address.
Moved upgrade section to after install section.
added CLI --help!
Baris Soner Usakli fba1f7ae05 removed console.log
Baris Soner Usakli 865e5ae3a3 closes
Baris Soner Usakli 1af98835b1 added share buttons to main post
Baris Soner Usakli 6eadf67add another privilege fix
Baris Usakli f3f280d008 another fix to priv
Julian Lam aecbe6d316 interim commit, still nothing done
Baris Usakli 63419d7ca9 fix for reputation checks for manage content and manage threads