Commit Graph

1938 Commits

Author SHA1 Message Date
Baris Soner Usakli
25c4648e2e load 20 in recent 2014-01-26 17:25:18 -05:00
Baris Soner Usakli
8770284661 removed console.log 2014-01-26 17:23:28 -05:00
Baris Soner Usakli
8d0b880e5a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 17:17:49 -05:00
Baris Soner Usakli
25442a89ca closes #878 2014-01-26 17:17:34 -05:00
psychobunny
6ab08e91a2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 16:52:07 -05:00
psychobunny
45a5b88824 added filter:messaging.parse hook 2014-01-26 16:50:59 -05:00
Baris Soner Usakli
fac2cd9464 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 16:23:39 -05:00
Baris Soner Usakli
da626a4035 more fixes 2014-01-26 16:23:37 -05:00
Julian Lam
0c71707fb5 fixed #877 2014-01-26 16:22:50 -05:00
Julian Lam
0869765e2b Merge remote-tracking branch 'origin/master' 2014-01-26 16:01:36 -05:00
Julian Lam
22354227be hiding "Forgot Password" link using Plugins.hasListeners, instead of derpy config settings bool 2014-01-26 15:59:22 -05:00
Julian Lam
96b2a15290 user registration now no longer sends a welcome email if no emailers are present 2014-01-26 13:21:23 -05:00
Julian Lam
d7d4290099 resolved #879 2014-01-26 13:10:39 -05:00
Baris Soner Usakli
bd0b5f4cdb more error checks in thread move 2014-01-25 22:43:49 -05:00
Baris Soner Usakli
2988230b07 some more fixes, cant quote and see deleted messages 2014-01-25 22:19:51 -05:00
Baris Soner Usakli
1afd7ae332 trim pagination numberS 2014-01-25 21:25:56 -05:00
Baris Soner Usakli
6628db89af added saerch array 2014-01-25 20:36:55 -05:00
Baris Soner Usakli
b4ea8e58fa removed check for no topics in category, you should be able to go into empty categories 2014-01-25 20:08:02 -05:00
Baris Soner Usakli
6ff11c5243 check for number 2014-01-25 19:57:25 -05:00
Baris Soner Usakli
75f178636b more fixes 2014-01-25 19:50:50 -05:00
Baris Soner Usakli
1084523c92 lots of pagination work, query params, ajaxify to pids 2014-01-25 19:19:25 -05:00
Baris Soner Usakli
8744013013 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination 2014-01-25 16:42:06 -05:00
Baris Soner Usakli
2e786cc4d1 closes #873, removed global translator, templates and server objects 2014-01-25 16:39:27 -05:00
Baris Soner Usakli
393bb7245c closes #866 2014-01-25 12:05:48 -05:00
Baris Soner Usakli
d718eca935 fixes global meta leak, and categories meta require, #873 2014-01-25 01:34:56 -05:00
psychobunny
46e29dfb2b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-25 00:05:45 -05:00
psychobunny
d67ae5c2be changing undetected minified JS file warning to info message instead 2014-01-25 00:05:41 -05:00
Baris Soner Usakli
b23960e8d7 fixes to category pagination 2014-01-24 23:05:59 -05:00
Baris Soner Usakli
ef6fd35e85 lots of cleanup, moved pagination to requirejs module 2014-01-24 22:26:11 -05:00
Baris Soner Usakli
0580d0c8a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination 2014-01-24 20:51:02 -05:00
Baris Soner Usakli
606367701f pagination on posts 2014-01-24 20:00:56 -05:00
Julian Lam
d5534cf545 fixing upgrade script on edge builds 2014-01-24 19:55:19 -05:00
Baris Soner Usakli
8d007e7029 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination 2014-01-24 13:27:45 -05:00
Baris Soner Usakli
cf39c66017 some pagination work 2014-01-24 13:27:36 -05:00
Julian Lam
a3fe390810 reverting change to User.search that added "timing" to the return of User.search. Such a change can only be made for 0.4.0, sorry! 2014-01-24 13:09:44 -05:00
Baris Soner Usakli
620ff65cbe Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-24 12:11:29 -05:00
Baris Soner Usakli
7f23f848fe fix for mismatch between favourite count and number of people in favourited seT 2014-01-24 12:11:22 -05:00
Julian Lam
459d5ddccd fixed #867 - added proper detection so that onpopstate would not react if it was a proper page load 2014-01-24 10:09:28 -05:00
Julian Lam
43808c01ec reduced the number of 'ajaxify.go' calls to one, in /src 2014-01-24 10:00:57 -05:00
Julian Lam
b587d7b5ad fixed issue where calls to ajaxify.go were sending in a "template" argument that had since been removed, navigating back to NodeBB from an external link now no longer clobbers the History stack. 2014-01-24 09:48:41 -05:00
Julian Lam
dc7cd95f6d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-24 08:18:02 -05:00
Baris Soner Usakli
f3bdc55348 little tweak to user search show timing and 10 users, sort after slicing 2014-01-23 23:31:10 -05:00
akhoury
dcc6ec797e removed use_proxy config, cleaned-up some comments and sneaked in a time log print on initialization, also, related to pull#820 2014-01-23 20:35:53 -05:00
Baris Soner Usakli
b0ef974590 lots of cleanup and refactor 2014-01-23 19:01:30 -05:00
Baris Soner Usakli
f62c82c797 send app to action:app.load 2014-01-23 17:08:33 -05:00
Baris Soner Usakli
bc1cde38da added getObjectKeys for julian :) 2014-01-23 16:34:54 -05:00
Julian Lam
2af14e47b1 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-23 16:20:46 -05:00
Julian Lam
d380f69310 support for "registered users" and "administrators" in access control (categories). Renamed "Administrators" group to "administrators", and made hidden 2014-01-23 16:19:10 -05:00
Baris Soner Usakli
824c5072e8 topics should be marked read correctly if you are already in it 2014-01-23 15:46:39 -05:00
Julian Lam
f02cd9df82 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
Conflicts:
	src/user.js
2014-01-23 08:15:16 -05:00