Commit Graph

6484 Commits

Author SHA1 Message Date
Julian Lam
3acf2e0812 pruned upgrade script 2015-11-08 15:25:54 -05:00
barisusakli
6f864a6354 joindate iso 2015-11-08 14:58:05 -05:00
Julian Lam
efe0726f9b removing unused plaintext templates, closes #3854 2015-11-08 12:32:39 -05:00
Julian Lam
9a17e2a3e9 Merge branch 'auto-plaintext-email' 2015-11-08 12:30:26 -05:00
Julian Lam
e37709ad8b something.. 2015-11-08 12:28:48 -05:00
Julian Lam
8304740bd5 fixing crash on settings save 2015-11-08 11:57:23 -05:00
Julian Lam
948c98b668 adding plaintext email via html-to-text module 2015-11-08 11:57:04 -05:00
barisusakli
27f77bf832 show proper error if user is not logged in 2015-11-07 18:46:31 -05:00
barisusakli
323cc165b6 closes #3851
dont use post file upload for cover uploads
check cover upload file size against new setting
store cover uploads in profile folder
use `uid-profilecover` filename for cover uploads
2015-11-07 18:34:40 -05:00
barisusakli
35eb0faac8 closes #3850 2015-11-07 17:11:35 -05:00
Julian Lam
ad5ddcbb73 whitespace fixes 2015-11-07 12:32:25 -05:00
Julian Lam
3a34901cdb on settingsv2 save, reload should be required 2015-11-07 11:12:06 -05:00
Julian Lam
90c0a06fd4 removed some commented out code 2015-11-07 10:40:46 -05:00
Barış Soner Uşaklı
f145356914 #3847 2015-11-07 01:54:29 -05:00
psychobunny
3564d581ad Merge branch 'master' of https://github.com/NodeBB/NodeBB 2015-11-06 16:35:56 -05:00
barisusakli
356f1d38cb fix image upload for other users 2015-11-06 16:17:18 -05:00
psychobunny
df7e6be905 console.log 2015-11-06 16:15:31 -05:00
barisusakli
016aef1716 too busy check on prod 2015-11-06 15:41:38 -05:00
barisusakli
522e67d742 closes #3803 2015-11-06 14:40:51 -05:00
Julian Lam
48b5bab849 closes #3756 2015-11-06 14:02:25 -05:00
barisusakli
90c2a16b94 closes #3835 2015-11-06 13:33:27 -05:00
Julian Lam
2830538835 Cover photo removal for groups, #3832 2015-11-06 10:51:10 -05:00
barisusakli
04894b549a closes #3827 2015-11-05 21:03:01 -05:00
barisusakli
d69d0c6614 dont send undefined for tos 2015-11-05 19:57:27 -05:00
barisusakli
670ed38d75 missing semicolons 2015-11-05 19:57:26 -05:00
barisusakli
4fe4d71604 added port 2015-11-05 17:52:38 -05:00
barisusakli
1be178f2a5 sync ACP stats over pubsub 2015-11-05 17:47:06 -05:00
barisusakli
5e257107cd fix status on following/followers etc. 2015-11-05 16:07:25 -05:00
barisusakli
0d6e1091ba async get users 2015-11-05 15:54:00 -05:00
Julian Lam
f1412b6e9b Fixed cover loading for subdirs and added removal
re: #3832
2015-11-05 15:49:41 -05:00
barisusakli
8ccfd235ad changed deprecated method 2015-11-05 15:46:43 -05:00
barisusakli
60e1831152 check online from users:online zset 2015-11-05 15:10:19 -05:00
barisusakli
baa813a4cb Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize 2015-11-05 14:17:50 -05:00
Julian Lam
de9f196c75 Merge branch 'userhomepage' of https://github.com/yariplus/NodeBB into yariplus-userhomepage 2015-11-05 13:47:26 -05:00
barisusakli
9125e778a1 Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize 2015-11-05 13:28:14 -05:00
barisusakli
364260fa37 fix lastonline iso 2015-11-05 12:54:15 -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
barisusakli
7ed378b367 removed override no longer needed 2015-11-05 12:43:05 -05:00
barisusakli
46c2563164 removed rooms.js removed browsing users, removed chat syncing across sockets
use lastonline for online detection
2015-11-05 12:34:39 -05:00
barisusakli
1ecf27417a removed commented out stuff removed topics.enter 2015-11-05 11:53:17 -05:00
barisusakli
491a6d0234 Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize 2015-11-05 11:35:39 -05:00
barisusakli
0d23c56281 removed event:disconnect 2015-11-05 11:31:59 -05:00
barisusakli
bac2a0d959 removed event:connect use socket.io connect event duh 2015-11-05 11:25:53 -05:00
barisusakli
5879185ebc single proc stats 2015-11-04 17:43:43 -05:00
barisusakli
be6fc72994 Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize 2015-11-04 13:45:43 -05:00
barisusakli
0199ed27a6 disable user_leave for topic 2015-11-04 13:02:19 -05:00
barisusakli
be86c74c91 disabled browsing users and global rooms syncing 2015-11-04 12:52:55 -05:00
yariplus
f815f2d981 Fix userhomepage derps 2015-11-04 05:55:02 -05:00
yariplus
853aa37cd2 Add user home pages. #3616 2015-11-04 04:08:22 -05:00
Julian Lam
ceaa3a334d Squashed commit of the following:
commit 3a39e5e6bd3c357d78d8ec1dad6e3a64c18ee3ab
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Nov 3 20:15:10 2015 -0500

    minor tweak

commit ed3c25ba8b431a2b730aae78a43cfa934521a5d4
Merge: d9cde96 d7a0adc
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Nov 3 20:12:32 2015 -0500

    Merge branch 'master' of https://github.com/acardinale/NodeBB into acardinale-master

commit d7a0adc5c8
Author: Andrea Cardinale <a.cardinale@webandtech.it>
Date:   Wed Sep 30 10:32:25 2015 +0200

    Get registry (if it's set) from config.json in suggest method (client-side)
2015-11-03 20:15:30 -05:00