Commit Graph

3708 Commits

Author SHA1 Message Date
Josh Rickers
55b0270b34 Merge branch 'master' into admin-group-fix 2014-01-21 19:59:21 +00:00
Josh Rickers
4c36083354 Added yourid so it can be used in groups.js 2014-01-21 19:39:06 +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
Josh Rickers
bac1a5ec3e updated groups to stop you from removing yourself from the admin group 2014-01-21 19:37:01 +00:00
Julian Lam
397861c3cc Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-21 14:01:38 -05:00
Julian Lam
0020f278a5 stopped using unnecessary regex in user search 2014-01-21 13:59:03 -05: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
a1149b8f8d notif unread class 2014-01-21 10:38:20 -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
9400e5bcc9 motd 2014-01-21 01:27:39 -05:00
Baris Soner Usakli
4cae491438 last one for the night 2014-01-21 00:47:33 -05:00
Baris Soner Usakli
93534832b9 small 2014-01-21 00:21:59 -05:00
Baris Soner Usakli
9cd2b36c97 minor fix to topic.tpl 2014-01-21 00:16:35 -05:00
Baris Soner Usakli
a0b80e4061 shouldnt be in template 2014-01-20 23:25:27 -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
0a1d45b0b9 default panle 2014-01-20 21:33:13 -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
f282dcd677 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-20 21:00:21 -05:00
Baris Soner Usakli
55d4a5fe3a template fixes closes #825 2014-01-20 21:00:10 -05:00
Julian Lam
affa51856b closed #801 pending explanation 2014-01-20 19:05:19 -05:00
Baris Soner Usakli
12a5b6b4c6 body margin for composer 2014-01-20 16:50:39 -05:00
Aziz Khoury
da647d105b removing couple of console.log 2014-01-20 16:34:12 -05:00
Aziz Khoury
74f23497dc password should be passed to action hook, and it was being ovewritten 2014-01-20 16:29:46 -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
9c9fadb5a1 upping mentions minver 2014-01-20 14:53:09 -05:00
Julian Lam
663aff4b24 fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL 2014-01-20 13:41:46 -05:00
Aziz Khoury
a13c321de8 added "trust proxy" config option with default to true 2014-01-20 13:23:40 -05:00
Aziz Khoury
ba85ffb292 Merge remote-tracking branch 'upstream/master' 2014-01-20 13:22:16 -05:00
Julian Lam
2654a8e86a added cache buster to ACP theme 2014-01-20 13:22:03 -05:00
Julian Lam
cef54fbf6d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-20 13:17:17 -05:00
Julian Lam
f9e8178d25 fixed timeagago for zh_cn 2014-01-20 13:16:23 -05:00
Baris Soner Usakli
71888adb09 closes #815, closes #816 2014-01-20 12:56:09 -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
e2960e3ed6 Merge pull request #819 from BitBangersCode/mongo-fix
Add callback to mongo.searchRemove, fixes infinite schema update
2014-01-20 08:28:23 -08:00