Commit Graph

761 Commits

Author SHA1 Message Date
Julian Lam
de9f196c75 Merge branch 'userhomepage' of https://github.com/yariplus/NodeBB into yariplus-userhomepage 2015-11-05 13:47:26 -05:00
Julian Lam
b8b9da2c30 Squashed commit of the following:
commit 62d59620d26bc97c7d689e9af57cd8bff654c79e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 11:04:27 2015 -0500

    tweaked 503 template

commit 15a61cbc239c9d654691d91cdadce59e13d97586
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 10:58:19 2015 -0500

    added text about reloading being required if threshold values are changed

commit 3fe87699332ef0628b4db31f4afef245802a7bc0
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 10:53:35 2015 -0500

    added ACP settings for toobusy

commit f6a9964baff051072052e6ef99da9e1ffba014df
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 08:53:53 2015 -0500

    removed unused 503a template

commit e6d444736baf4c676f8461d30a5504c6e45df163
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 02:01:11 2015 -0500

    updated code to send static 503 instead of maintenance-style page

commit 11089ae2bb833e068b01ee77ee745d9fd5344805
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 01:18:45 2015 -0500

    added toobusy support so the Node process doesn't fall over at high load
2015-11-05 12:44:51 -05:00
yariplus
f815f2d981 Fix userhomepage derps 2015-11-04 05:55:02 -05:00
psychobunny
5c44c365dd chat with %1 2015-11-03 18:20:51 -05:00
psychobunny
f6f43fe3de a couple extra useful "posted in" strings 2015-11-03 17:26:43 -05:00
Julian Lam
d9cde968cc latest translations and fallbacks 2015-11-03 13:44:29 -05:00
Julian Lam
ae6a2a8dbf latest translations and fallbacks 2015-10-30 00:47:13 -04:00
Julian Lam
526afc0910 Merge remote-tracking branch 'origin/master' into user-icons 2015-10-29 13:27:28 -04:00
psychobunny
80da65b4ef unused lang strings 2015-10-28 16:24:59 -04:00
Julian Lam
b52475c270 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl
2015-10-25 07:33:59 -04:00
barisusakli
7f66494a57 closes #3764 2015-10-19 12:59:40 -04:00
barisusakli
0da39d036b uploading string 2015-10-15 11:36:50 -04:00
barisusakli
e2a5440ae8 closes #3741 2015-10-13 19:28:55 -04:00
barisusakli
47e2dd9478 closes #3107 2015-10-13 16:36:49 -04:00
barisusakli
7854e67b7b closes #1637 2015-10-09 17:52:55 -04:00
Julian Lam
4c96f95330 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
2015-10-07 02:14:03 -04:00
Julian Lam
95129a1b40 closes #3693 2015-10-06 05:28:05 -04:00
Julian Lam
05b40cf576 latest translations 2015-10-04 04:58:46 -04:00
Julian Lam
97dd5500a1 Merge remote-tracking branch 'origin/master' into user-icons 2015-09-30 13:45:33 -04:00
psychobunny
be28d7db98 changing bookmark alert to be more accurate to what it actually does 2015-09-28 10:30:23 -04:00
psychobunny
2669241c06 closes #3656 2015-09-28 10:26:29 -04:00
Julian Lam
a52f6cf0b4 User Account Edit and Change Picture Modal 2015-09-27 17:23:18 -04:00
Julian Lam
010c04f21f latest translations 2015-09-25 10:02:31 -04:00
Julian Lam
66afb59bc8 translations for global resource, closes #3659 2015-09-23 11:13:54 -04:00
Julian Lam
78863a438f Firing new hook filter:auth.list
This new plugins allows SSO services to list whether a
user has authenticated via that service, and will display
as such in the user's profile editing screen.
2015-09-22 14:27:44 -04:00
Julian Lam
a8f9671a11 latest translations 2015-09-20 12:00:09 -04:00
barisusakli
04be0411e7 build search categories server side 2015-09-16 17:17:58 -04:00
barisusakli
ade9a44b11 closes #3590 2015-09-16 14:45:45 -04:00
Julian Lam
00f2778534 latest translations 2015-09-16 14:05:48 -04:00
Julian Lam
9454e5a73a latest translations 2015-09-15 14:06:15 -04:00
barisusakli
15b667850e closes #3595 2015-09-14 17:42:06 -04:00
barisusakli
bb4984a9aa closes #3428 2015-09-11 13:54:00 -04:00
barisusakli
e6755d0adc closes #3458 2015-09-11 13:48:58 -04:00
Julian Lam
3baad54223 Close #3578
This commit introduces notification creation if a user requests
membership to a group (in which case notifications are sent to
all group owners), and user invites to a group (in which case
a notification is sent to the invitee).
2015-09-09 19:57:12 -04:00
Julian Lam
032107d058 latest translations 2015-09-02 16:10:57 -04:00
Julian Lam
1453150105 removed backups folder 2015-09-02 16:07:20 -04:00
Julian Lam
acadc60594 latest translations and fallbacks 2015-09-01 10:45:48 -04:00
Julian Lam
dd7d2615dd latest translations 2015-08-27 15:57:00 -04:00
barisusakli
eaefd9d24c remove meta/title.js and meta.title.build #3481 2015-08-26 15:55:00 -04:00
psychobunny
098c56a106 global:header.navigation 2015-08-26 15:38:09 -04:00
psychobunny
a217b42cb1 bonus two for #3481 - chats/username route 2015-08-26 14:09:22 -04:00
psychobunny
22fc257e36 bonus for #3481 - groups/group route 2015-08-26 14:06:53 -04:00
psychobunny
89b8622cfa other routes done, closes #3481 2015-08-26 13:56:28 -04:00
psychobunny
0e0d8474a4 page titles for user pages #3481 2015-08-26 13:48:27 -04:00
Julian Lam
92f9553033 Resolved transifex language issue 2015-08-26 11:21:55 -04:00
Julian Lam
e003fb38a3 Close #3497 2015-08-26 10:57:20 -04:00
barisusakli
07d12e85ae closes https://github.com/NodeBB/nodebb-theme-persona/issues/124 2015-08-24 17:04:23 -04:00
psychobunny
0caa095ea4 closes #3457 2015-08-22 12:20:17 -04:00
Julian Lam
5007c3a32c latest translations 2015-08-17 17:07:39 -04:00
psychobunny
0150e0e063 closes #3069 2015-08-17 15:55:09 -04:00