Julian Lam
76376f52c3
Merge remote-tracking branch 'origin/master' into develop
2017-01-19 14:29:12 -05:00
psychobunny
19c3f54a30
Merge pull request #5379 from pichalite/issue-5344
...
Fixes #5344
2017-01-18 16:38:48 -05:00
pichalite
7b234c666f
Fixes #5344
2017-01-18 20:32:19 +00:00
Julian Lam
08af924873
closes #5189
2017-01-17 14:05:33 -05:00
Julian Lam
82e9e1a05d
closes #5189
2017-01-17 14:05:19 -05: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
Peter Jaszkowiak
e1a29f4aa8
Switch to assets route
2017-01-14 17:12:16 -07:00
Peter Jaszkowiak
b4b3be3d97
Cache bust translations, query param name
2017-01-14 14:09:46 -07:00
Peter Jaszkowiak
2f07c18c5a
All hail the glorious translation prebuilding
2017-01-14 14:08:52 -07:00
Julian Lam
9dcbe875a0
Merge branch 'master' into develop
2017-01-13 15:01:34 -05:00
Julian Lam
c99321a518
always setting app.previousUrl now, and passing cid into filter:category.topics.get hook
2017-01-13 15:01:14 -05:00
psychobunny
65cf2dbe55
move updateRoomUsage to after graph setup #5346
2017-01-12 14:26:03 -05:00
psychobunny
7f9381b087
closes #5346
2017-01-12 14:22:30 -05:00
psychobunny
9797f69324
action:chat.sent
2017-01-12 11:48:41 -05:00
Julian Lam
20d035bdac
hotfix to utils.isRelativeUrl to handle null or undefined first argument
2017-01-11 14:33:51 -05:00
Julian Lam
9987d52855
Merge remote-tracking branch 'origin/master' into develop
2017-01-09 16:18:15 -05:00
Julian Lam
2ab2486d3b
if require call on page script fails, remove from scripts array
2017-01-09 15:02:32 -05:00
Julian Lam
6a591069c5
fixes issue with ajaxify.end not firing
2017-01-09 14:51:05 -05:00
Julian Lam
43056a4bfa
Merge branch 'master' into develop
2017-01-08 16:26:00 -05:00
Julian Lam
64e4ef042b
allowing plugins to subscribe to action:script.load and pass in function references
2017-01-08 15:58:25 -05:00
Peter Jaszkowiak
ffa2bd14f8
Fix reverse proxies breaking admin translations
2017-01-07 22:48:57 -07:00
Julian Lam
2c6beb9ffb
Merge branch 'master' into develop
2017-01-05 10:05:57 -05:00
Barış Soner Uşaklı
aa32e7b359
fix indents
2017-01-04 00:58:32 +03:00
loopback0
a86134cc5b
Fix selection
...
Tweak to allow the shift + click behaviour for the checkboxes while still letting the browser behaviour work
2017-01-03 20:18:35 +00:00
Julian Lam
3861b2dd80
Merge remote-tracking branch 'origin/master' into develop
2017-01-03 13:39:11 -05:00
Peter Jaszkowiak
cb82824c13
Fix ACP title bug with hashes ( #5331 )
2017-01-02 10:59:55 -05:00
Anil Mandepudi
8ddf7eb922
Use scrollStop in chat ( #5326 )
2016-12-29 14:25:05 -05:00
pichalite
5b646495af
Confirm before removing user and group cover picture
2016-12-29 01:01:35 +00:00
Julian Lam
db20df0110
Merge branch 'master' into develop
2016-12-27 15:26:59 -05:00
Julian Lam
a8521d0349
remove double-click to mark all notifications read
2016-12-27 12:55:28 -05:00
barisusakli
190b3759a0
fix tests
2016-12-23 16:51:18 +03:00
barisusakli
827e4b4ffd
refactor post tools
2016-12-23 16:35:48 +03:00
pichalite
cae5a9ac58
Update ACE editor to latest
2016-12-22 19:25:24 +00:00
Julian Lam
29c7ae7645
Merge remote-tracking branch 'origin/master' into develop
2016-12-22 09:21:32 -05:00
psychobunny
f742c847e1
Merge pull request #5304 from pitaj/master
...
Fix ACP title issues
2016-12-21 19:29:09 -05:00
Peter Jaszkowiak
6d00d5f6a5
Fix ACP title issues
2016-12-21 16:00:12 -07:00
Barış Soner Uşaklı
c4d4d2385b
closes #3973 closes #5303
2016-12-22 01:48:41 +03:00
Julian Lam
c640bdf2b9
Merge branch 'master' into develop
2016-12-20 13:29:44 -05:00
Julian Lam
d77f417cf3
allowing timeago timestamps to be in the future
2016-12-20 13:17:20 -05:00
Peter Jaszkowiak
460b830a96
Fix ajaxify loading default language translations
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
862908d0eb
ACP search and title improvements
...
- Search uses translated titles if available
- Use `advanced` for `development` route titles
- Remove route title from showing up in results
- Highlight matching part of result title
- Don't show empty result contents when only title is matched
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
bae1daf5dc
Bootbox wrapper improvements
2016-12-19 15:51:43 -05:00
Peter Jaszkowiak
606de990e9
admin/advanced JS translations
2016-12-19 15:51:43 -05:00
Peter Jaszkowiak
0b4c39338e
Translation bootbox wrapper
...
- Replaced minfied bootbox file with unminified one since it's minified at build anyways
- Removed existing override
- Made translator more verbose in dev mode; it now warns about missing translations
2016-12-19 15:51:43 -05:00
Peter Jaszkowiak
4eca23174a
Translate dynamically added admin content
2016-12-19 15:51:43 -05:00
