Commit Graph

9536 Commits

Author SHA1 Message Date
Peter Jaszkowiak
ad7b561dd4 Fixed translator backwards compatibility issue
Also removed the _clearMenus global object because populating the global namespace is bad, bad, bad
2015-05-03 23:36:23 -06:00
Peter Jaszkowiak
a93a1d720d Merge pull request #7 from NodeBB/master
update
2015-05-02 18:02:57 -06:00
barisusakli
122aacdc57 check err item 2015-05-02 15:52:48 -04:00
Julian Lam
7f80a4a439 latest translations 2015-05-01 20:08:24 -04:00
barisusakli
b94d4f7fe5 Merge remote-tracking branch 'origin/master'
Conflicts:
	public/language/en_GB/error.json
2015-04-29 14:30:03 -04:00
barisusakli
9749658d35 added about me field 2015-04-29 14:29:18 -04:00
Julian Lam
1c94866ab3 addressed some issues brought up re: singular vs plural 2015-04-28 17:57:29 -04:00
barisusakli
3063da83ef argument fix for static/action hooks 2015-04-28 15:09:17 -04:00
barisusakli
163b70fba9 fix acp logout 2015-04-28 12:59:00 -04:00
Julian Lam
a462b10f94 nevermind... (@barisusakli 🧌) 2015-04-27 23:05:14 -04:00
Julian Lam
379bdd12e0 fixed improper parsing of url in loader, and updated mongo init to not send anything in cb except err. Also updated webserver init so that it doesn't expect stuff from static:app.preload 2015-04-27 22:51:44 -04:00
Julian Lam
f6ddff3e5f updated loader to kickstart the web installer if no config is found 2015-04-27 22:41:44 -04:00
barisusakli
c98e630f24 warn missing url 2015-04-27 21:42:08 -04:00
Barış Soner Uşaklı
3b93182ec1 Merge pull request #3091 from Icehunter/master
use replicaset if configured
2015-04-27 20:53:48 -04:00
barisusakli
2286d1137b remove tab 2015-04-27 20:32:37 -04:00
barisusakli
d946a2fcbd closes #3098
wait for templates to compile even if using clustering
fix emitter.all
upgrade.check error first
removed plugins.ready, using callback on plugins.init
removed webserver.init, using webserver.listen
2015-04-27 20:26:02 -04:00
barisusakli
51212c2bfa closes #3096 2015-04-27 16:02:13 -04:00
psychobunny
2fbe7a8190 webserver: only start listening _after_ everything is compiled 2015-04-27 14:46:05 -04:00
Ryan Wilson
6f66209428 use tabs per barisusakli 2015-04-27 11:08:58 -07:00
psychobunny
8bb73192cf closes #3073 2015-04-27 13:50:02 -04:00
psychobunny
533193fa79 send in data to action:taskbar.pushed as well 2015-04-27 12:44:35 -04:00
psychobunny
1556365712 call taskbar.push regardless of whether it's a new chat or not
there's logic in taskbar.push to not create the element anyways
2015-04-27 12:41:16 -04:00
psychobunny
c13e14d2c8 pass in element to filter:taskbar.push; taskbar.push cleanup 2015-04-27 12:25:05 -04:00
barisusakli
b9172358dd #3093 2015-04-26 12:56:18 -04:00
Julian Lam
84cbdc1358 changed the password confirmation form field in the web installer so that it doesn't clobber some env vars, and allowed admin username and email to be set via env var 2015-04-25 22:34:54 -04:00
Julian Lam
5a6c46a0a0 updating group creation method to send back group data in the return callback, and to include the ownerUid if one was passed in 2015-04-25 15:00:09 -04:00
barisusakli
0d7e72be51 removed dupe code 2015-04-25 12:59:56 -04:00
Ryan Wilson
c354929569 handled port as int with toString()
Signed-off-by: Ryan Wilson <syndicated.life@gmail.com>
2015-04-25 08:16:27 -07:00
Ryan Wilson
ec6c618751 use replicaset if configured
Signed-off-by: Ryan Wilson <syndicated.life@gmail.com>
2015-04-25 08:05:33 -07:00
barisusakli
17dfb4df94 posts_list.tpl changes 2015-04-24 22:51:52 -04:00
Julian Lam
275a9ef476 Reverted the last update to web installer, and updated it so environment variables always take precedence over form input, and form is hidden if database value is passed in 2015-04-24 15:13:52 -04:00
Julian Lam
5487da9030 updated web installer to auto-select the database if passed in via env var 2015-04-24 14:50:31 -04:00
Julian Lam
67eef3653b updated the web install form to populate the database fields if a value is passed in 2015-04-24 14:40:14 -04:00
barisusakli
dc16a665ae page checks #3089 2015-04-24 10:59:00 -04:00
barisusakli
47a2377229 closes #3089 2015-04-24 10:39:24 -04:00
barisusakli
03b0d282f1 search fix prevent crash if search term is invalid regex 2015-04-23 17:58:28 -04:00
barisusakli
e5928f330e closes #3085 2015-04-23 17:18:11 -04:00
barisusakli
d6949815ad #3085 2015-04-23 17:03:31 -04:00
Barış Soner Uşaklı
a5c52958e7 made handleSearch public 2015-04-23 16:06:27 -04:00
Barış Soner Uşaklı
e88d88e56c added return false 2015-04-23 15:43:50 -04:00
Barış Soner Uşaklı
8544531a79 removed event 2015-04-23 15:05:27 -04:00
Barış Soner Uşaklı
21b634e03f closes #3081 2015-04-23 14:37:27 -04:00
Barış Soner Uşaklı
f44e850fa0 revert last change, breaks ajaxify 2015-04-23 13:50:48 -04:00
Barış Soner Uşaklı
5d5346c4f9 allow overriding template name 2015-04-23 13:43:27 -04:00
Julian Lam
a54dccdf3b closed #3068 2015-04-23 11:27:44 -04:00
Julian Lam
15265bf36e Merge pull request #3071 from yariplus/settingsobject2
Enhance settings object plugin
2015-04-23 11:18:46 -04:00
Julian Lam
c004efee3f closed #3084 2015-04-23 11:15:37 -04:00
psychobunny
a9015cee03 Merge remote-tracking branch 'origin/master' into web-install 2015-04-22 18:21:22 -04:00
psychobunny
fac747cab7 call loader.js instead 2015-04-22 17:59:08 -04:00
psychobunny
24a11314dc installer - finally got it all working ;) 2015-04-22 17:51:35 -04:00