Commit Graph

11415 Commits

Author SHA1 Message Date
Julian Lam
d1ccd78ac2 Merge remote-tracking branch 'origin/master' into develop 2018-01-06 12:04:07 -05:00
Julian Lam
b2b57d49bf WIP add user modal 2018-01-06 12:03:52 -05:00
Barış Soner Uşaklı
8446a733e5 closes #5569 2018-01-05 14:44:18 -05:00
Barış Soner Uşaklı
d64b814acb handle https://packages.nodebb.org failures 2018-01-04 10:48:08 -05:00
Barış Soner Uşaklı
6552ebbd8b fix redis test for custom home page 2018-01-03 15:06:41 -05:00
Barış Soner Uşaklı
5146f43b33 remove console.log 2018-01-03 14:38:09 -05:00
Barış Soner Uşaklı
87d40e9e78 fix increment to use data 2018-01-03 14:24:07 -05:00
Barış Soner Uşaklı
baa868cf2b fix lint 2018-01-03 14:11:51 -05:00
Barış Soner Uşaklı
d2ffdbda7d closes #6203 2018-01-03 13:59:58 -05:00
Barış Soner Uşaklı
ff6c6a54c1 make upload permissions global
give upload image permission to registered users on install
add global privileges to app.user.privileges for client side use
2018-01-03 13:27:34 -05:00
Barış Soner Uşaklı
2b6410f201 Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission 2018-01-03 10:51:18 -05:00
Julian Lam
9b5e0f9e95 updated upgrade logic to not break ACP restart flow 2018-01-02 14:45:21 -05:00
Barış Soner Uşaklı
cbaa977233 fix type on mongodb if key has expireAt 2017-12-30 11:41:36 -05:00
Barış Soner Uşaklı
2661a31227 closes #6202 2017-12-29 13:27:12 -05:00
Julian Lam
dee18d8442 Merge branch 'develop' into chat-rewrite 2017-12-28 16:26:50 -05:00
Julian Lam
8588a54ff2 Merge remote-tracking branch 'origin/master' into develop 2017-12-28 16:26:35 -05:00
Barış Soner Uşaklı
9628956a56 closes #6199
global widgets will appear after page widgets
2017-12-27 11:55:45 -05:00
Barış Soner Uşaklı
c3f56e2ab5 closes #6197 2017-12-25 22:26:24 -05:00
Barış Soner Uşaklı
23dbb42130 closes #6182 2017-12-25 11:06:52 -05:00
Barış Soner Uşaklı
fb97ff2265 canChat should be false if chat is globally disabled 2017-12-21 14:24:29 -05:00
Julian Lam
c9364291fb Merge branch 'develop' into chat-rewrite 2017-12-21 11:07:17 -05:00
Julian Lam
f2c251e89c Merge branch 'master' into develop 2017-12-21 11:06:59 -05:00
Peter Jaszkowiak
be00a1c013 Support for using yarn instead of npm, include unread counts on cold load (#6179)
* Close #6178

* Support for package managers besides npm

- Also fixes issue where upgrade-plugins wouldn't work
2017-12-20 15:56:14 -05:00
Baris Usakli
025709499c more fixes 2017-12-20 15:19:22 -05:00
Baris Usakli
242dc41aca move privileges to same page 2017-12-20 14:49:20 -05:00
Baris Usakli
63b9255fa1 Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission 2017-12-20 13:13:10 -05:00
Julian Lam
3d74fc8220 some changes to fix class names used, character countdown support, etc. 2017-12-20 12:58:59 -05:00
Baris Usakli
057e83cfac Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission 2017-12-20 12:17:28 -05:00
Julian Lam
6d15861a55 removed pluralisation @pitaj 2017-12-19 14:21:20 -05:00
Barış Soner Uşaklı
50cc62e2aa fix rss feed on topic #6184 2017-12-19 12:27:23 -05:00
Julian Lam
acc58d707c Updated plugin checking logic
* Fixes #6183
* Also changed a bunch of console.logs to process.stdout.write,
  so the command line output is cleaner
2017-12-19 12:07:45 -05:00
Barış Soner Uşaklı
3196311f15 closes #6184 2017-12-19 11:47:13 -05:00
Barış Soner Uşaklı
13e56ad5f3 make sure unfilled is not negative 2017-12-18 21:00:49 -05:00
Barış Soner Uşaklı
ea8cf6545c change db.set/get to use data field instead of value 2017-12-18 20:21:38 -05:00
Baris Usakli
2053472ef3 closes #6180 2017-12-18 15:50:36 -05:00
Baris Usakli
4a73621dca chat privilege 2017-12-18 15:43:57 -05:00
Julian Lam
82a95a03be Chat message soft deletion -- closes #6181
Squashed commit of the following:

commit f84c06bdcc45f24ef7ffde6a8f33b48d8f97fc36
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 14:42:47 2017 -0500

    added restore handler for chat messages

commit 725cd370c6ea1e8f4a28298350f3dc024d4e668e
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 14:23:52 2017 -0500

    backend logic and testing complete for deletion and restoration of chat messages

commit 072da758319cc93fa4c6f8bc0d672a1b716dc06e
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 13:52:35 2017 -0500

    changing message delete logic to not remove mids, but to filter when retrieving

commit 68bf373305ab82737658a7c31dc5549af4d6d69f
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 12:37:58 2017 -0500

    logic to handle deletion of a deleted chat message -- added some failing tests

commit 6899d0d234fa752e227188aa69cfcabd0d0500cc
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 11:35:36 2017 -0500

    chat message deletion logic
2017-12-18 14:45:06 -05:00
Julian Lam
541aa7fbc6 closes #6177 2017-12-15 16:02:20 -05:00
Julian Lam
6bd8740342 removing hasImageUploadPlugin from config api 2017-12-15 13:31:14 -05:00
Julian Lam
88b47f357b removed user.uploadFromUrl and associated logic as cropped image modal supercedes it @pichalite 2017-12-15 13:21:31 -05:00
Barış Soner Uşaklı
a9e15ae9d0 strip img tags on topic teaser 2017-12-15 10:29:12 -05:00
Barış Soner Uşaklı
108c3c980a show invalid url error if request.head fails 2017-12-14 18:07:32 -05:00
Barış Soner Uşaklı
926b763f74 show hit ratio instead 2017-12-14 14:18:56 -05:00
Barış Soner Uşaklı
e453057acc add settings-menu id 2017-12-14 13:55:47 -05:00
Barış Soner Uşaklı
2bb8227574 closes #6168 2017-12-14 10:53:01 -05:00
Julian Lam
1f10549cf5 added new user method isPrivilegedOrSelf 2017-12-14 10:18:56 -05:00
Barış Soner Uşaklı
691fc2c6fd closes #5812 2017-12-14 08:47:33 -05:00
Barış Soner Uşaklı
b55087dab7 closes #6166 2017-12-13 12:06:45 -05:00
Barış Soner Uşaklı
53afa552d0 closes #6162 2017-12-11 11:40:42 -05:00
Barış Soner Uşaklı
ea83be50a1 closes #6161 2017-12-11 11:21:22 -05:00