Commit Graph

3396 Commits

Author SHA1 Message Date
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
aa73a10fc4 added pagination to vanilla topic template 2014-01-24 21:01:28 -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
5f0c6e508d some cleanup 2014-01-24 20:50:55 -05:00
Baris Soner Usakli
606367701f pagination on posts 2014-01-24 20:00:56 -05:00
Julian Lam
1cce38cae6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-24 19:55:34 -05:00
Julian Lam
d5534cf545 fixing upgrade script on edge builds 2014-01-24 19:55:19 -05:00
psychobunny
0a749023cb fixing if statements inside a @first / @last block 2014-01-24 14:19:24 -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
e09132350d re-adding conditional to hide quote/reply block if no write perm 2014-01-24 13:26:50 -05:00
psychobunny
503e59b12b clean up conditionals only at the very end of parsing 2014-01-24 13:25:33 -05:00
Julian Lam
26848641cd restoring post/quote buttons pending template system fix for IFs 2014-01-24 13:11:30 -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
Julian Lam
be86f84ef8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-24 12:29:28 -05:00
Julian Lam
ab85ef6b7b fixed issue where back button stopped ajaxifying internally. 2014-01-24 12:29:11 -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
ef450edfea Revert "possible fix to #840", please see #867
This reverts commit 1d666bf7f0.
2014-01-24 08:48:40 -05:00
Julian Lam
dc7cd95f6d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-24 08:18:02 -05:00
Barış Soner Uşaklı
c91ae0c4c4 Update categories.js 2014-01-24 00:42:34 -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
Baris Soner Usakli
1d666bf7f0 possible fix to #840 2014-01-23 22:45:11 -05:00
Baris Soner Usakli
3ea7d4d217 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-23 21:35:33 -05:00
Baris Soner Usakli
3793ddc2e8 fixes user tooltips on infinit load 2014-01-23 21:35:25 -05:00
Julian Lam
3fa9e3f31b Merge pull request #862 from akhoury/master
removed use_proxy config, cleaned-up some comments
2014-01-23 18:23:33 -08: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
6da12d1a39 and for andrew 2014-01-23 16:37:11 -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
a0e9e52e70 adding xregexp to ACP header 2014-01-23 15:16:30 -05:00
Baris Soner Usakli
47c32738a6 removed tests from acp 2014-01-23 12:51:54 -05:00