Commit Graph

8605 Commits

Author SHA1 Message Date
barisusakli
552f850207 closes #2702 2017-04-14 14:56:39 -04:00
barisusakli
92343eb2e1 fix mongo setObject if key/value is empty string 2017-04-14 13:58:32 -04:00
barisusakli
da7bc5bb7a test fix 2017-04-14 13:38:58 -04:00
barisusakli
e63559b6fd closes #5484 2017-04-14 12:59:36 -04:00
barisusakli
b8c606cbbd closes #5519 2017-04-14 10:08:50 -04:00
barisusakli
886768ba84 check both date and upgrade count 2017-04-13 19:04:22 -04:00
barisusakli
05e9e88a15 fix lint 2017-04-13 18:53:46 -04:00
barisusakli
1cf775a4b8 upgrade script fixes 2017-04-13 18:43:39 -04:00
barisusakli
520d6954c1 test node 7 2017-04-13 17:58:44 -04:00
barisusakli
f4b8cb7217 added missing return 2017-04-13 17:02:13 -04:00
barisusakli
6d1702c600 wait for calls to finish 2017-04-13 16:58:41 -04:00
Julian Lam
a141835cf8 Merge branch 'master' into develop 2017-04-13 16:45:46 -04:00
barisusakli
7ce6c1d0ad closes #5571 2017-04-13 16:36:02 -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
a8add6477c Fix merge conflicts 2017-04-12 21:29:54 -06:00
Julian Lam
a62a4e698f Merge pull request #5578 from NodeBB/utils-translator-require
Make utils and translator easier to require
2017-04-12 23:16:59 -04:00
Peter Jaszkowiak
484a800327 Merge branch master into develop 2017-04-12 21:11:39 -06:00
Julian Lam
42b5cdaae3 progress bars! omg 2017-04-12 17:30:20 -04:00
Peter Jaszkowiak
75d291183d Fix using nodebb in other CWDs 2017-04-12 15:22:58 -06:00
Peter Jaszkowiak
010473e5cc Merge branch 'master' into patch-pitaj 2017-04-09 23:09:52 -06:00
Peter Jaszkowiak
1892492505 Deprecate utils.walk, remove prototype modification 2017-04-08 21:02:06 -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
b53d3254dd buzz is no longer used 2017-04-08 19:05:10 -06:00
Peter Jaszkowiak
2c418fd2af Use npm bootstrap 2017-04-08 19:05:10 -06:00
Peter Jaszkowiak
0ef30e91ba Use ace-builds npm package instead of vendor
ace can be referenced as an r.js module, reduces acp bundle size
2017-04-08 19:05:10 -06:00
Peter Jaszkowiak
17ff8a4151 Enable passing paths as module sources 2017-04-08 19:05:10 -06:00
pichalite
d4de345e87 syntax 2017-04-07 21:39:22 +00:00
pichalite
4c89497cc4 Closes #5521 2017-04-07 20:57:00 +00:00
psychobunny
5985a8a7a3 closes #5574 2017-04-06 18:06:10 -04:00
Barış Soner Uşaklı
43f8678c7a update local config immediately 2017-04-06 17:59:46 -04:00
psychobunny
e121a5a798 closes #5574 2017-04-06 17:57:01 -04:00
Barış Soner Uşaklı
8afdd71ef1 closes #5559 2017-04-06 17:44:25 -04:00
Barış Soner Uşaklı
5c005bbbdf use bind 2017-04-05 15:18:27 -04:00
Barış Soner Uşaklı
1b6d96dde7 on post flag increment zset 2017-04-05 14:59:50 -04:00
Julian Lam
60990f28ad Merge pull request #5568 from NodeBB/patch-pitaj
`filter:teasers.get` provided with `uid`
2017-04-03 16:59:18 -04:00
Peter Jaszkowiak
8119b8c4ae filter:teasers.get provided with uid 2017-04-03 14:40:03 -07:00
André Zanghelini
03d432182b Fix postcount is expected to be Number (#5567) 2017-04-03 12:45:43 -04:00
psychobunny
53dac97800 closes #5560 2017-04-03 12:42:36 -04:00
Barış Soner Uşaklı
d88219b4d1 closes #5566 2017-04-03 06:35:20 -04:00
Peter Jaszkowiak
81696dd24a Fxi #5561 2017-03-31 14:45:03 -06:00
Peter Jaszkowiak
57696b22f4 Partial fix #5538 2017-03-30 03:17:45 -06:00
Julian Lam
7afe8a32f6 Merge branch 'master' into develop 2017-03-29 15:26:49 -04:00
Julian Lam
55f07d3301 fixed flags list in account info page 2017-03-29 12:44:40 -04:00
husseinwalli
3876a88252 Added additional parameters to user creation method (#5496)
Treating picture, location and birthday similar to data.email as optional parameters to be passed to the create a user
2017-03-27 14:05:06 -04:00
Peter Jaszkowiak
ff09d6e0dd Fix #5549, improve tpl compilation (#5551) 2017-03-27 13:53:26 -04:00
Barış Soner Uşaklı
6b0a907ede closes #5552 2017-03-26 15:12:28 +03:00
Julian Lam
42dc496572 Merge pull request #5550 from NodeBB/patch_5543
Remove duplicate slugify
2017-03-25 16:29:14 -04:00
Peter Jaszkowiak
14ed0be4f7 Remove duplicate slugify 2017-03-24 14:43:58 -06:00
Julian Lam
0e157d93ea Merge remote-tracking branch 'origin/master' into develop 2017-03-24 15:52:58 -04:00