Commit Graph

14255 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
b4a32ee96f style changes 2017-02-23 22:42:45 +03:00
Barış Soner Uşaklı
743f758f75 set origin header to url 2017-02-23 21:29:28 +03:00
Julian Lam
25f6293821 using io.origins instead 2017-02-23 13:26:52 -05:00
Julian Lam
91d3ce1abc Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472"
This reverts commit c1b1ff5c6e.
2017-02-23 13:26:52 -05:00
Barış Soner Uşaklı
c168ed43d4 up build timeout 2017-02-23 21:25:50 +03:00
psychobunny
7b7565ee8e Merge pull request #5468 from pichalite/acp-groups
ACP manage groups UI updates
2017-02-23 13:22:57 -05:00
Julian Lam
c1b1ff5c6e adding origin to new local ioConfig var, as per @barisusakli, re: #5472 2017-02-23 12:47:06 -05:00
Barış Soner Uşaklı
9079ee5b14 style 2017-02-23 20:44:23 +03:00
psychobunny
458cbfd603 show dashboard notice if forum is running in dev mode 2017-02-23 12:14:20 -05:00
psychobunny
a2847dc851 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2017-02-23 12:01:25 -05:00
Julian Lam
d4c2fc3bc8 closes #5472 2017-02-23 11:54:51 -05:00
psychobunny
ebe5ed7560 Merge pull request #5470 from pichalite/acp-templates
Fix ACP templates markup
2017-02-23 11:46:02 -05:00
barisusakli
0de21cb3ff fix tab 2017-02-23 17:12:46 +03:00
barisusakli
09d0ce4778 post tests 2017-02-23 17:02:54 +03:00
barisusakli
4cd4414d19 small change 2017-02-23 15:29:35 +03:00
Barış Soner Uşaklı
026c32f32b Merge pull request #5462 from NodeBB/minify-modules
Minify all module scripts in production
2017-02-23 13:15:05 +02:00
Misty (Bot)
02cc988ae7 Latest translations and fallbacks 2017-02-23 09:22:14 +00:00
pichalite
aea40902b0 Fix markup in category privileges template 2017-02-23 00:28:54 +00:00
pichalite
f09f1f6ed8 Fix ACP templates markup 2017-02-23 00:20:42 +00:00
pichalite
dcb0f18422 ACP manage groups UI updates 2017-02-22 20:28:56 +00:00
Julian Lam
e887dda37a Merge pull request #5461 from pichalite/image-dimension
Use ACP profile image dimension setting in cropper
2017-02-22 14:53:40 -05:00
barisusakli
2dac3d2292 closes #5465, blacklist tests 2017-02-22 14:53:44 +03:00
barisusakli
5c01c7b1c7 delayed notification test 2017-02-22 13:35:05 +03:00
Julian Lam
e427f1663e Merge pull request #5456 from NodeBB/sounds-refactor
Sound system improvements
2017-02-21 16:14:58 -05:00
Barış Soner Uşaklı
89380824f8 navigation test 2017-02-21 17:00:54 +03:00
barisusakli
f2a795a9b7 fix tests 2017-02-21 15:18:01 +03:00
barisusakli
799f688503 closes #5463 , invitation tests 2017-02-21 15:08:17 +03:00
Misty (Bot)
4b21679d6f Latest translations and fallbacks 2017-02-21 09:24:38 +00:00
barisusakli
4ee7edad64 test uploadProfileImageFromUrl 2017-02-20 21:58:35 +03:00
barisusakli
ef90702049 closes #5459 2017-02-20 21:28:02 +03:00
Misty (Bot)
7d8477289d Latest translations and fallbacks 2017-02-20 09:22:34 +00:00
Peter Jaszkowiak
beb652ee43 Move minifier.js to src/meta 2017-02-20 00:44:04 -07:00
psychobunny
aaec279d75 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2017-02-19 11:07:39 -05:00
Anil Mandepudi
f302c0d739 Update gruntfile to build on initialization (#5458)
* Update gruntfile to build on initialization

* Skip option skips build
2017-02-19 11:01:38 -05:00
psychobunny
631592b818 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2017-02-19 11:00:14 -05:00
Misty (Bot)
2e27ce640c Latest translations and fallbacks 2017-02-19 09:25:24 +00:00
Peter Jaszkowiak
9b1068e868 Minify all module scripts in production 2017-02-19 02:07:19 -07:00
pichalite
fd0f0beaf2 lint 2017-02-19 08:54:46 +00:00
pichalite
a99572fc48 Use ACP profile image dimension setting in cropper 2017-02-19 08:30:30 +00:00
Barış Soner Uşaklı
1b43faba1a closes #5441 2017-02-19 02:44:38 +03:00
barisusakli
7842c3411c remove logs 2017-02-18 20:52:45 +03:00
barisusakli
b33d34f7cf refactor user/picture.js 2017-02-18 20:27:58 +03:00
Barış Soner Uşaklı
23ed1af282 Merge pull request #5457 from pichalite/image-extension
Add extensions for cropped images
2017-02-18 15:06:45 +02:00
pichalite
bb3c8b910a Skip option skips build 2017-02-17 23:33:37 +00:00
pichalite
5ca931a52c Update gruntfile to build on initialization 2017-02-17 22:07:50 +00:00
pichalite
aacd8a2422 Fix return and tests 2017-02-17 20:36:13 +00:00
pichalite
7f4e4c8e2e Fix styling 2017-02-17 20:02:26 +00:00
pichalite
4d755bad0c Use typeToExtension from file.js 2017-02-17 19:57:18 +00:00
pichalite
8dab8864f6 Add extensions for cropped images 2017-02-17 19:42:02 +00:00
barisusakli
aa64ec7db1 remove unnecessary code 2017-02-17 22:33:41 +03:00