Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-04 21:59:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,036 Commits 73 Branches 490 Tags
95102f7e74ffceb694ff3ff82cd35558467691b3
Commit Graph

3320 Commits

Author SHA1 Message Date
Julian Lam
71916f0691 marathon bugfixing with @barisusakli re: #1788 2014-07-07 19:47:03 -04:00
Julian Lam
d9cdd2f165 limiting recent chats to 20 2014-07-07 17:02:35 -04:00
Julian Lam
13e4e8dad7 a couple final tweaks to contact list and such... #1788 2014-07-07 16:59:46 -04:00
Julian Lam
ac9f104b39 Merge remote-tracking branch 'origin/chat-route' into chat-route 
How in the seven hells do I manage to conflict myself?

Conflicts:
	public/src/forum/chats.js
	public/src/modules/chat.js
	src/middleware/middleware.js
 2014-07-07 16:06:56 -04:00
Julian Lam
1db96dc627 typing notifcation socket implementation for chat page, #1788 2014-07-07 12:31:10 -04:00
Julian Lam
84e046185b WIP 2014-07-07 12:31:10 -04:00
Julian Lam
4d85df5bae issue #1788 - start 2014-07-07 12:31:10 -04:00
Julian Lam
404ab4878b typing notifcation socket implementation for chat page, #1788 2014-07-06 16:28:49 -04:00
barisusakli
bc257c1c10 removed dupe version 2014-07-06 15:12:13 -04:00
Julian Lam
d18461c8eb wtf. Merge remote-tracking branch 'origin/chat-route' into chat-route 
Conflicts:
	public/language/en_GB/modules.json
	src/controllers/accounts.js
	src/middleware/middleware.js
	src/routes/index.js
 2014-07-05 15:46:37 -04:00
Julian Lam
89dc8c490a WIP 2014-07-05 15:01:25 -04:00
barisusakli
43c1787754 dont exist if cant parse css 2014-07-05 14:27:21 -04:00
barisusakli
37b73e1c02 cleaner mongo setRemoveRandom 2014-07-04 23:36:40 -04:00
Julian Lam
0dad7adb8d issue #1788 - start 2014-07-04 22:04:20 -04:00
Julian Lam
b03bb3a32b issue #1788 - start 2014-07-04 19:54:47 -04:00
barisusakli
5097526ae0 pass express app to plugins, closes #1789 2014-07-04 18:25:08 -04:00
barisusakli
f288f80da6 meta.js refactor 2014-07-04 18:20:44 -04:00
barisusakli
80cb0cf7e0 plugins.js jslint 2014-07-04 14:43:08 -04:00
psychobunny
ddcca28cf0 pass allowRegistration in login API for #1786 2014-07-04 11:41:03 -04:00
barisusakli
3e75a4397a fixes guest post data in topics 2014-07-03 09:42:39 -04:00
barisusakli
dcbed4e935 closes #1763 
show alert if email not confirmed, clicking alert will send confirmation
email
 2014-07-03 09:36:46 -04:00
barisusakli
586aeaf53f added error checking to install.js for categories 2014-07-02 21:55:05 -04:00
barisusakli
5ea74ae9e9 closes #1776 2014-07-02 16:19:55 -04:00
barisusakli
119d13053d move static to end 2014-07-02 16:13:27 -04:00
barisusakli
ec1196d288 use router for relative path 2014-07-02 16:13:27 -04:00
barisusakli
38494a2af0 pass in session directly 2014-07-02 16:13:26 -04:00
barisusakli
78c977e8f6 removed trailing slash 2014-07-02 16:13:26 -04:00
barisusakli
9e8584eee7 uploads 2014-07-02 16:13:25 -04:00
barisusakli
24ebf20d7e first commit 2014-07-02 16:13:25 -04:00
barisusakli
4b005a4037 crash fix 2014-07-02 15:01:14 -04:00
barisusakli
e6c9647acf display user post topic stats in admin index 2014-07-01 16:30:06 -04:00
barisusakli
9a4e6aa01c closes #1774 2014-07-01 14:49:51 -04:00
barisusakli
6389bc762c fire post edit after hook after post is saved 2014-06-30 17:33:31 -04:00
barisusakli
c29dcc0ec9 fire topic edit action after topic is saved 2014-06-30 16:59:36 -04:00
barisusakli
b8b6ae7b2f moved upload route into API namespace 2014-06-30 16:33:10 -04:00
barisusakli
b41b311d94 another eachLimit 2014-06-30 15:45:39 -04:00
Julian Lam
ffd2ddc3e7 Revert "moved meta up" 
This reverts commit 8c9feb85a4.
 2014-06-30 14:55:23 -04:00
Julian Lam
cda3f9376d updated error text to show proper setup command 2014-06-30 14:55:21 -04:00
barisusakli
5ec289eee2 closes #1769 2014-06-30 14:19:06 -04:00
barisusakli
efcc42f170 added eachLimit to upgrade script 2014-06-30 14:07:30 -04:00
barisusakli
8c9feb85a4 moved meta up 2014-06-29 14:30:51 -04:00
barisusakli
82a1215128 setOnEmpty 2014-06-29 14:29:32 -04:00
barisusakli
9aacb5e259 remove dupe code 2014-06-29 14:10:20 -04:00
barisusakli
24aa166ed5 dont error when no teaser data 2014-06-28 16:18:29 -04:00
barisusakli
d57f183f42 privileges.posts.get takes an array of pids now 2014-06-28 14:59:01 -04:00
barisusakli
6cd29a31a4 removed timing 2014-06-28 01:14:24 -04:00
barisusakli
c3a9767bf6 late night optimizations 
-isMemberOfSets returns true/false instead of 1/0
-when loading the posts of a topic only get the userdata for each user
once, before this commit if a topic had 10 posts from 2 different users
we were getting the user data for each user 5 times (drunk)
-getVoteStatusByPostIDs and getFavouritesByPostIDs no longer make
pids.length calls to the db, they use isMemberOfSets now
-getUserInfoForPost renamed to getUserInfoForPosts and doesnt make
uids.length calls to db, uses getMultipleUserFields instead
 2014-06-28 01:03:26 -04:00
barisusakli
d3fc71529a callback 2014-06-27 23:23:27 -04:00
barisusakli
a9e5e82431 closes #1758 2014-06-27 15:35:58 -04:00
Julian Lam
46f9a7860c applying translator to messages. 2014-06-27 14:52:30 -04:00