Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-14 09:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,569 Commits 74 Branches 483 Tags
c6c31e9e5fef3ca79bd0bfc40ad38f97c8e6a66c
Commit Graph

16569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Peter Jaszkowiak
980e9026f3 Fix #5588, translator ignores unclosed tokens 2017-04-12 20:34:31 -06:00
Julian Lam
e9fb42eb03 Merge pull request #5589 from NodeBB/fix-require.main.require 
Fix using `./nodebb` in other CWDs
 2017-04-12 17:32:43 -04:00
Julian Lam
42b5cdaae3 progress bars! omg 2017-04-12 17:30:20 -04:00
Peter Jaszkowiak
f16a40d29e Add nodebb file to linter 2017-04-12 15:29:01 -06:00
Peter Jaszkowiak
75d291183d Fix using nodebb in other CWDs 2017-04-12 15:22:58 -06:00
Peter Jaszkowiak
9368e666d8 Fix failing test 2017-04-11 21:53:17 -06:00
Misty (Bot)
73b6b06294 Latest translations and fallbacks 2017-04-11 09:22:21 +00:00
Misty (Bot)
08f001063c Latest translations and fallbacks 2017-04-10 09:22:23 +00:00
Peter Jaszkowiak
010473e5cc Merge branch 'master' into patch-pitaj 2017-04-09 23:09:52 -06:00
Peter Jaszkowiak
dc4f2be156 Remove ace global for eslint 2017-04-09 21:47:05 -06:00
Julian Lam
126237e2c9 Merge pull request #5576 from pichalite/zxcvbn 
Closes #5521
 2017-04-09 16:52:52 -04: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