Julian Lam
7e0d0e0eb5
Merge remote-tracking branch 'origin/develop'
2017-11-02 14:13:48 -04:00
Peter Jaszkowiak
dfad76120d
Support npm@5 and yarn ( #6010 )
...
* Support npm@5 and yarn
Use package.default.json
Partial #6008
- Overwrite package.json with package.default.json values
- `dependencies` field is merged with package.default.json version taking precidence
- `./nodebb upgrade` automatically does those things and runs `git pull`
- use `./nodebb upgrade --dev` to avoid the `git pull`
* added logic to preserve extraneous plugins installed in node_modules/
* Don't automatically git pull
* Simplify package-install, run it on upgrade just in case
2017-11-02 14:12:05 -04:00
Barış Soner Uşaklı
3dd83237b8
add some debug for failed tests
2017-11-02 08:58:51 -04:00
Baris Usakli
c9465403f5
closes #6023
2017-11-01 12:05:06 -04:00
Peter Jaszkowiak
adc47fd053
Use relative linking ( #6011 )
...
* Use relative linking
* Add copyFile method and tests
Closes #5988
* Fix relative linking on Windows
Hard links and junctions don't work with relative paths
* Fix tests
* Revert ghange to gitignore
2017-10-31 22:18:15 -04:00
Barış Soner Uşaklı
18f4f27fe0
closes #6024
2017-10-31 18:03:54 -04:00
Barış Soner Uşaklı
5b2a674a4f
closes #6020
2017-10-31 16:04:25 -04:00
Barış Soner Uşaklı
25cd21fba8
closes #6019
2017-10-31 10:53:28 -04:00
Barış Soner Uşaklı
6b1af76f08
closes #6015
2017-10-31 09:43:11 -04:00
Barış Soner Uşaklı
d5d6748c71
closes #6013
2017-10-30 20:20:14 -04:00
Baris Usakli
47143a4a09
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-10-30 15:29:26 -04:00
Baris Usakli
a500e0019c
closes #6005
2017-10-30 15:26:17 -04:00
Barış Soner Uşaklı
c453fc7275
add widget reset test
2017-10-26 22:42:16 -04:00
Barış Soner Uşaklı
a11058bce2
closes #6004
2017-10-26 10:32:24 -04:00
Peter Jaszkowiak
62ae171432
Merge remote-tracking branch 'origin/master' into develop
2017-10-23 17:13:35 -06:00
Barış Soner Uşaklı
5d45f9fff2
fix lint
2017-10-23 19:09:44 -04:00
Barış Soner Uşaklı
6a2019c646
closes #6003
2017-10-23 19:05:00 -04:00
Peter Jaszkowiak
f336726173
Bump dependencies ( #6001 )
...
* Bump dependencies
* Fix mocha v4 requiring --exit flag
Use nyc instead of the istanbul binary
* Print out summary instead of full report
2017-10-23 18:32:26 -04:00
Barış Soner Uşaklı
e7318a1cea
Mongo cache ( #6002 )
...
* cache mongodb objects
remove user settings cache since it is cached at the object level
* removed indexOf from isMemberOfSets
* change has to get, change maxAge to 0
2017-10-23 18:31:16 -04:00
Barış Soner Uşaklı
108f84fd19
add type to dbal
2017-10-20 13:51:07 -04:00
Baris Usakli
c4310395c9
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
2017-10-19 13:54:56 -04:00
Baris Usakli
8733f51f86
remove test for unused code
2017-10-19 13:13:40 -04:00
Barış Soner Uşaklı
797857e1d2
remove old test
2017-10-18 15:06:22 -04:00
Peter Jaszkowiak
60a42aa651
Merge branch 'translator-optimization' into develop
2017-10-13 21:23:44 -06:00
Peter Jaszkowiak
46fafb20b9
Remove string.js dependency
2017-10-13 21:02:41 -06:00
Barış Soner Uşaklı
557dfd5b47
testing new socket.io-client extraHeaders ( #5985 )
...
* testing new socket.io-client extraHeaders
* change mongodb installation
2017-10-13 13:57:30 -04:00
Julian Lam
df5178ce78
fixed typo in outgoing route test, and added new test for javascript protocol
2017-10-10 12:17:39 -04:00
Peter Jaszkowiak
1c35213934
Fix #5970 and forking while debugging ( #5965 )
...
* Fix forking while debugging
Debugger address in use no longer happens
* Fix cropper error
2017-10-09 11:40:36 -04:00
Barış Soner Uşaklı
b70f328520
closes #5948
2017-10-02 19:27:57 -04:00
Peter Jaszkowiak
da9da8190f
Bump dependencies
...
Bumping eslint & configs meant making some linting fixes
For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail
2017-10-02 09:24:27 -04:00
Peter Jaszkowiak
dc87d7fc0f
Use .js instead of .jst
...
Fix #5934
2017-09-23 12:51:20 -06:00
Baris Usakli
c49837143c
fix test
2017-09-21 14:51:00 -04:00
Baris Usakli
1358a89305
closes #5907
2017-09-01 18:40:34 -04:00
Julian Lam
1034626896
Merge remote-tracking branch 'origin/develop'
2017-09-01 16:07:12 -04:00
Peter Jaszkowiak
e8aa8c62f6
Update jsdom
2017-08-30 13:27:59 -06:00
Barış Soner Uşaklı
bc6edba6df
change post queue test
2017-08-27 19:13:23 -04:00
Barış Soner Uşaklı
5cc39e8546
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
# src/views/admin/manage/ip-blacklist.tpl
2017-08-24 19:29:15 -04:00
Peter Jaszkowiak
abffc29128
Use Benchpress ( #5901 )
...
* Use Benchpress
* Use Benchpress.compileParse
* Error for template load failure
* Use benchpressjs package
* Compile templates on demand
* Fix user settings page
* Fix admin search to exclude `.jst` files
* Fix 500-embed
So ajaxify can still show an error if the server goes down
2017-08-24 19:26:50 -04:00
Barış Soner Uşaklı
a46db9616c
fix message delete and add test
2017-08-21 16:48:18 -04:00
Barış Soner Uşaklı
329bfeeb3b
convert min/max to float
2017-08-20 20:41:31 -04:00
Barış Soner Uşaklı
ff88be91fa
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-08-18 20:09:40 -04:00
Baris Usakli
dc9b21021a
escape moderation notes
2017-08-18 11:23:20 -04:00
Baris Usakli
bc0645dc26
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-08-16 15:17:26 -04:00
Baris Usakli
37a8247293
add test for teaser content escape
2017-08-16 13:40:33 -04:00
Baris Usakli
575c9a41cd
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-08-15 13:00:18 -04:00
Barış Soner Uşaklı
f161bbf956
Post queue ( #5878 )
...
* #5876
* add user to post queue table
* add time of post into queue
add posting restrictions to queue
* fix shouldQueueLogic for guests
* add test for post-queue route
2017-08-15 12:59:40 -04:00
Barış Soner Uşaklı
fc0e5421d6
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-08-12 20:37:12 -04:00
Baris Usakli
c21f64c27f
closes #5872
2017-08-11 14:22:02 -04:00
Baris Usakli
bc6b1a8f56
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# public/src/admin/extend/plugins.js
2017-08-11 11:33:06 -04:00
Baris Usakli
24bbf8fe00
closes #5869
2017-08-10 16:49:16 -04:00
