Commit Graph

662 Commits (baa813a4cb514f6e9a4c80d77391d35ff819c9c9)

Author SHA1 Message Date
Julian Lam 82f78d910d tweaks to language and updating theme minvers
Julian Lam de9f196c75 Merge branch 'userhomepage' of https://github.com/yariplus/NodeBB into yariplus-userhomepage
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
yariplus f815f2d981 Fix userhomepage derps
psychobunny 5c44c365dd chat with %1
psychobunny f6f43fe3de a couple extra useful "posted in" strings
Julian Lam d9cde968cc latest translations and fallbacks
Julian Lam ae6a2a8dbf latest translations and fallbacks
Julian Lam 526afc0910 Merge remote-tracking branch 'origin/master' into user-icons
psychobunny 80da65b4ef unused lang strings
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
barisusakli 7f66494a57 closes
barisusakli 0da39d036b uploading string
barisusakli e2a5440ae8 closes
barisusakli 47e2dd9478 closes
barisusakli 7854e67b7b closes
Julian Lam 4c96f95330 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
Julian Lam 95129a1b40 closes
Julian Lam 05b40cf576 latest translations
Julian Lam 97dd5500a1 Merge remote-tracking branch 'origin/master' into user-icons
psychobunny be28d7db98 changing bookmark alert to be more accurate to what it actually does
psychobunny 2669241c06 closes
Julian Lam a52f6cf0b4 User Account Edit and Change Picture Modal
Julian Lam 010c04f21f latest translations
Julian Lam 66afb59bc8 translations for global resource, closes
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.
Julian Lam a8f9671a11 latest translations
barisusakli 04be0411e7 build search categories server side
barisusakli ade9a44b11 closes
Julian Lam 00f2778534 latest translations
Julian Lam 9454e5a73a latest translations
barisusakli 15b667850e closes
barisusakli bb4984a9aa closes
barisusakli e6755d0adc closes
Julian Lam 3baad54223 Close
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).
Julian Lam 032107d058 latest translations
Julian Lam 1453150105 removed backups folder
Julian Lam acadc60594 latest translations and fallbacks
Julian Lam dd7d2615dd latest translations
barisusakli eaefd9d24c remove meta/title.js and meta.title.build
psychobunny 098c56a106 global:header.navigation
psychobunny a217b42cb1 bonus two for - chats/username route
psychobunny 22fc257e36 bonus for - groups/group route
psychobunny 89b8622cfa other routes done, closes
psychobunny 0e0d8474a4 page titles for user pages
Julian Lam 92f9553033 Resolved transifex language issue
Julian Lam e003fb38a3 Close
barisusakli 07d12e85ae closes https://github.com/NodeBB/nodebb-theme-persona/issues/124
psychobunny 0caa095ea4 closes
Julian Lam 5007c3a32c latest translations