Commit Graph

17105 Commits

Author SHA1 Message Date
Julian Lam
7074b75b9d extra console.log 2013-11-01 11:36:35 -04:00
Julian Lam
857756f636 silly closures... 2013-11-01 11:36:05 -04:00
Julian Lam
e4c62200de fixing screenshot previews in admin/themes 2013-11-01 11:27:02 -04:00
Denis Wolf
89ec677d54 redismock: notify developer about test db config 2013-11-01 02:54:29 +02:00
Denis Wolf
8ff656430d tests: check if we are able to use test db wrapper at all 2013-11-01 02:54:28 +02:00
Denis Wolf
db22394976 redis.js - cleanup 2013-11-01 02:31:34 +02:00
Denis Wolf
ef5548a749 tests: categories.js is using testing db now 2013-11-01 02:31:34 +02:00
Denis Wolf
14c3bb7d63 redismock.js - wrapper for using test db instead of production 2013-11-01 02:31:34 +02:00
Baris Soner Usakli
1a415b60be fixed online page to match the changes made to the template 2013-10-31 16:20:21 -04:00
Julian Lam
85fa68bd92 upping minver for mentions plugin, fixing bad url in admin/topics 2013-10-31 15:54:50 -04:00
Julian Lam
e41ca491ff fixed use of divs inside a UL... how weird heh. 2013-10-31 15:02:52 -04:00
Julian Lam
bb5962cda0 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-31 15:02:40 -04:00
Julian Lam
2de878821b addressed #466, dynamicaly loaded topics now have proper delete/lock/pin
states
2013-10-31 15:02:12 -04:00
psychobunny
5bea2999ef cleanup 2013-10-31 14:38:51 -04:00
Baris Soner Usakli
67e9bf74a7 fixes unread page in mobile 2013-10-31 14:12:47 -04:00
Baris Soner Usakli
ed42012058 closes #472, need to wait for transitions to end before ajaxifying or the overlays stays there (drunk) 2013-10-31 13:30:34 -04:00
Baris Soner Usakli
9b7c9e4a81 camel case for user.js methods 2013-10-30 18:31:36 -04:00
psychobunny
85daacdf7a remove reference to deprecated mobileMenu 2013-10-30 16:38:58 -04:00
psychobunny
17ea41fdae category - use jQuery for graceful degradation 2013-10-30 16:23:36 -04:00
psychobunny
ffd2a18837 updated cerulean to 0.0.4 2013-10-30 15:32:20 -04:00
Julian Lam
5d7f38f99f Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-29 18:25:50 -04:00
Julian Lam
e762267e03 fixed screenshots for themes 2013-10-29 18:25:33 -04:00
psychobunny
a71870de28 pass in site description as well for potential themes to take advantage of 2013-10-29 17:27:23 -04:00
Baris Soner Usakli
7eba0b85f4 fixed andrews fail 2013-10-29 15:19:29 -04:00
psychobunny
30a45ee78e prevent a potentially badly written theme.json from blowing up your forum 2013-10-29 15:13:07 -04:00
psychobunny
ca9cd36067 fix for switching back to a theme without a custom template dir 2013-10-29 14:51:58 -04:00
psychobunny
1d5a208896 themes - added ability to route custom templates serverside 2013-10-29 14:40:35 -04:00
Baris Soner Usakli
60e2938b58 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-29 14:16:10 -04:00
Baris Soner Usakli
89540172b2 closes #464 2013-10-29 14:16:03 -04:00
psychobunny
bbb716723f templates - basic implementation of conditionals
<!-- IF variable -->
show me
<!-- ENDIF variable -->
2013-10-29 14:04:07 -04:00
psychobunny
842cd17979 themes - added ability to route custom templates 2013-10-29 12:34:41 -04:00
Barış Soner Uşaklı
e0e32efd26 Merge pull request #465 from deniswolf/utils-cleanup
Utils.js cleanup
2013-10-28 15:44:38 -07:00
Denis Wolf
a127fcd056 utils.js - detect node/browser with IF, not silent TRY/CATCH 2013-10-28 23:55:45 +02:00
Denis Wolf
c614af2cd9 utils.js - removed unused *trim shims - it's better to bring them when and if needed 2013-10-28 23:41:11 +02:00
Denis Wolf
c2abff6e6d utils.js - strict mode, missing semicolon, braces etc 2013-10-28 23:33:37 +02:00
Baris Usakli
4444d2ee6a removed whitespace 2013-10-28 16:16:44 -04:00
Julian Lam
463bc1374c Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-28 15:52:43 -04:00
Julian Lam
d9a60fc2ef rejigging format of notif page 2013-10-28 15:52:39 -04:00
Baris Usakli
22a3b227a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-28 15:49:21 -04:00
Baris Usakli
12f3f1a45c show admin link in header if user is admin, closes #459 2013-10-28 15:49:12 -04:00
Julian Lam
84d4c2944c Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-28 15:26:10 -04:00
Julian Lam
0a9b918c75 fixed notifications not exiting (whoops) 2013-10-28 15:25:35 -04:00
Julian Lam
8ddf200ce7 Merge branch 'cli-help' of https://github.com/RefinedSoftwareLLC/NodeBB into RefinedSoftwareLLC-cli-help
Conflicts:
	app.js
2013-10-28 15:24:21 -04:00
Julian Lam
207ff98211 Merge pull request #399 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.
2013-10-28 12:18:28 -07:00
Julian Lam
1fb09a9c8c merging @deniswolf's new tests, and double-checking that generateUUID still works 2013-10-28 15:15:59 -04:00
Julian Lam
67f9b22c86 Merge branch 'master' of https://github.com/deniswolf/NodeBB 2013-10-28 15:14:17 -04:00
Julian Lam
8b5cf0c696 Merge branch 'notif_pruning' 2013-10-28 15:10:21 -04:00
Julian Lam
26d9cc56d3 added cronjob for notifications 2013-10-28 15:10:10 -04:00
Julian Lam
930a9c8bca completed notifications pruning method 2013-10-28 14:53:41 -04:00
Baris Usakli
51a9bd9e56 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-28 14:36:40 -04:00