Commit Graph

14522 Commits

Author SHA1 Message Date
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
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
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
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
Misty (Bot)
12a426b7b9 Latest translations and fallbacks 2017-04-08 09:22:22 +00:00
pichalite
d4de345e87 syntax 2017-04-07 21:39:22 +00:00
pichalite
4c89497cc4 Closes #5521 2017-04-07 20:57:00 +00:00
Anil Mandepudi
da183e196a Fixes #5572 (#5575)
* Fixes #5572

* Adding trailing commas but in protest
2017-04-07 14:35:24 -04:00
Julian Lam
0fac75c055 Merge pull request #5573 from NodeBB/patch-pitaj
Fix #5563
2017-04-07 14:15:22 -04:00
Misty (Bot)
07b9bb6fb8 Latest translations and fallbacks 2017-04-07 09:22:36 +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
Barış Soner Uşaklı
8afdd71ef1 closes #5559 2017-04-06 17:44:25 -04:00
Peter Jaszkowiak
1deeaaeb39 Fix #5563 2017-04-06 15:20:07 -06:00
Misty (Bot)
bb0ec540bd Latest translations and fallbacks 2017-04-04 09:22:34 +00: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
Misty (Bot)
0bea922a12 Latest translations and fallbacks 2017-04-03 09:22:20 +00:00
Misty (Bot)
60d35fdf05 Latest translations and fallbacks 2017-04-02 09:22:17 +00:00
Misty (Bot)
2feb19aa2d Latest translations and fallbacks 2017-04-01 09:22:12 +00:00
Julian Lam
b287c75e3c Merge pull request #5562 from NodeBB/patch-pitaj
Fix #5561
2017-03-31 16:47:06 -04:00
Peter Jaszkowiak
81696dd24a Fxi #5561 2017-03-31 14:45:03 -06:00
Julian Lam
8a8bd23de9 Merge pull request #5558 from NodeBB/patch-5538
Partial fix #5538
2017-03-30 08:56:14 -04:00
Peter Jaszkowiak
57696b22f4 Partial fix #5538 2017-03-30 03:17:45 -06:00
Julian Lam
a450cb869d up themes 2017-03-29 15:26:18 -04:00
Misty (Bot)
e9794224a8 Latest translations and fallbacks 2017-03-29 09:24:44 +00:00
Julian Lam
5fbbe898d0 fixes #5538 2017-03-28 12:17:20 -04:00
Julian Lam
1594a84e1c fixes #5536 2017-03-28 12:13:44 -04:00
Julian Lam
a63459dc98 Merge branch 'master' of github.com:NodeBB/NodeBB 2017-03-28 12:13:30 -04:00
Misty (Bot)
8d4a32dc27 Latest translations and fallbacks 2017-03-28 09:24:51 +00:00
Julian Lam
15506c30a4 updates es search translation 2017-03-27 14:38:13 -04:00