Commit Graph

4312 Commits (f7f5b2c8d930e36af47574aa476c486619ea0807)

Author SHA1 Message Date
Julian Lam f7f5b2c8d9 Merge remote-tracking branch 'origin/master' into develop
Julian Lam 802878c371 Merge pull request from pichalite/cropper
Make cropper in to a module
barisusakli e009ce5609 closes
barisusakli 4d05e492cc closes
pichalite 2ca8f60e77 Finalize cropper module
pichalite d784a8dce8 Restore uploader.js
pichalite 43f4d9819e Linting
pichalite 484891472e Make cropper in to a module
barisusakli dad5b135c3 lint
barisusakli c285eb7fcd closes
Julian Lam 8bf719b258 Merge pull request from NodeBB/ajaxify-cache-buster
Ajaxify improvements, `/assets/uploads/` fixes, cache buster improvements
Julian Lam fcaefbadca Merge remote-tracking branch 'origin/master' into develop
Anil Mandepudi c25836b5fc Option to upload without cropping ()
* Option to upload without cropping

* Fix styling

* Fix styling

* Add missing semi-colon

* I fail at styling :fail:
psychobunny 0667870286 set an active state for pageview options
psychobunny ccfec622d4 Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
psychobunny 9e354a09d1 prettier stats on dashboard
Julian Lam 7f124a3ccf Merge branch 'master' into develop
Peter Jaszkowiak 8f27d7810b Ajaxify improvement, `/assets/uploads`
Julian Lam 7ba111acdd Merge pull request from NodeBB/assets-route
/assets/uploads
Julian Lam a8fd1440d4 fixed incorrect language key in ip blacklist page
psychobunny 570efb9e4b Merge branch 'develop' into threads-enhancement
psychobunny 83cd960ffa improved threaded view design
Peter Jaszkowiak aaacdb8413 Fix , uploads path config setting
- Finish moving uploads route to `/assets/uploads`
- Remove `upload_url` config setting, it was broken
barisusakli 387110fecc closes
Julian Lam 8a0a74d95e Merge remote-tracking branch 'origin/master' into develop
Julian Lam b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop
Peter Jaszkowiak bb1bfb0449 Merge branch 'master' into assets-route
pichalite 2c5f8ed8e6 Add image options to cropper modal
psychobunny dbc3113940 Merge pull request from pichalite/cropperjs
Ability to crop profile images before uploading
pichalite b757f563df Move tpl and less to core
pichalite a3df9132f7 Fix styling
pichalite a41acead44 Fix tabs
pichalite 6a073277ac Fix ACP layout on tablets
pichalite a808d1b4d9 Set aspect ratio to square and confine crop box to image
Julian Lam bfd16d188e Merge branch 'master' into develop
barisusakli 76254942b2 closes
Peter Jaszkowiak 360a35d0a6 Resolve merge conflicts
pichalite 700e2cf800 linting
pichalite de28ff5d43 Ability to crop profile images before uploading
Peter Jaszkowiak bb7a35b85c Fix translator catching JS errors in callbacks
Peter Jaszkowiak c14a31644b Merge branch 'master' into 'develop'
Peter Jaszkowiak bc9fa0a990 Remove requests to nonexistent language files
barisusakli f1f00b63fb closes
Julian Lam 7414482753 Merge branch 'master' into develop
Julian Lam 05c724de30 added new hook for messaging teaser retrieval, and casting input as String before execuring stripTags templates helper
barisusakli 33e452cc8e fix lint
barisusakli 0b95eab71e use roomName if availabe in taskbar
if room is renamed update title on taskbar
Julian Lam 73879b824c Merge branch 'master' into develop
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'
Julian Lam 339845ff6b Merge pull request from pitaj/build-translations
Compile translations in the build step