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

8214 Commits

Author SHA1 Message Date
Baris Usakli
c4310395c9 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 
# Conflicts:
#	package.json
 2017-10-19 13:54:56 -04:00
Baris Usakli
19dc7da42f closes #5994 2017-10-19 13:53:05 -04:00
Misty (Bot)
05c1a6cfed Latest translations and fallbacks 2017-10-19 09:26:06 +00:00
Barış Soner Uşaklı
d8dc79e3c7 closes #5992 2017-10-18 14:49:42 -04:00
Baris Usakli
6a6dc7ef06 closes #5990 2017-10-16 15:35:46 -04:00
Peter Jaszkowiak
f4355efb30 Optimize translator 
- Use `slice` less
- Skip iterations with `indexOf`
 2017-10-16 12:03:41 -04:00
Julian Lam
684a66a760 fixes #5989 2017-10-16 10:51:53 -04:00
Peter Jaszkowiak
189008af75 Optimize translator 
- Use `slice` less
- Skip iterations with `indexOf`
 2017-10-14 13:47:05 -06:00
Peter Jaszkowiak
60a42aa651 Merge branch 'translator-optimization' into develop 2017-10-13 21:23:44 -06:00
Peter Jaszkowiak
cf289b9228 Merge remote-tracking branch 'origin/master' into develop 2017-10-13 21:23:04 -06:00
Peter Jaszkowiak
190eea5691 Remove this useless check 2017-10-13 21:17:57 -06:00
Peter Jaszkowiak
46fafb20b9 Remove string.js dependency 2017-10-13 21:02:41 -06:00
Julian Lam
0efa403a68 invoking the proper ACE Editor mode 2017-10-13 13:12:48 -04:00
Julian Lam
bf1e922cab Removed Thumbs.db from a vendor dir 2017-10-13 12:21:28 -04:00
Julian Lam
8741f7c63c updated ACP menu label 2017-10-13 12:20:48 -04:00
Julian Lam
ae261e073b updating markdown and moving app.load back into ajaxify.end 2017-10-13 09:58:26 -04:00
Julian Lam
cfacc4f133 potential fix for #5980 2017-10-12 17:01:01 -04:00
Julian Lam
9cbf1597cd Merge remote-tracking branch 'origin/master' into develop 2017-10-12 14:01:14 -04:00
Julian Lam
cd6dcff38b Split up customJS into customHTML and customJS for better organisation (#5981) 
* WIP

* fixed customJS not actually working in footer

* Moving scripts to footer, #5980

* Added upgrade scripts for #5980
 2017-10-12 13:38:27 -04:00
Baris Usakli
500c978a26 closes #5944 2017-10-12 13:03:43 -04:00
Misty (Bot)
681e8074d2 Latest translations and fallbacks 2017-10-12 09:25:36 +00:00
Misty (Bot)
425db49fe8 Latest translations and fallbacks 2017-10-10 09:25:44 +00:00
Peter Jaszkowiak
1c35213934 Fix #5970 and forking while debugging (#5965) 
* Fix forking while debugging

Debugger address in use no longer happens

* Fix cropper error
 2017-10-09 11:40:36 -04:00
Misty (Bot)
bb6dcf3779 Latest translations and fallbacks 2017-10-09 09:26:12 +00:00
Misty (Bot)
ea41e39dd2 Latest translations and fallbacks 2017-10-07 09:25:55 +00:00
Misty (Bot)
098b8d9971 Latest translations and fallbacks 2017-10-06 09:25:55 +00:00
Dravere
38900a9964 Smtp emailer issue 5951 (#5954) 
* Fixed typo at emailer.js line 66 (serice -> service)

* When custom SMTP user and password is empty no authentication is attempted

* Added options to choose custom smtp connection security

* Made custom smtp connection security strings translatable

* Changed switch to if-else for custom smtp security option

* Fixed emailer.js lint errors

* Move custom setting to top of list
 2017-10-04 18:26:44 -04:00
Julian Lam
6852c92ed6 Merge remote-tracking branch 'origin/develop' 2017-10-03 13:37:43 -04:00
RoiEX
e1f180ea3f Remove uneccessary undefined declaration 2017-10-03 09:47:59 -04:00
RoiEX
ce9a3f20c5 Optimize transition 2017-10-03 09:47:59 -04:00
RoiEX
5e4e523198 Make progress bar finer 2017-10-03 09:47:59 -04:00
RoiEX
1fd160a4e6 Add Support for Firefox OSD 2017-10-03 09:43:33 -04:00
Peter Jaszkowiak
da9da8190f Bump dependencies 
Bumping eslint & configs meant making some linting fixes

For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail
 2017-10-02 09:24:27 -04:00
Misty (Bot)
47bbe846cb Latest translations and fallbacks 2017-10-02 09:24:20 +00:00
Chế Tiệp Chân Khoa
1f5d14dda4 place some code under the right loop (#5945) 2017-09-29 09:27:41 -04:00
Peter Jaszkowiak
dc87d7fc0f Use .js instead of .jst 
Fix #5934
 2017-09-23 12:51:20 -06:00
Baris Usakli
8276e20254 closes #5937 2017-09-21 14:30:12 -04:00
Misty (Bot)
3227e778a2 Latest translations and fallbacks 2017-09-20 09:23:50 +00:00
Misty (Bot)
8f0e48aa40 Latest translations and fallbacks 2017-09-19 09:23:49 +00:00
Misty (Bot)
bb65ecd8b8 Latest translations and fallbacks 2017-09-18 09:23:51 +00:00
Misty (Bot)
6ea82515cc Latest translations and fallbacks 2017-09-17 09:23:31 +00:00
Misty (Bot)
ce59a78aa4 Latest translations and fallbacks 2017-09-16 09:27:37 +00:00
Misty (Bot)
b840b96a4a Latest translations and fallbacks 2017-09-15 09:23:50 +00:00
Baris Usakli
a2508161c6 fix hover bg color 2017-09-14 15:57:22 -04:00
Julian Lam
b8ce4023c3 finish redirect if success returned 5x, via installer 2017-09-14 13:42:48 -04:00
Julian Lam
e64c1d28e6 closes #5931 2017-09-14 09:40:24 -04:00
Misty (Bot)
252be54b32 Latest translations and fallbacks 2017-09-14 09:23:59 +00:00
Julian Lam
514317ab20 using translator.unescape instead of replaces 2017-09-13 17:06:00 -04:00
Julian Lam
211482bbc0 fixes #5927 2017-09-13 12:09:31 -04:00
Misty (Bot)
d47c5a7bb0 Latest translations and fallbacks 2017-09-13 09:24:05 +00:00