Commit Graph

5262 Commits

Author SHA1 Message Date
Baris Soner Usakli
1d666bf7f0 possible fix to #840 2014-01-23 22:45:11 -05:00
Baris Soner Usakli
3793ddc2e8 fixes user tooltips on infinit load 2014-01-23 21:35:25 -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
Baris Soner Usakli
044382047d removed commented out section 2014-01-22 17:29:23 -05:00
Baris Soner Usakli
46fb6377ee fixed topic reply if title was 255, better notif text in unread and recent,removed console.log 2014-01-22 17:23:20 -05:00
Baris Soner Usakli
79803d2b3d Merge branch 'favourite-spy' of https://github.com/BitBangersCode/NodeBB into BitBangersCode-favourite-spy 2014-01-22 15:28:09 -05:00
MrWaffle
d63ced8a5c Move to client side 2014-01-22 21:08:43 +01:00
MrWaffle
b887b76c29 Implement favourite tooltip to show who favourited a post 2014-01-22 19:46:34 +01:00
Baris Soner Usakli
45d2affdfb closes #833 2014-01-22 12:46:37 -05:00
Baris Soner Usakli
baa74958c5 can set image class for categories 2014-01-22 11:46:50 -05:00
Baris Soner Usakli
eac6b23811 closes #841 2014-01-22 11:08:52 -05:00
Barış Soner Uşaklı
c709fae251 Merge pull request #828 from BitBangersCode/admin-group-fix
Admin group fix
2014-01-22 08:03:01 -08:00
Julian Lam
4c01fc4c0e Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-21 22:30:25 -05:00
Julian Lam
7db231ca54 traditional chinese language pack - 很好? 2014-01-21 22:30:03 -05:00
Baris Soner Usakli
9393a39452 fixes translation in recent 2014-01-21 19:07:03 -05:00
Josh
4c211b7110 Fixed tabbing/spacing 2014-01-21 21:15:34 +00:00
Josh Rickers
21f6b10023 fixed indenting 2014-01-21 20:44:41 +00:00
Josh Rickers
f9e6fab3ea Fixed line spacing/tabbing 2014-01-21 20:40:55 +00:00
Josh Rickers
55b0270b34 Merge branch 'master' into admin-group-fix 2014-01-21 19:59:21 +00:00
Josh Rickers
a91e464787 updated groups to stop you from removing yourself from the admin group 2014-01-21 19:37:41 +00:00
Baris Soner Usakli
56c789ed61 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-21 12:35:41 -05:00
Baris Soner Usakli
aa2978976c notif fix 2014-01-21 12:35:34 -05:00
Julian Lam
73d9d6e1d3 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-21 12:33:22 -05:00
Julian Lam
92706a6550 fixed #826 2014-01-21 12:33:11 -05:00
Baris Soner Usakli
74ccfd1e4d moved islatin out too 2014-01-21 12:02:46 -05:00
Baris Soner Usakli
8f8ea4de92 slug fix 2014-01-21 12:01:09 -05:00
Baris Soner Usakli
104ec7de6e last poster is visible, slugify check for latin #777 2014-01-21 11:48:56 -05:00
Baris Soner Usakli
f107803550 fix 2014-01-21 10:07:24 -05:00
Baris Soner Usakli
039f02456d if user is in the topic when a new post comes in mark the topic read 2014-01-21 10:06:13 -05:00
Baris Soner Usakli
ccc62a202b dont go to top on search icon click 2014-01-20 21:41:04 -05:00
Baris Soner Usakli
56fcae1cb2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-20 21:29:22 -05:00
Baris Soner Usakli
7c16a8be31 recent reply fix 2014-01-20 21:29:14 -05:00
Julian Lam
cc236c1f72 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-20 21:15:55 -05:00
Julian Lam
39d9dd76dc removed preview button from ACP/themes 2014-01-20 21:15:52 -05:00
Baris Soner Usakli
55d4a5fe3a template fixes closes #825 2014-01-20 21:00:10 -05:00
Baris Soner Usakli
12a5b6b4c6 body margin for composer 2014-01-20 16:50:39 -05:00
Aziz Khoury
4fad334e18 Merge remote-tracking branch 'upstream/master' 2014-01-20 16:21:57 -05:00
Barış Soner Uşaklı
94f38d0622 Merge pull request #822 from BitBangersCode/admin-fix
Confirmation when removing user from a group
2014-01-20 13:18:52 -08:00
Josh
f7a290d0b3 removed function
removed function that did not work
2014-01-20 20:55:53 +00:00
Josh
a86ff15f7b Removed code for yourid
removed code that will give the current user id in a var called yourid
2014-01-20 20:54:19 +00:00
Baris Soner Usakli
030cfbffa4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-20 15:35:17 -05:00
Baris Soner Usakli
ed1c276739 only drag chat modal from header 2014-01-20 15:35:10 -05:00
Josh
f14ad11dd0 add remove user from group confirmation
Added confirmation request when removing user from a group.
2014-01-20 20:28:46 +00:00
Julian Lam
663aff4b24 fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL 2014-01-20 13:41:46 -05:00
Aziz Khoury
ba85ffb292 Merge remote-tracking branch 'upstream/master' 2014-01-20 13:22:16 -05:00
Julian Lam
f9e8178d25 fixed timeagago for zh_cn 2014-01-20 13:16:23 -05:00
Aziz Khoury
f74f01ca77 Changed User.create signature to accept a hash, added a couple of utility functions as well 2014-01-20 12:41:35 -05:00
Julian Lam
95355f9036 added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary 2014-01-20 11:04:06 -05:00
Julian Lam
2cfe59f124 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 22:29:36 -05:00