Commit Graph

5434 Commits

Author SHA1 Message Date
Julian Lam
e8c4bda984 Merge pull request #469 from deniswolf/redis-refactoring
Use separate db for testing
2013-11-01 08:44:56 -07:00
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
db22394976 redis.js - cleanup 2013-11-01 02:31:34 +02:00
Baris Soner Usakli
9b7c9e4a81 camel case for user.js methods 2013-10-30 18:31:36 -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
psychobunny
ca9cd36067 fix for switching back to a theme without a custom template dir 2013-10-29 14:51:58 -04:00
Baris Soner Usakli
89540172b2 closes #464 2013-10-29 14:16:03 -04:00
psychobunny
842cd17979 themes - added ability to route custom templates 2013-10-29 12:34:41 -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
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
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
ac12bd0b8f closes #462 2013-10-28 14:36:31 -04:00
Julian Lam
d7651d1504 Merge branch 'master' into notif_pruning 2013-10-28 13:46:07 -04:00
Julian Lam
ed7c9348b7 interim commit 2013-10-28 13:45:32 -04:00
Baris Usakli
ccf4ed1235 topics and posts counters will update for everyone 2013-10-28 13:34:36 -04:00
Julian Lam
b22ee67612 Merge branch 'master' into notif_pruning 2013-10-28 10:52:30 -04:00
Baris Soner Usakli
afc0e25b26 closes #463 2013-10-28 00:08:44 -04:00
Baris Soner Usakli
82e14eef35 closes #458 2013-10-27 23:29:53 -04:00
Baris Soner Usakli
52f198481b closes #456, if the file path doesnt exists logger was crashing 2013-10-26 20:19:42 -04:00
Baris Soner Usakli
252187f1fe Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-26 19:00:42 -04:00
Baris Soner Usakli
99812c33e7 closes #454 2013-10-26 19:00:34 -04:00
Julian Lam
97c5f6009d closes #455 2013-10-26 18:26:30 -04:00
Baris Soner Usakli
fba1f7ae05 removed console.log 2013-10-25 18:09:07 -04:00
Baris Soner Usakli
865e5ae3a3 closes #448 2013-10-25 18:08:23 -04:00
Baris Soner Usakli
1af98835b1 added share buttons to main post 2013-10-25 18:00:08 -04:00
Baris Soner Usakli
6eadf67add another privilege fix 2013-10-25 16:56:18 -04:00
Baris Usakli
f3f280d008 another fix to priv 2013-10-25 16:02:18 -04:00
Julian Lam
aecbe6d316 interim commit, still nothing done 2013-10-25 16:01:31 -04:00
Baris Usakli
63419d7ca9 fix for reputation checks for manage content and manage threads 2013-10-25 15:35:48 -04:00
Julian Lam
3480a1d60e Merge branch 'master' into notif_pruning 2013-10-25 14:51:38 -04:00
Baris Usakli
27f421587e closes #444 2013-10-25 09:57:02 -04:00
Baris Usakli
549017d035 cleaned up getCategories 2013-10-23 16:27:33 -04:00
Baris Usakli
c640c550fd removed old browsing code from websockets.js 2013-10-23 15:12:19 -04:00
Baris Usakli
1691c74727 testing breadcrumb images 2013-10-23 14:39:46 -04:00
Julian Lam
f6be3eacfc interim commit 2013-10-23 12:37:29 -04:00
Baris Usakli
790df903ac added view count to topics 2013-10-23 12:26:24 -04:00
Baris Soner Usakli
ab1015b11e #433 2013-10-22 21:47:09 -04:00
Julian Lam
55e990f71d fixes #433 - looks like someone removed the code that floated pinned
topics to the top...
2013-10-22 21:20:56 -04:00
Baris Usakli
468688615f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-22 15:54:10 -04:00
Baris Usakli
f4faee4283 moved image uploading to a require js module, added image upload to site logo 2013-10-22 15:54:02 -04:00