Commit Graph

15373 Commits

Author SHA1 Message Date
Misty (Bot)
382a0aa42e Latest translations and fallbacks 2017-06-01 09:25:16 +00:00
Barış Soner Uşaklı
b62c905588 up dbsearch 2017-05-31 20:45:44 -04:00
Peter Jaszkowiak
b60dbe7d1e Unwrap meta modules 2017-05-31 16:24:23 -06:00
Peter Jaszkowiak
aefdc4b24b Refactor helpers import/export 2017-05-31 16:23:28 -06:00
psychobunny
c94365aefd closes #5721 2017-05-31 16:35:18 -04:00
psychobunny
006584e405 fixes [build] Unknown target: error message 2017-05-31 15:06:10 -04:00
Barış Soner Uşaklı
92376a1589 fix calls 2017-05-31 13:13:16 -04:00
Barış Soner Uşaklı
eb0faf1e4a change test to use new signature 2017-05-31 13:08:45 -04:00
Barış Soner Uşaklı
f17fcbbe5e add slick to core 🌟 2017-05-31 12:44:50 -04:00
Misty (Bot)
2d73e7fec2 Latest translations and fallbacks 2017-05-31 09:22:56 +00:00
Barış Soner Uşaklı
d20b599b20 closes #5723 2017-05-30 20:01:59 -04:00
Baris Usakli
da8b1b605c #5723 2017-05-30 17:21:34 -04:00
psychobunny
d8dfda4a54 Merge pull request #5720 from darktrge/small-changes
(minor) add .svn line to .gitignore
2017-05-30 17:01:57 -04:00
Baris Usakli
ba9397987a if no email dont send 2017-05-30 14:27:03 -04:00
Baris Usakli
d13eb52f39 closes #5722 2017-05-30 14:10:16 -04:00
Julian Lam
12524b5ce4 fix lint 2017-05-30 13:17:26 -04:00
Julian Lam
d2b5b53cb4 refactor for sendValidationEmail, and sending better dummy data for welcome email template 2017-05-30 13:09:30 -04:00
Julian Lam
7ce208ca13 Better dummy data for testing banned email template 2017-05-30 12:11:44 -04:00
Julian Lam
313d48b47d updated emailer code so digest emails when tested in ACP are sent with real data instead of incomplete fake data 2017-05-30 12:11:44 -04:00
Danijel Marjanovic
362bccbed8 add .svn line to .gitignore 2017-05-30 16:52:14 +02:00
psychobunny
fa25dcd6a5 move ACP category selector in line with pills 2017-05-29 18:26:20 -04:00
psychobunny
9cb5f71e08 #5717 also don't show category section in subcategory listing 2017-05-29 18:04:35 -04:00
psychobunny
65a015a1ad up lav 2017-05-29 17:12:08 -04:00
psychobunny
88d5f97280 closes #5717 2017-05-29 17:12:02 -04:00
psychobunny
22891215cd Merge branch 'master' of https://github.com/NodeBB/NodeBB 2017-05-29 16:19:46 -04:00
Misty (Bot)
9031c5a2a6 Incremented version number - v1.5.1 2017-05-29 16:01:09 -04:00
psychobunny
179b11b7d2 ACP allow ctrl-click to open new in new tab when settings are unsaved 2017-05-29 15:34:09 -04:00
Baris Usakli
883b35243f fix lint 2017-05-29 15:12:22 -04:00
Baris Usakli
d7684b042f fix tab 2017-05-29 14:52:10 -04:00
Baris Usakli
1fa52267d4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/src/admin/manage/category.js
2017-05-29 14:48:25 -04:00
Baris Usakli
de5fe25e57 closes #5715 2017-05-29 14:47:01 -04:00
Barış Soner Uşaklı
59b1d8fbae Merge pull request #5710 from NodeBB/_lodash
Switch from underscore to lodash
2017-05-29 13:38:21 -04:00
psychobunny
292c04a613 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2017-05-29 13:26:36 -04:00
psychobunny
dcbe4864a9 fix bad merge / dupe code 2017-05-29 13:26:17 -04:00
Peter Jaszkowiak
d4e7db45b7 Use zipObject, more test-related ignores 2017-05-29 11:23:25 -06:00
Baris Usakli
dc0971c122 up composer 2017-05-29 13:13:16 -04:00
Peter Jaszkowiak
3da2e1f07f Merge branch '_lodash' of github.com:nodebb/nodebb into _lodash 2017-05-29 11:08:42 -06:00
psychobunny
dd90b14d64 up tjs 2017-05-29 12:31:56 -04:00
Misty (Bot)
25a84d7314 Latest translations and fallbacks 2017-05-29 09:23:17 +00:00
Peter Jaszkowiak
dfbb96d47b Remove require.main.require 2017-05-28 23:02:01 -06:00
Peter Jaszkowiak
7127f34818 Fix indent 2017-05-28 16:52:36 -06:00
Barış Soner Uşaklı
9664033b73 add memory usage to info page 2017-05-28 18:40:32 -04:00
Barış Soner Uşaklı
932247f440 up deps 2017-05-28 17:21:49 -04:00
Barış Soner Uşaklı
8eb5564977 fix popular sort 2017-05-28 17:21:49 -04:00
Misty (Bot)
57c0861310 Latest translations and fallbacks 2017-05-28 09:23:18 +00:00
Barış Soner Uşaklı
850b33d630 up composer 2017-05-28 01:36:08 -04:00
Barış Soner Uşaklı
3049f5cf1f #5522 test 2017-05-28 01:26:56 -04:00
Barış Soner Uşaklı
6635b50c35 closes #5522 2017-05-28 01:10:19 -04:00
Barış Soner Uşaklı
937d6dd4df fix acp privilege page not loading 2017-05-28 01:10:19 -04:00
Barış Soner Uşaklı
eed784f1e6 Merge pull request #5713 from NodeBB/issues-bugs
Bugs and features only, comment out examples
2017-05-28 00:12:35 -04:00