Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-04 11:31:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,993 Commits 71 Branches 492 Tags
f225aa25de643ef83aaf2b5ab240d2dc97ec0c4d
Commit Graph

203 Commits

Author SHA1 Message Date
Baris Usakli
5604c62776 use the first set for sorting 2017-11-08 16:32:34 -05:00
Baris Usakli
6778cce265 add new zset 2017-10-30 17:07:51 -04:00
Baris Usakli
a500e0019c closes #6005 2017-10-30 15:26:17 -04:00
Baris Usakli
bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 
# Conflicts:
#	public/src/admin/extend/plugins.js
 2017-08-11 11:33:06 -04:00
Barış Soner Uşaklı
c0f390322c https://github.com/Schamper/nodebb-plugin-poll/issues/86 2017-08-02 18:12:08 -04:00
Julian Lam
184dacf1d7 Merge branch 'master' into develop 2017-07-20 13:19:41 -04:00
Barış Soner Uşaklı
67ca1881bd closes #5831 2017-07-15 16:24:46 -04:00
Baris Usakli
72cafd55cf 2 new hooks for changing direction and set name 2017-07-13 16:09:01 -04:00
Barış Soner Uşaklı
e0dc47f883 closes #5779 2017-06-26 16:51:45 -04:00
Barış Soner Uşaklı
7fe9366103 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-06-16 17:35:45 -04:00
Barış Soner Uşaklı
d65f494c6d closes #5127 2017-06-16 14:25:40 -04:00
Baris Usakli
037a0e5239 closes #5742 
also fix reverse infinite scroll when sorting is changed
 2017-06-06 16:40:32 -04:00
Baris Usakli
1d26fc0d89 closes #5741 2017-06-06 12:55:43 -04:00
psychobunny
88d5f97280 closes #5717 2017-05-29 17:12:02 -04:00
Peter Jaszkowiak
3c2d4fe649 Switch from underscore to lodash 2017-05-27 14:51:45 -06:00
Barış Soner Uşaklı
f1b8492164 remove unnecessary checks 2017-05-27 00:30:07 -04:00
Barış Soner Uşaklı
02dee48329 use backgroundImage if its passed in 2017-05-25 20:24:37 -04:00
Barış Soner Uşaklı
79a48cec5f controllers/category tests 2017-05-25 20:01:07 -04:00
Barış Soner Uşaklı
f57b5f4e4c refactor 2017-05-24 15:07:13 -04:00
Barış Soner Uşaklı
3a1eba2537 merge 2017-05-08 13:49:35 -04:00
Barış Soner Uşaklı
0b3656f34c fix timeouts on category.purge when there are 20k groups 2017-04-27 16:40:01 -04:00
barisusakli
e3205bcfad merge 2017-04-16 14:26:12 -04:00
Peter Jaszkowiak
0fe10f5e86 Escape topic titles at the source, deduplicate 2017-04-15 01:38:42 -06:00
Julian Lam
a141835cf8 Merge branch 'master' into develop 2017-04-13 16:45:46 -04:00
Peter Jaszkowiak
1fb48ef7a7 Fix #5592 (#5593) 
* Fix #5592
Escape translation tokens in topic titles, descriptions, profile about, and post contents

* Fix tests
 2017-04-13 21:37:54 +03:00
Julian Lam
d18cfced96 Merge remote-tracking branch 'origin/master' into develop 2017-04-12 23:57:14 -04:00
Peter Jaszkowiak
484a800327 Merge branch master into develop 2017-04-12 21:11:39 -06:00
Peter Jaszkowiak
1ed571189c Make utils and translator easier to require 
Move utils.walk to file.walk, backwards compatible
 2017-04-08 20:27:52 -06:00
Peter Jaszkowiak
8119b8c4ae filter:teasers.get provided with uid 2017-04-03 14:40:03 -07:00
Julian Lam
ddea9f534e running eslint again 2017-02-24 12:47:46 -05:00
Julian Lam
72e77772db Merge branch 'master' into develop 2017-02-24 12:46:40 -05:00
Peter Jaszkowiak
93f38d4f30 ESlint no-multi-assign 
and max-nested-callbacks, no-mixed-requires, max-statements-per-line
 2017-02-18 18:06:28 -07:00
Peter Jaszkowiak
4bb49a7171 ESlint no-unused-vars 2017-02-18 15:05:36 -07:00
Peter Jaszkowiak
c18808fdeb ESlint no-useless-concat, no-mixed-spaces-and-tabs 2017-02-18 14:42:15 -07:00
Peter Jaszkowiak
57f89663aa ESlint radix 2017-02-18 14:29:52 -07:00
Peter Jaszkowiak
896c8c7343 ESlint object-curly-spacing 2017-02-18 12:30:49 -07:00
Peter Jaszkowiak
3b0dd2d1ef ESlint padded-blocks 2017-02-18 02:32:24 -07:00
Peter Jaszkowiak
feb8405f95 ESlint eol-last 2017-02-18 02:30:48 -07:00
Peter Jaszkowiak
a038c66549 ESlint quotes 2017-02-18 01:56:23 -07:00
Peter Jaszkowiak
532951c24f ESlint space-in-parens, block-spacing 2017-02-18 01:21:34 -07:00
Peter Jaszkowiak
3361a72725 ESlint no-plusplus 
and no-empty, space-unary-ops
 2017-02-18 01:12:18 -07:00
Peter Jaszkowiak
52f2028206 ESlint no-multiple-empty-lines 2017-02-17 22:08:23 -07:00
Peter Jaszkowiak
bc1d70c126 ESlint comma-dangle 2017-02-17 19:31:21 -07:00
barisusakli
3fb7f9fce5 closes #5398 2017-01-26 22:18:16 +03:00
Julian Lam
9dcbe875a0 Merge branch 'master' into develop 2017-01-13 15:01:34 -05:00
Julian Lam
c99321a518 always setting app.previousUrl now, and passing cid into filter:category.topics.get hook 2017-01-13 15:01:14 -05:00
barisusakli
8f0f959d53 add filter:categories.copyPrivilegesFrom 
https://github.com/Schamper/nodebb-plugin-poll/issues/77
 2017-01-13 12:04:20 +03:00
barisusakli
c0a8fd7395 allow multiple tags 2017-01-05 21:14:21 +03:00
Barış Soner Uşaklı
805cacb2af dont add tid to :tids:posts if its pinned 2016-12-21 23:50:06 +03:00
barisusakli
0b9829850c closes #5273 2016-12-09 18:53:08 +03:00