Commit Graph

328 Commits (01681ab4bf10e394a984a73b7338bcb0978ac543)

Author SHA1 Message Date
Barış Soner Uşaklı e9360347ea less padding, closes
Baris Usakli da8b1b605c
Julian Lam 74965654de adjusted cropbox max-height calculation to be dynamic
Julian Lam 30bec51a21 removed cropper zoom and using image scaling to show entire image. Click on modal backdrop during crop will no longer close modal
Peter Jaszkowiak 7ccfb5cdc0 Build refactor
- Target aliases and bundles
- More concurrency
- Use `--series` to force series processing
- Minifier self-hosted threading
- meta/css delegates to minifier
Julian Lam 064a8aa6d7 Allowing custom date range to be supplied in pageviews graph, closes
Barış Soner Uşaklı 3a1eba2537 merge
psychobunny 2fc53a1e30 closes
note: `.avatar-lg` wasn't updated to match the `develop` branch (where `avatar-xl` was added) intentionally
Julian Lam d18cfced96 Merge remote-tracking branch 'origin/master' into develop
Peter Jaszkowiak 2c418fd2af Use npm bootstrap
Julian Lam 860999fa6c Merge remote-tracking branch 'origin/master' into develop
psychobunny 5ca9e5e14c ACP: distinguish <small> from regular text
psychobunny debe34b96c better styling for tagsinput in ACP and added it to general -> keywords
Julian Lam 72e77772db Merge branch 'master' into develop
pichalite 1d5b3cc73f ACP manage tags page UI changes
Julian Lam a9f144230e Merge branch 'master' into develop
psychobunny 7b7565ee8e Merge pull request from pichalite/acp-groups
ACP manage groups UI updates
Julian Lam 672d7352bb Merge branch 'master' into develop
pichalite f09f1f6ed8 Fix ACP templates markup
pichalite dcb0f18422 ACP manage groups UI updates
Julian Lam fcaefbadca Merge remote-tracking branch 'origin/master' into develop
Anil Mandepudi c25836b5fc Option to upload without cropping ()
* Option to upload without cropping

* Fix styling

* Fix styling

* Add missing semi-colon

* I fail at styling :fail:
psychobunny 0667870286 set an active state for pageview options
psychobunny 3d1425605a prettification of pageview stats
psychobunny 62df8edb77 better positioning of dashboard legend
psychobunny ccfec622d4 Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
psychobunny 9e354a09d1 prettier stats on dashboard
Julian Lam a17c26ea45 Merge branch 'master' into develop
pichalite cc160d77e7 Fix scrolling issues on mobile
Julian Lam b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop
pichalite b757f563df Move tpl and less to core
Julian Lam c640bdf2b9 Merge branch 'master' into develop
Peter Jaszkowiak 94eb74646c `admin/manage/categories` translations
- Fix privilege table headers so bottom borders align
- Fix `/admin` route to show Dashboard title correctly
- Translate ACP category management and privileges templates
- Translate ACP category management JS
- Remove unnecessary translates in JS
- Fix bootbox wrapper to work with translations containing html
Julian Lam 76bcc1c327 Merge branch 'flagging-refactor' into develop
barisusakli 9d75c48236 closes closes closes
Julian Lam 5d63c0aa3b Merge remote-tracking branch 'origin/master' into flagging-refactor
psychobunny 6b7b51eaf0 Merge pull request from pitaj/master
ACP search updated to support translations
Peter Jaszkowiak 8ca98625b9 Key through search results
Julian Lam c36fe3389e Merge remote-tracking branch 'origin/master' into flagging-refactor
psychobunny bcb3903446 priv table headers
Julian Lam 77809b2b52 added avatar-xl size
Peter Jaszkowiak a431dc0305 ACP search updated to support translations
Julian Lam afc182478b fixes
Julian Lam 7ba76fc0b6 showing assignee avatar in flags list
Anil Mandepudi b9fd62cb6b fix admin navigation in IE ()
Julian Lam b12607b1de added uid to flag history, fixed loading on IS, worked around tjs bug
Julian Lam 194716cd68 re:
pichalite 11be46ec23 fixes
Julian Lam 785f4fc5a0 updating to jQuery 3.x on frontend and ACP
Julian Lam 275f5e32e8 adding back Bootswatch paper variables override
Julian Lam 2428d5e442 Update bootstrap in ACP
Also fixed  by moving user creation modal to root level
(outside of .panel)
barisusakli 2544287269 closes
Julian Lam 8d745ceb07 moving chat dropdown generation to tpl /cc @pichalite
psychobunny fb278dd146 fix reconnection spinner on ACP
barisusakli 2cc804084f closes
psychobunny 1a48f47e2b Merge pull request from pichalite/fix-mobile-menu
fixes 
Julian Lam 21caa82b61 ban controls on frontend, closes
Julian Lam 61fe9594d7 ban integration frontend for ACP,
psychobunny 9d6754bf6d prevent jittery ajaxify in ACP when switching from a short page to a long one
psychobunny bbc570c499 socket disconnected icon for ACP
psychobunny c44fa866e7 nprogress bar in ACP
Julian Lam b3d6a8ef9a mobile fixes for registration queue page
Julian Lam 470a40ecca update errors css page
pichalite bdfad2beda fixes
Julian Lam 92ab2699ba added some styling to allow mdl buttons to be stacked in ACP
barisusakli bf2133ed7c topic watching
barisusakli 1cbbb23043 fix css
barisusakli 65dfe2bf1b closes
Julian Lam 1385d19f64 Further tweaks to viewport shuffling and dynamic image loading
@BenLubar
Julian Lam 8ae2afff05 Revert "more tweaks to threshold"
This reverts commit 1783a07067.
Julian Lam 1783a07067 more tweaks to threshold
Julian Lam 28db642050 Fixing regression from 3e2231d2cb
@BenLubar
Julian Lam 3e2231d2cb Fixing viewport shuffling due to image load
Introduced new method ".loadImages()" in posts client side lib
to handle viewport height changes when loading images. Requires
nodebb-plugin-markdown@5.0.0

@BenLubar @boomzillawtf
psychobunny 5008e211e2 closes
barisusakli b6e22b7723 closes
Julian Lam 184a2c4540 IP blacklist functionality -- re:
Squashed commit of the following:

commit 5c42fd732d091fa66cf5b45a2af5e1697cc1efcd
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Mar 14 17:29:45 2016 -0400

    allowing blacklist.test to be called synchronously

commit 979faf2dba5e6f6e2ae1bd07341e63678438daf1
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Mar 14 17:01:14 2016 -0400

    added plain ipv6 support and finished middleware logic

commit d4b72fc1aadff34df3ed7dec52ca8d3c3728a078
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 16:05:31 2016 -0500

    WIP IP Banning logic middleware

commit f08b2553890c5522b6a1eaf521fe4e94df40574a
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 15:26:27 2016 -0500

    tweaks to ACP, rule validator

commit 868abacaa494e6b8a88bd4ea429b1b066a9ecb2e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 13:50:05 2016 -0500

    IP Banning ACP page, styling, save&load functionality
psychobunny b74022689f closes
barisusakli 8c3b52ef36 closes
Julian Lam 47c61e883a tweaked styling for flags page a bit
Julian Lam eb8b6af7fb Fix global mod priv check and styling for flags page
Julian Lam b7311dac65 removed css file @pichalite
pichalite a4d0026d93 ACP styling fixes
psychobunny 535dd82902 for previous commit
pichalite 511a4b7700 remove dashed border
Julian Lam 07c55ee859 updated .fix-lists mixin
barisusakli 32ca95319e closes
pichalite 329e32901f style updates
psychobunny 3ce9d0ac2f fixed ordered lists in post content
psychobunny 23c2fb2b52 un-nuking @julianlam :rage1: also fixed for latest BS
Julian Lam e602d2ad4d closes
Julian Lam 7220ed2010
Julian Lam 91c012e642
Julian Lam a936866688 revamped ACP Flags interface,
Julian Lam 526afc0910 Merge remote-tracking branch 'origin/master' into user-icons
psychobunny 4baeda7c09 navigation acp styling / checkboxes
psychobunny 296249ed9c allow new nav items to be added at the end of the list
Julian Lam b52475c270 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl
barisusakli fc4e7c0fff navigation cleanup
barisusakli e2a5440ae8 closes
barisusakli de4d747e63 closes