4295 Commits (eae541d0404b9bb352f9b4361938adfbea3c2f7b)

Author SHA1 Message Date
Julian Lam 7f124a3ccf Merge branch 'master' into develop 8 years ago
Julian Lam 7ba111acdd Merge pull request #5420 from NodeBB/assets-route
/assets/uploads
8 years ago
Julian Lam a8fd1440d4 fixed incorrect language key in ip blacklist page 8 years ago
psychobunny 570efb9e4b Merge branch 'develop' into threads-enhancement 8 years ago
psychobunny 83cd960ffa improved threaded view design 8 years ago
Peter Jaszkowiak aaacdb8413 Fix #5416, uploads path config setting
- Finish moving uploads route to `/assets/uploads`
- Remove `upload_url` config setting, it was broken
8 years ago
barisusakli 387110fecc closes #5315 8 years ago
Julian Lam 8a0a74d95e Merge remote-tracking branch 'origin/master' into develop 8 years ago
Julian Lam b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak bb1bfb0449 Merge branch 'master' into assets-route 8 years ago
pichalite 2c5f8ed8e6 Add image options to cropper modal 8 years ago
psychobunny dbc3113940 Merge pull request #5412 from pichalite/cropperjs
Ability to crop profile images before uploading
8 years ago
pichalite b757f563df Move tpl and less to core 8 years ago
pichalite a3df9132f7 Fix styling 8 years ago
pichalite a41acead44 Fix tabs 8 years ago
pichalite 6a073277ac Fix ACP layout on tablets 8 years ago
pichalite a808d1b4d9 Set aspect ratio to square and confine crop box to image 8 years ago
Julian Lam bfd16d188e Merge branch 'master' into develop 8 years ago
barisusakli 76254942b2 closes #5190 8 years ago
Peter Jaszkowiak 360a35d0a6 Resolve merge conflicts 8 years ago
pichalite 700e2cf800 linting 8 years ago
pichalite de28ff5d43 Ability to crop profile images before uploading 8 years ago
Peter Jaszkowiak bb7a35b85c Fix translator catching JS errors in callbacks 8 years ago
Peter Jaszkowiak c14a31644b Merge branch 'master' into 'develop' 8 years ago
Peter Jaszkowiak bc9fa0a990 Remove requests to nonexistent language files 8 years ago
barisusakli f1f00b63fb closes #5400 8 years ago
Julian Lam 7414482753 Merge branch 'master' into develop 8 years ago
Julian Lam 05c724de30 added new hook for messaging teaser retrieval, and casting input as String before execuring stripTags templates helper 8 years ago
barisusakli 33e452cc8e fix lint 8 years ago
barisusakli 0b95eab71e use roomName if availabe in taskbar
if room is renamed update title on taskbar
8 years ago
Julian Lam 73879b824c Merge branch 'master' into develop 8 years ago
Julian Lam 694f2382bf fix issue where navigating back to a topic listing (category.tpl) would not scroll down to the topic you had clicked on, and in some cases would exclude topics that were beyond that particular 'page' 8 years ago
Julian Lam 339845ff6b Merge pull request #5366 from pitaj/build-translations
Compile translations in the build step
8 years ago
Julian Lam 76376f52c3 Merge remote-tracking branch 'origin/master' into develop 8 years ago
psychobunny 19c3f54a30 Merge pull request #5379 from pichalite/issue-5344
Fixes #5344
8 years ago
pichalite 7b234c666f Fixes #5344 8 years ago
Julian Lam 08af924873 closes #5189 8 years ago
Julian Lam 82e9e1a05d closes #5189 8 years ago
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=`
8 years ago
Peter Jaszkowiak e1a29f4aa8 Switch to `assets` route 8 years ago
Peter Jaszkowiak b4b3be3d97 Cache bust translations, query param name 8 years ago
Peter Jaszkowiak 2f07c18c5a All hail the glorious translation prebuilding 8 years ago
Julian Lam 9dcbe875a0 Merge branch 'master' into develop 8 years ago
Julian Lam c99321a518 always setting app.previousUrl now, and passing cid into filter:category.topics.get hook 8 years ago
psychobunny 65cf2dbe55 move updateRoomUsage to after graph setup #5346 8 years ago
psychobunny 7f9381b087 closes #5346 8 years ago
psychobunny 9797f69324 action:chat.sent 8 years ago
Julian Lam 20d035bdac hotfix to utils.isRelativeUrl to handle null or undefined first argument 8 years ago
Julian Lam 9987d52855 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Julian Lam 2ab2486d3b if require call on page script fails, remove from scripts array 8 years ago