Commit Graph

66 Commits

Author SHA1 Message Date
Baris Usakli
d13eb52f39 closes #5722 2017-05-30 14:10:16 -04:00
psychobunny
88d5f97280 closes #5717 2017-05-29 17:12:02 -04:00
Baris Usakli
883b35243f fix lint 2017-05-29 15:12:22 -04:00
Baris Usakli
1fa52267d4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/src/admin/manage/category.js
2017-05-29 14:48:25 -04:00
Baris Usakli
de5fe25e57 closes #5715 2017-05-29 14:47:01 -04:00
psychobunny
dcbe4864a9 fix bad merge / dupe code 2017-05-29 13:26:17 -04:00
Peter Jaszkowiak
b227297ef3 ESlint no-use-before-define 2017-02-18 18:55:33 -07:00
Peter Jaszkowiak
4bb49a7171 ESlint no-unused-vars 2017-02-18 15:05:36 -07:00
Peter Jaszkowiak
896c8c7343 ESlint object-curly-spacing 2017-02-18 12:30:49 -07:00
Peter Jaszkowiak
feb8405f95 ESlint eol-last 2017-02-18 02:30:48 -07:00
Peter Jaszkowiak
a038c66549 ESlint quotes 2017-02-18 01:56:23 -07:00
Peter Jaszkowiak
604358ecc4 ESlint keyword-spacing, no-multi-spaces 2017-02-18 01:52:56 -07:00
Peter Jaszkowiak
3361a72725 ESlint no-plusplus
and no-empty, space-unary-ops
2017-02-18 01:12:18 -07:00
Peter Jaszkowiak
b09b3aef7f ESlint no-undef, remove global comments 2017-02-17 22:03:55 -07:00
Peter Jaszkowiak
2ba46808a1 ESlint one-var, fix comma-dangle 2017-02-17 20:20:42 -07:00
Peter Jaszkowiak
bc1d70c126 ESlint comma-dangle 2017-02-17 19:31:21 -07:00
pichalite
7b234c666f Fixes #5344 2017-01-18 20:32:19 +00: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
Peter Jaszkowiak
4eca23174a Translate dynamically added admin content 2016-12-19 15:51:43 -05:00
barisusakli
0b9829850c closes #5273 2016-12-09 18:53:08 +03:00
Sergii Paryzhskyi
e515b791da Fix eslint rules (#5117)
* Fix semi linter rule

* Fix semi-spacing linter rule

* Fix no-undef-init linter rule

* Fix space-before-blocks linter rule
2016-10-25 15:34:47 -04:00
HeeL
4a3c31b2dc Fix space-before-function-paren linter rule 2016-10-13 11:43:39 +02:00
HeeL
3fa1c1f927 Fix space-infix-ops linter rule 2016-10-13 11:42:29 +02:00
Julian Lam
e7386e20cf closes #4505 2016-07-28 11:51:19 -04:00
psychobunny
38af8344cc missed a spot for topics:read priv 2016-06-01 08:52:54 -04:00
psychobunny
b37b083a4d new privilege: Access Topic
differentiation between Access Category and Access Topic, ie. allows you
to see the category view but not actually enter the topic itself
2016-05-28 05:41:17 -04:00
barisusakli
54ccdf5262 closes #4651 2016-05-23 12:59:33 +03:00
Julian Lam
f91f705f90 Merge branch 'master' into fix-vendors 2016-04-04 18:46:24 -04:00
barisusakli
b948e031f6 closes #2779 2016-04-01 15:02:22 +03:00
Julian Lam
22f73a8f68 fixes #4463 2016-03-25 13:24:40 -04:00
barisusakli
e8b8f115b7 closes #3652 2016-03-24 16:15:28 +02:00
barisusakli
7e6e3b3a40 closes #4383 2016-03-22 16:47:30 +02:00
Julian Lam
a275aaeaf5 fixes #4361 2016-03-14 12:57:55 -04:00
barisusakli
df9558f1fa closes #4268 2016-02-29 14:23:12 +02:00
Julian Lam
e1323c0295 Updated js code so vendors can be added to the modules folder, so
they can be required properly and we can finally get rid of that
really annoying "mismatched anonymous" error in Require.js.

First module to make the transition: Chart.js
2016-02-26 11:29:17 -05:00
Julian Lam
db3446b1ca updated some of the graph colours 2016-02-25 16:21:46 -05:00
Julian Lam
088940d4c7 Squashed commit of the following:
commit 49e6c0040cc82c1e2684933a8e167ef14854aff8
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 16:12:15 2016 -0500

    added recording and charts for topic and post counts globally and by cid

commit e02ff70757f778aa016fbc42ef10a5da2d07a9d9
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 15:35:49 2016 -0500

    added labels to charts

commit e75d83bf3886e5183bcf5fcd848d71c513761e01
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 13:30:47 2016 -0500

    added per category graphs to ACP management page

commit e3f543200950925cc9e8bf33cccb592f949a100e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 12:36:11 2016 -0500

    updated analytics to move helper methods to analytics lib and sending per category analytics to ACP page

commit 01891d8f7c408925fcdad18dcaa941e5ebbeb9b2
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Feb 24 16:48:55 2016 -0500

    saving per-category analytics, and updated the writeData method to use async for "clarity"
2016-02-25 16:12:50 -05:00
barisusakli
1ad4128649 closes #3917, closes #2941 2016-01-12 15:47:09 +02:00
barisusakli
de4d747e63 closes #3742 2015-10-13 13:58:36 -04:00
barisusakli
ee8bb8d908 closes #3634 2015-09-20 15:38:54 -04:00
Barış Soner Uşaklı
5b08538264 closes #3614 2015-09-15 12:58:35 -04:00
psychobunny
ff2543e522 thought they all seemed pretty self-explanatory to me 2015-09-01 11:58:32 -04:00
psychobunny
bc5f9d0199 closes #3536 2015-09-01 11:58:30 -04:00
psychobunny
dfa4f47289 save / create buttons for categories/category 2015-08-20 15:19:43 -04:00
psychobunny
bd494207eb got rid of that fancy edit for cat name/desc + improved layout for settings 2015-08-20 13:40:22 -04:00
psychobunny
ffd38b8cc3 some UX tweaks to manage/category 2015-08-20 13:31:27 -04:00
yariplus
67e450a05b Fix issues with acp category page
strange name for background size variable
invalid class selectors
hijacking of background style
2015-08-19 13:47:15 -04:00
barisusakli
2b493964d0 closes #3296 2015-07-07 17:23:41 -04:00
barisusakli
ffd22f50ff closes #1999 2015-07-06 14:33:52 -04:00
Julian Lam
ceb4de653d fixed #3295 2015-07-06 10:41:13 -04:00