Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-18 21:42:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,066 Commits 68 Branches 489 Tags
dc5bd7601fb3da170aab380ff8f8c8c778342e76
Commit Graph

8214 Commits

Author SHA1 Message Date
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
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
Peter Jaszkowiak
980e9026f3 Fix #5588, translator ignores unclosed tokens 2017-04-12 20:34:31 -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
Misty (Bot)
12a426b7b9 Latest translations and fallbacks 2017-04-08 09:22: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
psychobunny
e121a5a798 closes #5574 2017-04-06 17:57:01 -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
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
7afe8a32f6 Merge branch 'master' into develop 2017-03-29 15:26:49 -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
Misty (Bot)
8d4a32dc27 Latest translations and fallbacks 2017-03-28 09:24:51 +00:00
Julian Lam
c34b10dd50 Merge branch 'master' into develop 2017-03-27 14:38:27 -04:00
Julian Lam
15506c30a4 updates es search translation 2017-03-27 14:38:13 -04:00
Misty (Bot)
c1c96668af Latest translations and fallbacks 2017-03-27 09:24:50 +00:00
Misty (Bot)
2a2ed96a07 Latest translations and fallbacks 2017-03-26 09:24:22 +00:00
Misty (Bot)
114f87e78c Latest translations and fallbacks 2017-03-25 09:22:16 +00:00
Julian Lam
b649eb95f8 Merge remote-tracking branch 'origin/master' into develop 2017-03-24 14:37:39 -04:00
Misty (Bot)
3319a72679 Latest translations and fallbacks 2017-03-24 09:22:18 +00:00
Julian Lam
6060b8e13b fix tests 2017-03-23 14:39:46 -04:00
Barış Soner Uşaklı
fe27d40ff6 closes #5542 2017-03-23 10:58:28 +03:00
Julian Lam
4b3dcd1a02 Merge remote-tracking branch 'origin/master' into develop 2017-03-22 09:18:20 -04:00
Aziz Khoury
6682e048ea wrapImagesInLinks with <a download> attribute 
if the `src` of the `img` does not have an extension, most browsers will trigger a download with whatever filename is set, also without an extension, so when it's opened in any OS, it wont have a default application to open it with.

So, In this case, if the `alt` attribute has an extension (meaning if it looks like filename) - we use that with the html5 [`download` attr](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attr-download)

The PR does not affect any src if they have an extension.
 2017-03-22 12:19:31 +02:00
Ben Lubar
7f713ee822 Admin option to allow all users to view votes (#5534) 
* Admin option to allow all users to view votes

* Fix </strong></strong>
 2017-03-17 14:08:47 -04:00
Julian Lam
c805d55b85 creating notification for flag assignment 2017-03-17 13:16:16 -04:00
Julian Lam
7f8f197e60 Merge branch 'master' into develop 2017-03-16 14:58:39 -04:00
Julian Lam
23d4497c73 Merge pull request #5531 from NodeBB/patch_5491 
Fix #5491
 2017-03-15 23:01:42 -04:00