Commit Graph

2350 Commits

Author SHA1 Message Date
psychobunny
4435a20d90 fixed merge conflict 2014-02-27 15:11:50 -05:00
psychobunny
4a33b41464 deprecating loadServer in favour of using res.render 2014-02-27 14:44:19 -05:00
Julian Lam
e2fb3dacca pushing new language fallbacks 2014-02-27 14:10:13 -05:00
Julian Lam
dfd13fac0d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-27 14:05:55 -05:00
Julian Lam
44ac7ec262 added new hooks for rendering help messages in composer, removed markdown text from translation 2014-02-27 14:05:31 -05:00
Baris Soner Usakli
30eb85f96e fixed conflicts 2014-02-27 12:46:37 -05:00
Baris Soner Usakli
44d40fba35 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-27 12:15:34 -05:00
Baris Soner Usakli
0ca6c58ded closes #1137 2014-02-27 12:15:26 -05:00
Julian Lam
1a85d45567 portuguese and slovak translations 2014-02-27 10:41:59 -05:00
Baris Soner Usakli
dcd3975933 closes #1135 2014-02-27 00:45:29 -05:00
akhoury
2209a55afc - changes per PR conversation 2014-02-26 23:34:03 -05:00
akhoury
0070e1158e removing a boolean left out from the addEventListener definition 2014-02-26 22:32:09 -05:00
Baris Soner Usakli
72aa22d824 removed unused timestamp 2014-02-26 22:19:01 -05:00
akhoury
3f1d5c6656 merge fork with upstream master 2014-02-26 22:01:29 -05:00
Baris Soner Usakli
87ccfdf5eb Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 21:58:12 -05:00
Baris Soner Usakli
d87034b131 use alert for bookmark 2014-02-26 21:58:04 -05:00
akhoury
1b207d8276 IE8 support, general cleanups, from native to $ objects ... 2014-02-26 21:55:29 -05:00
akhoury
b59c10a1e9 took out some overrides out utils to a new overrides.js 2014-02-26 21:49:22 -05:00
Julian Lam
ef2dbe8df6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-26 21:10:15 -05:00
Julian Lam
04b2887d88 fixed it language code 2014-02-26 21:10:05 -05:00
Baris Soner Usakli
d5268f5497 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 17:17:02 -05:00
Baris Soner Usakli
56bbeb9950 use disableSocialButtons from config 2014-02-26 17:16:55 -05:00
psychobunny
2247a8b21f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 17:00:07 -05:00
psychobunny
aee2b2ecd0 allow express to serve parsed tpls via res.render 2014-02-26 17:00:03 -05:00
Baris Soner Usakli
ea6cf3bbd5 more cleanup and changes to topics 2014-02-26 16:43:21 -05:00
Julian Lam
74d6392bec added Dutch language 2014-02-26 14:55:45 -05:00
Julian Lam
c38e328377 language files for fi, it, zh_CN, pl, hu 2014-02-26 14:50:44 -05:00
Baris Soner Usakli
8a2266816d make plugin names strong 2014-02-26 13:14:48 -05:00
Baris Soner Usakli
36bc2967c2 fix highlight on vanilla, dont replaceState if url didnt change 2014-02-25 22:05:07 -05:00
Baris Soner Usakli
1ba3acfd03 display ips to admins/users on profile 2014-02-25 17:34:42 -05:00
Julian Lam
6545357969 fixing admin stylesheet + lavender minver 2014-02-25 17:15:46 -05:00
Julian Lam
f5d1ba4231 closed #1113 2014-02-25 17:07:27 -05:00
Baris Soner Usakli
8913de4ea8 dont add post-bar to each post 2014-02-25 16:55:05 -05:00
Baris Soner Usakli
3c53ebb02e better scrolling 2014-02-25 16:33:22 -05:00
Baris Soner Usakli
23c20a2821 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-25 15:26:18 -05:00
Baris Soner Usakli
b658c68736 back doesnt work 2014-02-25 15:26:10 -05:00
Julian Lam
4c21b23ea2 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-25 15:21:10 -05:00
Baris Soner Usakli
a3855a47e5 check replaceState 2014-02-25 15:12:42 -05:00
Baris Soner Usakli
5567378234 change hash take 2 2014-02-25 15:10:50 -05:00
Julian Lam
7f11d78b82 Merge branch 'master' into less-is-moar 2014-02-25 14:59:21 -05:00
Julian Lam
e3ec4e938a Revert "update post has in address bar, #1126"
This reverts commit 4b1c8150d3.
2014-02-25 14:59:07 -05:00
Baris Soner Usakli
4b1c8150d3 update post has in address bar, #1126 2014-02-25 14:51:11 -05:00
Baris Soner Usakli
14b298eda8 cleaned updateHeader 2014-02-25 14:29:19 -05:00
Baris Soner Usakli
f39248c83b closes #1123 2014-02-25 14:17:42 -05:00
Julian Lam
53f1e4d3d4 dedicated stylesheet.css route for LESS compilation, no longer usin less-middleware for base theme... 2014-02-25 14:13:09 -05:00
Baris Soner Usakli
7e5a7c53bd changes to templates 2014-02-25 14:03:47 -05:00
psychobunny
156c0302c9 properly namespacing objects in templates 2014-02-25 13:15:23 -05:00
Baris Soner Usakli
0777c96a55 dont highlight reverse infinite loaded posts 2014-02-24 19:26:26 -05:00
Baris Soner Usakli
0da2839943 added the class for topic delete 2014-02-24 19:16:23 -05:00
Baris Soner Usakli
3ed2d21eb6 fixed flag post, added highlight to scroll post 2014-02-24 17:19:49 -05:00