Commit Graph

4277 Commits

Author SHA1 Message Date
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
727ad4b651 added cache buster to nodebb.min.js even if it has not changed 2014-01-17 12:07:33 -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
55c296a229 Merge pull request #790 from tedr56/master
Fr Translation Update
2014-01-17 08:33:15 -08:00
TedVJ
27762c2ab9 Fr Translation update #3 2014-01-17 16:41:04 +01:00
TedVJ
f63ab0faeb Fr Translation update #2 2014-01-17 16:35:32 +01:00
TedVJ
cfbbc238f6 Fr Translation Update 2014-01-17 16:16:51 +01:00
Julian Lam
2b32ede4d8 fixed czech welcome message 2014-01-17 09:09:43 -05:00
Julian Lam
04da0447b5 fixed global:motd.get in es 2014-01-17 08:58:53 -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
Julian Lam
c1c9438220 patching translator to ignore non-js files 2014-01-17 08:58:33 -05:00
Julian Lam
13ae2e9401 fixed global:motd.get in es 2014-01-17 08:54:34 -05:00
Julian Lam
beec96416f added translation to default MOTD 2014-01-17 08:53:23 -05:00
Julian Lam
253913f8d9 hiding fork button on xs/sm devices (default motd) 2014-01-17 08:12:30 -05:00
Julian Lam
7e9d344487 patching translator to ignore non-js files 2014-01-17 08:04:23 -05:00
Baris Soner Usakli
cfaa6556d6 pass err 2014-01-17 00:07:02 -05:00
Baris Soner Usakli
b062af2c4b fixed user pwd reset 2014-01-16 23:46:08 -05:00
Baris Soner Usakli
b7f0c90bf7 more fixes 2014-01-16 22:44:34 -05:00
Baris Soner Usakli
b3816b98a1 more post fixes 2014-01-16 22:06:23 -05:00
Baris Soner Usakli
9e6f7fa960 reset 2014-01-16 21:19:57 -05:00
Baris Soner Usakli
31d353ab0e more fixes 2014-01-16 21:19:29 -05:00
Barış Soner Uşaklı
3a57c3b6d8 removed disabled attrib from reset button 2014-01-16 20:59:01 -05:00
Baris Soner Usakli
8740cc0fc7 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 20:53:42 -05:00
Baris Soner Usakli
ae76bb3928 lots of err first fixeS 2014-01-16 20:53:32 -05:00
Julian Lam
111776d878 notifications socket callbacks 2014-01-16 20:29:11 -05:00
Julian Lam
e95da77fe8 Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix 2014-01-16 20:14:19 -05:00
Julian Lam
bc48ba874d fixed module.js callback format 2014-01-16 20:14:09 -05:00
Baris Soner Usakli
ced37044ca Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 19:59:03 -05:00
Baris Soner Usakli
426d3e871f more fixes 2014-01-16 19:58:57 -05:00
Julian Lam
cbb630fd6b fixed categories.js socket callbacks 2014-01-16 19:57:28 -05:00
Julian Lam
8041bee9fd Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix 2014-01-16 19:10:30 -05:00
Baris Soner Usakli
6da6baa213 more crash fixes to socketS 2014-01-16 18:50:45 -05:00
Baris Soner Usakli
ba8e98520c added data checks to user calls 2014-01-16 18:18:42 -05:00
Baris Soner Usakli
ddb9a4a60e fixed user load more 2014-01-16 18:12:31 -05:00
Baris Soner Usakli
4366c11ec0 users.js fix 2014-01-16 18:10:38 -05:00
Baris Soner Usakli
39b631a3a8 more fixes 2014-01-16 18:06:19 -05:00
Baris Soner Usakli
e061978bd5 more fixes 2014-01-16 17:52:46 -05:00
Baris Soner Usakli
2515ba9455 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 17:32:45 -05:00
Baris Soner Usakli
afe97233aa more fixes 2014-01-16 17:32:33 -05:00
Julian Lam
8b1ed1297b linting 2014-01-16 17:25:14 -05:00
Julian Lam
765402a2a0 fixed ACP online count 2014-01-16 17:22:11 -05:00
Baris Soner Usakli
e5c8caf5ff more fixes 2014-01-16 17:15:00 -05:00
Baris Soner Usakli
1ec21c2bfd metatitle 2014-01-16 17:11:27 -05:00
Baris Soner Usakli
7470c1bbd9 more fixes 2014-01-16 17:07:34 -05:00
Baris Soner Usakli
2893693d17 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 16:50:48 -05:00
Baris Soner Usakli
0b132cadcf user fixes 2014-01-16 16:50:41 -05:00
Julian Lam
3177fdfa74 partially fixed acp active users 2014-01-16 16:26:47 -05:00
Julian Lam
08f97efcd4 Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix 2014-01-16 16:11:30 -05:00
Julian Lam
71f1f7137a fixes 2014-01-16 16:11:23 -05:00