Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-08 05:30:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
14,831 Commits 73 Branches 492 Tags
82bfa752b9f5d2242dcf5c7f8d03fc98b9cda3d7
Commit Graph

14831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Lam
82bfa752b9 Removed outdated list of available upgrade scripts 2017-04-16 15:47:32 -04:00
Julian Lam
856cb8fc2a Merge remote-tracking branch 'origin/master' into develop 2017-04-16 15:46:27 -04:00
Julian Lam
542cf1a982 Merge remote-tracking branch 'origin/master' into develop 2017-04-16 15:45:16 -04:00
barisusakli
fdee61b4f4 use deleteMany instead 2017-04-16 15:42:28 -04:00
barisusakli
cf6c4667c8 upgrade script to clear sessions 2017-04-16 15:31:50 -04:00
barisusakli
38e16ca8f6 Merge branch 'master' into develop 2017-04-16 14:48:00 -04:00
barisusakli
65a65b19c0 tests for #5600 2017-04-16 14:46:02 -04:00
barisusakli
c3ac7c31b1 Merge branch 'master' into develop 2017-04-16 14:32:50 -04:00
barisusakli
185b6e5c8e #5600 2017-04-16 14:31:49 -04:00
barisusakli
e3205bcfad merge 2017-04-16 14:26:12 -04:00
barisusakli
9f8d80e3a4 closes #5600 2017-04-16 14:22:40 -04:00
Julian Lam
678db343b4 Merge pull request #5597 from NodeBB/chherypick-fixes 
Cherrypick fixes from #5591
 2017-04-15 18:27:12 -04:00
Peter Jaszkowiak
37c4218184 Fix error if ./nodebb build isn't called before tests 2017-04-15 16:10:43 -06:00
Peter Jaszkowiak
6e5a79842f Fix #5595 2017-04-15 16:10:42 -06:00
Peter Jaszkowiak
baa2a59f4c Fix ace editor not working 2017-04-15 16:10:28 -06:00
Julian Lam
98047be9ce Merge pull request #5596 from NodeBB/translator-fix 
Centrally escape translator tokens in every topic title
 2017-04-15 17:18:27 -04:00
Peter Jaszkowiak
e382bca610 Fix tests 2017-04-15 04:22:28 -06:00
Misty (Bot)
0e615e7b09 Latest translations and fallbacks 2017-04-15 09:22:15 +00:00
Peter Jaszkowiak
0fe10f5e86 Escape topic titles at the source, deduplicate 2017-04-15 01:38:42 -06:00
Peter Jaszkowiak
ecfca21abe Up composer 2017-04-15 00:50:12 -06:00
psychobunny
9670d7d762 up persona 2017-04-14 20:03:39 -04:00
psychobunny
c3423b2456 up persona 2017-04-14 20:03:10 -04:00
psychobunny
3598af784d up persona 2017-04-14 20:00:45 -04:00
psychobunny
2319af2904 up persona 2017-04-14 19:58:24 -04:00
barisusakli
4d1b8d7460 fix lint 2017-04-14 15:15:25 -04:00
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
36df4cdf97 fix cyclic dependency issue 2017-04-14 13:37:15 -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
Misty (Bot)
c2ba1c270f Latest translations and fallbacks 2017-04-14 09:22:18 +00: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
psychobunny
1179dd9503 up composer, closes #5586 2017-04-13 15:32:38 -04:00
psychobunny
1e3acc0caf up persona 2017-04-13 15:18:27 -04:00
psychobunny
b1ee7cc5b4 up persona 2017-04-13 15:18:11 -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
Julian Lam
c3febca9c8 Merge pull request #5577 from NodeBB/patch-pitaj 
Use npm instead of vendor files
 2017-04-12 23:43:50 -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
a117b559b8 Merge pull request #5590 from NodeBB/translator-fix 
Fix #5588, translator ignores unclosed tokens
 2017-04-12 22:48:36 -04:00