Commit Graph

792 Commits

Author SHA1 Message Date
Peter Jaszkowiak
010473e5cc Merge branch 'master' into patch-pitaj 2017-04-09 23:09:52 -06:00
Peter Jaszkowiak
0ef30e91ba Use ace-builds npm package instead of vendor
ace can be referenced as an r.js module, reduces acp bundle size
2017-04-08 19:05:10 -06:00
pichalite
4c89497cc4 Closes #5521 2017-04-07 20:57:00 +00:00
psychobunny
5985a8a7a3 closes #5574 2017-04-06 18:06:10 -04:00
Ben Lubar
7f713ee822 Admin option to allow all users to view votes (#5534)
* Admin option to allow all users to view votes

* Fix </strong></strong>
2017-03-17 14:08:47 -04:00
psychobunny
62f445ad7f ACP: added tagsinput to other fields that are "comma separated" 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
psychobunny
447b7b02ca use tagsinput for #5439 instead 2017-03-10 14:12:17 -05:00
psychobunny
f2eb4b8083 closes #5439 2017-03-10 14:03:07 -05:00
psychobunny
8da8e4d8c3 closes #5469 2017-03-09 16:50:26 -05:00
psychobunny
2ccf60a6ec fixed duplicate uninstall button 2017-03-01 13:49:55 -05:00
Peter Jaszkowiak
007051c14c Fix #5476 2017-02-25 19:51:49 -07:00
psychobunny
09a1ed0869 Merge pull request #5371 from kingjan1999/master
Update FontAwesome to 4.7.0
2017-02-24 16:33:38 -05:00
pichalite
1d5b3cc73f ACP manage tags page UI changes 2017-02-23 20:45:05 +00:00
psychobunny
7b7565ee8e Merge pull request #5468 from pichalite/acp-groups
ACP manage groups UI updates
2017-02-23 13:22:57 -05: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
pichalite
a99572fc48 Use ACP profile image dimension setting in cropper 2017-02-19 08:30:30 +00:00
Peter Jaszkowiak
9f15008247 Address review issues 2017-02-17 11:19:30 -07:00
Peter Jaszkowiak
c75391f9f5 Sound system improvements
- Fix sound ACP uploads
- Display soundpack names with sound files
- Soundpacks can have sounds with identical names
- Link sounds during build step
- Generate map of sound name to file name during build step
- Change how soundpacks work. It's now done via a field in plugin.json
2017-02-16 22:58:15 -07: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
Peter Jaszkowiak
bb1bfb0449 Merge branch 'master' into assets-route 2017-02-06 15:52:54 -07:00
psychobunny
df1a1811f2 add horizontal rule on top of image crop tools 2017-02-06 16:18:36 -05:00
pichalite
2c5f8ed8e6 Add image options to cropper modal 2017-02-06 21:00:21 +00:00
psychobunny
dbc3113940 Merge pull request #5412 from pichalite/cropperjs
Ability to crop profile images before uploading
2017-02-06 14:33:49 -05:00
pichalite
b757f563df Move tpl and less to core 2017-02-06 19:11:58 +00:00
pichalite
6a073277ac Fix ACP layout on tablets 2017-02-03 22:12:47 +00:00
Peter Jaszkowiak
360a35d0a6 Resolve merge conflicts 2017-02-02 22:15:26 -07:00
Stephan
374bc04cdb fixed missing translation string 2017-01-23 04:06:01 +01:00
Dominic Lennon
3507e4ce0e Adding closing <p> 2017-01-16 09:33:33 +00:00
Dominic Lennon
a06e39528f Code review change 2017-01-16 08:48:53 +00:00
kingjan1999
cbe8807ebd update fontawesome.tpl 2017-01-15 17:46:21 +01:00
Peter Jaszkowiak
05b68391dd Use /assets for client assets
- Route `/assets` -> `build/public`, falling back on `public`
- Moved destinations for `nodebb.min.js`, `acp.min.js`, `admin.css`, `stylesheet.css`, `templates`, and `sounds` to `build/public`
- r.js modules previously routed through express are now symlinked into `public/build/src/modules`
- minfiles no longer served from a memory cache
- use config `views_dir` setting everywhere template directory is used
- fix cache buster `v=v=`
2017-01-14 22:38:40 -07:00
Dominic Lennon
ed19454eca Adding more specific timing for session timings 2017-01-11 10:51:41 +00:00
barisusakli
476ec6e4ee closes #5307 2016-12-22 20:33:08 +03:00
psychobunny
66d8c29d25 use different path for installer files 2016-12-22 11:45:22 -05:00
psychobunny
29cf6f528c no need to check for logged in status in ACP 2016-12-21 11:19:19 -05:00
Julian Lam
926186108b ACP Translations 2016-12-19 15:51:44 -05:00
Peter Jaszkowiak
daf3ab4db4 WIP 2016-12-19 15:51:43 -05:00
Peter Jaszkowiak
038c45f4b6 admin/manage translations, misc
- Translate Manage templates and JS
- Change `translator.translate -> .html` into `.translateHtml` where fitting
- Translate `admin/partials/download_plugin_item`
2016-12-19 15:51:43 -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
Peter Jaszkowiak
3008794797 admin/general JS translations and misc 2016-12-19 15:51:43 -05:00
Peter Jaszkowiak
95bef8f3f6 admin/extend JS translations and misc 2016-12-19 15:51:43 -05:00
Peter Jaszkowiak
38eba81933 ACP menu and title translations 2016-12-19 15:51:43 -05:00
Peter Jaszkowiak
20db4657b2 admin/general translations 2016-12-19 15:51:43 -05:00
Peter Jaszkowiak
3cd6a8a94b admin/extend translations 2016-12-19 15:51:43 -05:00
Peter Jaszkowiak
50aed01c57 admin/development translations 2016-12-19 15:51:43 -05:00
Peter Jaszkowiak
6c1b852d48 admin/appearance translations 2016-12-19 15:51:43 -05:00