Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-10 08:37:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,851 Commits 75 Branches 490 Tags
78bb4776df82eaf1f2c7242091494de713f2cb7c
Commit Graph

11851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baris Soner Usakli
7135e9424c closes #1167 2014-03-06 13:32:26 -05:00
Baris Soner Usakli
3fe9bdc24c removed the postbar selector from activeusers 2014-03-06 13:08:22 -05:00
psychobunny
a9046b926d clean templates directory before beginning compilation 2014-03-06 12:25:10 -05:00
psychobunny
90a80ad83d plugins can now define a templates directory which gets compiled onload without requiring any hooks 2014-03-06 12:06:19 -05:00
psychobunny
c054ae121b Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-06 10:56:36 -05:00
Julian Lam
4a1513eabf fixed #1161 properly - Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/upgrade.js
 2014-03-06 10:35:12 -05:00
Barış Soner Uşaklı
b79169a765 Merge pull request #1161 from code-press/master 
Upgrade script incorrectly looking for "err"
 2014-03-06 01:24:32 -05:00
Anthony Webb
21b1bc1729 Revert "Remove text" 
This reverts commit c25835c63e.
 2014-03-06 00:13:13 -06:00
Anthony Webb
6f8ed7f073 err doesnt exist here 2014-03-06 00:07:07 -06:00
Anthony Webb
d9ca95a5a3 Merge remote-tracking branch 'upstream/master' 2014-03-06 00:04:47 -06:00
psychobunny
f20a2a2047 merging changes from deprecated routes/user.js 2014-03-06 00:52:12 -05:00
psychobunny
8a05eee1f5 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	src/routes/user.js
 2014-03-06 00:51:36 -05:00
Baris Soner Usakli
096f352c82 closes #1130 2014-03-05 23:00:27 -05:00
Julian Lam
e956c19587 #1110 - moved isEmailAvailable into User.email 2014-03-05 21:21:53 -05:00
Julian Lam
e0dcf95138 fixed missing err in upgrade script 2014-03-05 21:19:36 -05:00
Baris Soner Usakli
38145abae1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-05 20:37:40 -05:00
Baris Soner Usakli
58cb51bb02 removed unused imagemagick require 2014-03-05 20:37:31 -05:00
Julian Lam
b404b0197f final pass, resolved #1155 2014-03-05 19:51:16 -05:00
Julian Lam
5f52ef5f01 removed all 0.3.x related upgrade scripts, and updated minSchemaDate 2014-03-05 19:41:16 -05:00
Julian Lam
64aa89f5ee updating upgrade script to use UTC timestamps *facepalm*. God, I hope I didn't break anything... 
(first pass #1155)
 2014-03-05 19:33:10 -05:00
psychobunny
34552f7fb0 added middleware.guestSearchingAllowed to the actual search API call 2014-03-05 17:37:54 -05:00
psychobunny
542f937589 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	src/routes/api.js
 2014-03-05 17:35:41 -05:00
psychobunny
b9e119241e moved get_custom_templates into plugins.js 2014-03-05 17:23:08 -05:00
psychobunny
8f7a7fec7d more cleanup; commenting out custom plugin routes until its fixed properly 2014-03-05 17:13:55 -05:00
psychobunny
c0cd6148f4 one final push, cleanup + organize + lint; made feeds/meta/plugins routes follow same pattern as other route files 2014-03-05 17:06:24 -05:00
Baris Soner Usakli
c028761857 new route to get recent posts 2014-03-05 16:49:42 -05:00
psychobunny
1dbc47b890 deps cleanup 2014-03-05 16:25:55 -05:00
psychobunny
73d637096c Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	public/templates/account.tpl
	public/templates/accountposts.tpl
	public/templates/favourites.tpl
	public/templates/search.tpl
 2014-03-05 15:59:50 -05:00
psychobunny
3efca794fd regex cleanup; fixed indenting on partials 2014-03-05 15:58:43 -05:00
Baris Soner Usakli
6f806d80c2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-05 15:39:02 -05:00
Baris Soner Usakli
c9c25bd174 added getRecentPost 2014-03-05 15:38:54 -05:00
Julian Lam
6192af18ab Merge pull request #1159 from BitBangersCode/settings-callback 
Send the callback to the retry
 2014-03-05 15:37:45 -05:00
psychobunny
67517c58e3 added warning if partial template was not found 2014-03-05 15:31:02 -05:00
psychobunny
d442e10037 template compilation + partials support 2014-03-05 15:13:54 -05:00
MrWaffle
33a5a2177e Send the callback to the retry 2014-03-05 20:57:32 +01:00
Baris Soner Usakli
976744480f post summary change 2014-03-05 14:52:32 -05:00
David Hoff
c25835c63e Remove text 2014-03-05 13:59:59 -05:00
psychobunny
3614211f0e Merge remote-tracking branch 'origin/master' into webserver.js-refactor 
Conflicts:
	public/templates/accountposts.tpl
	public/templates/header.tpl
 2014-03-04 17:52:15 -05:00
psychobunny
552eb78db8 template compiling init; changing themes now finally works on this branch 2014-03-04 17:49:56 -05:00
psychobunny
88e5ddac76 deprecating hook events on body 2014-03-04 17:22:45 -05:00
psychobunny
c67182204f clean-up + bugfixes 2014-03-04 17:20:12 -05:00
psychobunny
444956d517 deprecated loadTemplates client-side as well 2014-03-04 17:16:12 -05:00
psychobunny
68d526b762 deprecated templates.ready, templates.init, templates.loadServer; start webserver immediately without having to wait for templates.js 2014-03-04 17:14:01 -05:00
psychobunny
d471ea2d5b app.create_route removed 2014-03-04 17:11:40 -05:00
psychobunny
da331a1e6b clean up in routes/admin.js 2014-03-04 17:10:51 -05:00
psychobunny
fe147bfb67 have supervisor ignore public/templates folder 2014-03-04 17:08:30 -05:00
psychobunny
f73fd1eeae removed an unused hack in utils.js 2014-03-04 17:08:15 -05:00
Baris Soner Usakli
76d8d09f9b closes #1141 2014-03-04 16:48:07 -05:00
psychobunny
1dc63caf77 using views_dir config 2014-03-04 16:12:02 -05:00
psychobunny
d4f453cde3 added gitignore to public/templates dir 2014-03-04 16:11:03 -05:00