Commit Graph

276 Commits

Author SHA1 Message Date
Julian Lam
74965654de adjusted cropbox max-height calculation to be dynamic 2017-05-24 14:50:22 -04:00
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 2017-05-24 12:36:58 -04:00
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
2017-05-17 16:37:10 -06:00
Julian Lam
064a8aa6d7 Allowing custom date range to be supplied in pageviews graph, closes #5541 2017-05-11 11:41:36 -04:00
Barış Soner Uşaklı
3a1eba2537 merge 2017-05-08 13:49:35 -04:00
psychobunny
2fc53a1e30 closes #5625
note: `.avatar-lg` wasn't updated to match the `develop` branch (where `avatar-xl` was added) intentionally
2017-05-02 16:47:16 -04:00
Julian Lam
d18cfced96 Merge remote-tracking branch 'origin/master' into develop 2017-04-12 23:57:14 -04:00
Peter Jaszkowiak
2c418fd2af Use npm bootstrap 2017-04-08 19:05:10 -06:00
Julian Lam
860999fa6c Merge remote-tracking branch 'origin/master' into develop 2017-03-10 15:44:29 -05:00
psychobunny
5ca9e5e14c ACP: distinguish <small> from regular text 2017-03-10 14:36:35 -05:00
psychobunny
debe34b96c better styling for tagsinput in ACP and added it to general -> keywords 2017-03-10 14:25:37 -05:00
Julian Lam
72e77772db Merge branch 'master' into develop 2017-02-24 12:46:40 -05:00
pichalite
1d5b3cc73f ACP manage tags page UI changes 2017-02-23 20:45:05 +00:00
Julian Lam
a9f144230e Merge branch 'master' into develop 2017-02-23 13:57:46 -05: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
672d7352bb Merge branch 'master' into develop 2017-02-23 12:32:03 -05: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
fcaefbadca Merge remote-tracking branch 'origin/master' into develop 2017-02-15 12:06:52 -05:00
Anil Mandepudi
c25836b5fc Option to upload without cropping (#5447)
* Option to upload without cropping

* Fix styling

* Fix styling

* Add missing semi-colon

* I fail at styling :fail:
2017-02-14 16:31:51 -05:00
psychobunny
0667870286 set an active state for pageview options 2017-02-13 15:50:12 -05:00
psychobunny
3d1425605a prettification of pageview stats 2017-02-13 15:40:20 -05:00
psychobunny
62df8edb77 better positioning of dashboard legend 2017-02-13 15:36:20 -05:00
psychobunny
ccfec622d4 Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop 2017-02-13 15:28:30 -05:00
psychobunny
9e354a09d1 prettier stats on dashboard 2017-02-13 15:28:26 -05:00
Julian Lam
a17c26ea45 Merge branch 'master' into develop 2017-02-09 12:53:07 -05:00
pichalite
cc160d77e7 Fix scrolling issues on mobile 2017-02-09 17:33:31 +00:00
Julian Lam
b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop 2017-02-07 15:45:21 -05:00
pichalite
b757f563df Move tpl and less to core 2017-02-06 19:11:58 +00:00
Julian Lam
c640bdf2b9 Merge branch 'master' into develop 2016-12-20 13:29:44 -05:00
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
2016-12-19 15:51:43 -05:00
Julian Lam
76bcc1c327 Merge branch 'flagging-refactor' into develop 2016-12-19 13:00:31 -05:00
barisusakli
9d75c48236 closes #4563 closes #4569 closes #4566 2016-12-15 13:03:14 +03:00
Julian Lam
5d63c0aa3b Merge remote-tracking branch 'origin/master' into flagging-refactor 2016-12-08 14:25:53 -05:00
psychobunny
6b7b51eaf0 Merge pull request #5170 from pitaj/master
ACP search updated to support translations
2016-12-06 17:45:19 -05:00
Peter Jaszkowiak
8ca98625b9 Key through search results 2016-12-05 18:32:17 -07:00
Julian Lam
c36fe3389e Merge remote-tracking branch 'origin/master' into flagging-refactor 2016-12-01 17:06:02 -05:00
psychobunny
bcb3903446 priv table headers 2016-12-01 16:07:40 -05:00
Julian Lam
77809b2b52 added avatar-xl size 2016-11-30 20:26:45 -05:00
Peter Jaszkowiak
a431dc0305 ACP search updated to support translations 2016-11-28 12:52:26 -07:00
Julian Lam
afc182478b fixes #5141 2016-10-21 11:26:24 -04:00
Julian Lam
7ba76fc0b6 showing assignee avatar in flags list 2016-10-13 15:38:10 -04:00
Anil Mandepudi
b9fd62cb6b fix admin navigation in IE (#5110) 2016-10-13 12:37:03 -04:00
Julian Lam
b12607b1de added uid to flag history, fixed loading on IS, worked around tjs bug 2016-09-15 12:46:08 -04:00
Julian Lam
194716cd68 re: #5002 2016-08-31 12:20:51 -04:00
pichalite
11be46ec23 fixes #4992 2016-08-29 17:42:29 +00:00
Julian Lam
785f4fc5a0 updating to jQuery 3.x on frontend and ACP 2016-08-26 15:36:50 -04:00
Julian Lam
275f5e32e8 adding back Bootswatch paper variables override 2016-08-25 17:23:06 -04:00
Julian Lam
2428d5e442 Update bootstrap in ACP
Also fixed #4872 by moving user creation modal to root level
(outside of .panel)
2016-08-25 16:10:33 -04:00
barisusakli
2544287269 closes #4977 2016-08-25 22:16:54 +03:00