Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-14 09:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,441 Commits 74 Branches 483 Tags
a5cceabc89b40e9df7442d4b51ef1c58155b439a
Commit Graph

16441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Misty (Bot)
cadea35cff Incremented version number - v1.7.3 2017-12-27 21:48:36 +00:00
Julian Lam
f9202aeb05 reading_comprehension--; @pitaj 2017-12-27 14:14:10 -05:00
Julian Lam
53e7aa0e70 bump emoji plugin @pitaj 2017-12-27 14:12:52 -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ı
783d2eb073 remove console.log 2017-12-26 12:00:14 -05:00
Misty (Bot)
4217d06ad0 Latest translations and fallbacks 2017-12-26 09:24:52 +00: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
Julian Lam
eea124b312 room rename logic 2017-12-21 16:51:16 -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
75f97c1180 bump persona 2017-12-21 12:55:10 -05:00
Julian Lam
e091568d17 closes #6191 2017-12-21 11:19:16 -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
Barış Soner Uşaklı
c12b42180d closes #6189 2017-12-20 22:08:44 -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
Julian Lam
8cb914c15e more fixes to better handle transitioning from chat to chat and closing chats, etc. 
also modals no longer used on mobile view at all
 2017-12-20 15:34:31 -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
Julian Lam
5c3c608109 fix chat resizing of modal to work with flexbox implementation 2017-12-20 13:47:45 -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
d967201b2a drastically simplified main window resizing logic, some language changes 2017-12-19 16:27:41 -05:00
Barış Soner Uşaklı
96084340ad closes #6186 2017-12-19 16:03:05 -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
290aa312b4 fixed call to missing method, #6181 2017-12-18 15:01:05 -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
Misty (Bot)
094bab24c9 Latest translations and fallbacks 2017-12-17 09:24:44 +00:00
Julian Lam
541aa7fbc6 closes #6177 2017-12-15 16:02:20 -05:00
Julian Lam
4bb46ad669 Merge branch 'master' into develop 2017-12-15 16:02:02 -05:00
Julian Lam
6bd8740342 removing hasImageUploadPlugin from config api 2017-12-15 13:31:14 -05:00
Julian Lam
b17e876be1 bump themes to expose image upload by url option 2017-12-15 13:24:17 -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ı
e4ff1dc61b closes #6174 2017-12-15 10:21:33 -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ı
802ec0e384 remove reduntant code 2017-12-14 11:27:18 -05:00
Barış Soner Uşaklı
2bb8227574 closes #6168 2017-12-14 10:53:01 -05:00