Commit Graph

163 Commits

Author SHA1 Message Date
Julian Lam
0e26fdf1da Merge branch 'master' into search_hooks 2014-02-20 21:08:31 -05:00
Julian Lam
42d33f8338 first pass #899 2014-02-19 21:06:30 -05:00
psychobunny
163b0f964e Merge remote-tracking branch 'origin/master' into Widgets 2014-02-19 17:45:40 -05:00
psychobunny
0963e62acb completely removing all motd code in favour of using the widget system 2014-02-19 17:31:13 -05:00
Baris Soner Usakli
495fded6dd closes #1038 2014-02-19 15:33:59 -05:00
Julian Lam
0b0b74a559 properly translating strings in category nojs template, and added pagination (so not all topics are loaded on every request) 2014-02-18 19:23:36 -05:00
Baris Soner Usakli
83ad454c3e better error message if image upload fails, #1052 2014-02-18 00:25:30 -05:00
Baris Soner Usakli
21367a1847 reverse infinite loading 2014-02-17 20:57:12 -05:00
Baris Soner Usakli
075c6c01f2 upload changes, show progres in composer 2014-02-13 19:41:54 -05:00
Baris Soner Usakli
1c14bcd1ed dont update last online time if status is offline 2014-02-12 17:16:16 -05:00
Baris Soner Usakli
7b4f098cb4 dont allow negative or zero pagination values for user setting 2014-02-12 13:11:28 -05:00
Baris Soner Usakli
475f9bea04 closes #1011, last online wont give away your invisible status 2014-02-12 10:53:34 -05:00
Baris Soner Usakli
4ff62f4e30 closes #1005 2014-02-11 17:16:17 -05:00
Baris Soner Usakli
55951fec6f removed marked from motd' 2014-02-10 19:14:50 -05:00
Baris Soner Usakli
242927d702 user selectable pagination 2014-02-10 14:15:54 -05:00
Baris Soner Usakli
26849ba2b7 added hooks for image uploads into user and admin routes 2014-02-09 00:33:10 -05:00
Baris Soner Usakli
378ccc3cb7 removed imgur from core 2014-02-08 22:09:28 -05:00
Baris Soner Usakli
db309ce8a1 closes #661 2014-01-31 22:25:59 -05:00
psychobunny
4647b88071 added optional forum terms of use to ACP, closes #775 2014-01-31 11:38:23 -05:00
Baris Soner Usakli
a86ddc9934 closes #726 2014-01-30 19:46:25 -05:00
Julian Lam
55b67ed735 Merge branch 'master' of github.com:designcreateplay/NodeBB
Conflicts:
	src/routes/api.js
2014-01-30 15:40:44 -05:00
Julian Lam
0376e3d574 renamed language directories to ICU standard, upgrade script, no longer promoting english at top of list in languages tab, en now en_GB, encompasses Canadian and English English 2014-01-30 15:39:51 -05:00
psychobunny
68105c6289 send environment state to client 2014-01-30 13:37:30 -05:00
psychobunny
92725ee3df Merge pull request #874 from BitBangersCode/templates-fix
Add custom templates to /api/get_templates_listing
2014-01-30 08:38:16 -08:00
Baris Soner Usakli
25c4648e2e load 20 in recent 2014-01-26 17:25:18 -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
22354227be hiding "Forgot Password" link using Plugins.hasListeners, instead of derpy config settings bool 2014-01-26 15:59:22 -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
MrWaffle
869f9e0d86 Add custom templates to /api/get_templates_listing 2014-01-25 23:13:51 +01:00
Baris Soner Usakli
ef6fd35e85 lots of cleanup, moved pagination to requirejs module 2014-01-24 22:26:11 -05:00
Baris Soner Usakli
606367701f pagination on posts 2014-01-24 20:00:56 -05:00
Baris Soner Usakli
cf39c66017 some pagination work 2014-01-24 13:27:36 -05:00
psychobunny
3b4f0a8f4e updating motd for incoming theme 2014-01-21 16:51:04 -05:00
Julian Lam
53a1474785 second pass for #773, blocked for now 2014-01-21 15:29:34 -05:00
Julian Lam
bafc8caaf5 first pass at #773 2014-01-21 15:17:41 -05:00
Baris Soner Usakli
9400e5bcc9 motd 2014-01-21 01:27:39 -05:00
Julian Lam
affa51856b closed #801 pending explanation 2014-01-20 19:05:19 -05:00
Baris Soner Usakli
84aa1ab527 motd string and class 2014-01-19 22:44:13 -05:00
Baris Soner Usakli
c00bd0b8d0 oops fixed 2014-01-17 18:14:00 -05:00
Baris Soner Usakli
22e1b0f22e check result for null 2014-01-17 18:12:56 -05:00
Baris Soner Usakli
e6a9f5a704 error check 2014-01-17 18:11:36 -05:00
Julian Lam
962955f06a fixed bug with search (getTopicsByTids became error-first) 2014-01-17 14:29:46 -05:00
Julian Lam
af6eb5359e Merge branch 'master' into socketAL-fix
Conflicts:
	public/language/cs/global.json
	public/language/fr/global.json
	src/routes/api.js
2014-01-17 12:10:49 -05:00
Julian Lam
5e695d3222 fixed incorrect language string used in fb button in default motd 2014-01-17 12:02:12 -05:00
Julian Lam
45ce0566e7 added translation to default MOTD 2014-01-17 08:58:46 -05:00
Julian Lam
14b31cf4c8 hiding fork button on xs/sm devices (default motd) 2014-01-17 08:58:40 -05:00