Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-04 03:21:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,287 Commits 71 Branches 492 Tags
a76eab1ca202b94dea5229068d5fa6a9ab2eec56
Commit Graph

9005 Commits

Author SHA1 Message Date
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
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
2654a8e86a added cache buster to ACP theme 2014-01-20 13:22:03 -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
d6ae91312e Merge branch 'master' of github.com:TheRealDrZ/NodeBB into TheRealDrZ-master 
Conflicts:
	public/templates/composer.tpl
 2014-01-20 11:15:16 -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
895bff9b62 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master 2014-01-20 10:48:06 -05:00
Julian Lam
cf69b9fcb3 fixed #817 - issue where the bootswatch theme was loaded before vanilla, causing default bootstrap to override the bootswatch loaded bootstrap 2014-01-20 10:46:49 -05:00
akhoury
58525bd09c f'in arabs 2014-01-20 01:39:11 -05:00
Baris Soner Usakli
5a069f1076 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 22:44:16 -05:00
Baris Soner Usakli
84aa1ab527 motd string and class 2014-01-19 22:44:13 -05:00
Julian Lam
2cfe59f124 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 22:29:36 -05:00
Julian Lam
e542da1f52 added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins 2014-01-19 22:07:29 -05:00
Baris Soner Usakli
050ab738e4 fixed drop area top 2014-01-19 22:06:25 -05:00
Baris Soner Usakli
d1ccc692ae pull right dropdowns 2014-01-19 18:35:18 -05:00
Baris Soner Usakli
c9f43a60b9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 18:18:55 -05:00
Baris Soner Usakli
3d30c0bd87 tmp fix for nested if 2014-01-19 18:18:47 -05:00
Julian Lam
3624717d84 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 18:02:07 -05:00
Julian Lam
07b286650c adding cache buster to ACP, removing bootstrap css in ACP 2014-01-19 18:02:03 -05:00
Baris Soner Usakli
32adbc8c77 close modal on error 2014-01-19 17:49:16 -05:00
Baris Soner Usakli
7310fe82d3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 17:28:15 -05:00
Baris Soner Usakli
189e69284e fixes for post privileges 2014-01-19 17:28:08 -05:00
Julian Lam
0ccb8a77ba Merge pull request #811 from BitBangersCode/alternate_title_fix 
Only alternate title when not focused
 2014-01-19 14:25:15 -08:00
Julian Lam
e8d6df22cb Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 17:18:18 -05:00
Julian Lam
5861630dec - removed autocomplete in composer core (now entirely in mentions) 
- upped jQuery UI to 1.10.4
 2014-01-19 17:17:40 -05:00
MrWaffle
c1fea52a93 Only alternate title when not focused 2014-01-19 22:38:44 +01:00
Baris Soner Usakli
1980e945da fixed admin page active sockets 2014-01-19 14:42:47 -05:00
Baris Soner Usakli
16a42619b5 closes #809 2014-01-19 14:27:07 -05:00
Baris Soner Usakli
54c05f9027 title is no longer centered in composer 2014-01-19 12:59:45 -05:00
Baris Soner Usakli
9879f645f6 added check for undefined, null empty string 2014-01-18 23:28:13 -05:00
Baris Soner Usakli
bbac361670 fixed crash if empty topic was loaded without ajaxify 2014-01-18 23:18:58 -05:00
Baris Soner Usakli
8c1c844007 closes #806 2014-01-18 21:57:06 -05:00