Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 04:21:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,105 Commits 78 Branches 492 Tags
3175d58dc0934b45ab94de8a9ca4c371a52ab933
Commit Graph

17105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Barış Soner Uşaklı
5e90e4db02 closes #5618 2017-05-27 23:58:12 -04:00
Barış Soner Uşaklı
08aaabd33c closes #5642 2017-05-27 23:32:55 -04:00
Peter Jaszkowiak
38d27e9347 Wrong URL 2017-05-27 15:18:54 -06:00
Peter Jaszkowiak
afb79e97eb Ignore normalised image 2017-05-27 14:52:37 -06:00
Peter Jaszkowiak
3c2d4fe649 Switch from underscore to lodash 2017-05-27 14:51:45 -06:00
Peter Jaszkowiak
283951e810 Bugs and features only, comment out examples 2017-05-27 14:31:05 -06:00
Misty (Bot)
033c31719a Latest translations and fallbacks 2017-05-27 09:23:11 +00:00
Barış Soner Uşaklı
890c2eff70 style changes 2017-05-27 01:44:26 -04:00
Barış Soner Uşaklı
bcc566fb68 remove unnecessary checks 2017-05-27 00:47:04 -04:00
Barış Soner Uşaklı
f1b8492164 remove unnecessary checks 2017-05-27 00:30:07 -04:00
Barış Soner Uşaklı
6a742ead38 style 2017-05-26 23:55:20 -04:00
Barış Soner Uşaklı
8e31ec7199 closes #5705 2017-05-26 23:30:23 -04:00
Barış Soner Uşaklı
3d1b1a9423 closes #5706 2017-05-26 23:21:46 -04:00
Barış Soner Uşaklı
dcf3db104b search style 2017-05-26 22:28:12 -04:00
Barış Soner Uşaklı
9ec65db539 closes #5711 2017-05-26 21:52:08 -04:00
Barış Soner Uşaklı
271c10c9d7 dont create indices after every test 2017-05-26 21:14:52 -04:00
Barış Soner Uşaklı
21d2e6df12 Merge pull request #5709 from NodeBB/tests-after-each 
Fix many "duplicate key" errors
 2017-05-26 21:06:00 -04:00
Peter Jaszkowiak
b171f3072b Fix many "duplicate key" errors 
- Reset defaults after every test
- Remove individual `after(db.emptydb)` calls
- Fix async.every in groups test
- Update plugin list in socket tests
 2017-05-26 17:16:59 -06:00