4593 Commits (fdffaf9ed20e319c1e04ce198b225d31714bdda6)

Author SHA1 Message Date
barisusakli 1301fb1f34 on chat leave close the modal 8 years ago
barisusakli 8a123f7c1c closes #5509 8 years ago
barisusakli 69c6ee5834 closes #5483 8 years ago
barisusakli 992e3128bd closes #5499 8 years ago
Julian Lam af2d9fb85b Merge branch 'master' into develop 8 years ago
Accalia de Elementia 743a7e00b4 fix: auto cropper on image upload selects maximum image area by default 8 years ago
barisusakli 531df7bd09 closes #5504 8 years ago
RoiEX c517733e34 Fix admin Search 8 years ago
barisusakli e85e35cf0c closes #5497 8 years ago
barisusakli 202bafa3e3 add images to bundle 8 years ago
barisusakli 5ca8456340 move image code to client/topic/images 8 years ago
barisusakli 284485c885 check data.config 8 years ago
Julian Lam 58cbf44143 Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak 007051c14c Fix #5476 8 years ago
Julian Lam b1ceec7571 Merge remote-tracking branch 'origin/master' into develop 8 years ago
barisusakli 347761173a helpers tests 8 years ago
Julian Lam 6e7b505ea7 more linting 8 years ago
Julian Lam ddea9f534e running eslint again 8 years ago
Julian Lam 72e77772db Merge branch 'master' into develop 8 years ago
Julian Lam 995f8296a4 linting 8 years ago
Julian Lam e71bd7a27f Merge branch 'master' into styleguide 8 years ago
barisusakli 048eb8a320 some helper tests 8 years ago
Peter Jaszkowiak dd2b930824 Resolve merge conflicts, minify only `.js` files 8 years ago
Peter Jaszkowiak ee9d7584e4 Fix test, misc 8 years ago
pichalite 1d5b3cc73f ACP manage tags page UI changes 8 years ago
Julian Lam a9f144230e Merge branch 'master' into develop 8 years ago
psychobunny 7b7565ee8e Merge pull request #5468 from pichalite/acp-groups
ACP manage groups UI updates
8 years ago
Julian Lam 672d7352bb Merge branch 'master' into develop 8 years ago
pichalite dcb0f18422 ACP manage groups UI updates 8 years ago
Julian Lam e887dda37a Merge pull request #5461 from pichalite/image-dimension
Use ACP profile image dimension setting in cropper
8 years ago
Julian Lam e427f1663e Merge pull request #5456 from NodeBB/sounds-refactor
Sound system improvements
8 years ago
Julian Lam 62e0f5f883 Merge remote-tracking branch 'origin/master' into develop 8 years ago
pichalite fd0f0beaf2 lint 8 years ago
pichalite a99572fc48 Use ACP profile image dimension setting in cropper 8 years ago
Peter Jaszkowiak 23540afaeb Resolve merge conflicts 8 years ago
Peter Jaszkowiak b227297ef3 ESlint no-use-before-define 8 years ago
Peter Jaszkowiak 93f38d4f30 ESlint no-multi-assign
and max-nested-callbacks, no-mixed-requires, max-statements-per-line
8 years ago
Peter Jaszkowiak 4bb49a7171 ESlint no-unused-vars 8 years ago
Peter Jaszkowiak c18808fdeb ESlint no-useless-concat, no-mixed-spaces-and-tabs 8 years ago
Peter Jaszkowiak fdf4f873bf ESlint eqeqeq
and require-jsdoc, no-negated-condition
8 years ago
Peter Jaszkowiak 144fa8698c Eslint no-lonely-if 8 years ago
Peter Jaszkowiak 57f89663aa ESlint radix 8 years ago
Peter Jaszkowiak 09e868ce5f ESlint no-useless-escape, no-else-return 8 years ago
Peter Jaszkowiak 11cb3a9554 ESlint operator-assignment, block-scoped-var 8 years ago
Peter Jaszkowiak a0a50677da ESlint n-loop-func, yoda 8 years ago
Peter Jaszkowiak 04bb6513b0 ESlint no-cond-assign, no-void, valid-jsdoc 8 years ago
Peter Jaszkowiak 32dc7c23ea ESlint guard-for-in, no-nested-ternary
and operator-linebreak
8 years ago
Peter Jaszkowiak c4bdb72941 ESlint no-unneeded-ternary
and no-extend-native, no-sequences
8 years ago
Peter Jaszkowiak 64a6322002 ESlint no-extra-boolean-cast
and no-shadow-restricted-names
8 years ago
Peter Jaszkowiak daa169c094 ESlint no-unused-expressions 8 years ago
Peter Jaszkowiak ac2f69f7af ESlint no-return-assign
and no-restricted-modules
8 years ago
Peter Jaszkowiak 896c8c7343 ESlint object-curly-spacing 8 years ago
Peter Jaszkowiak 1493afee2a ESlint indent 8 years ago
Peter Jaszkowiak 3b0dd2d1ef ESlint padded-blocks 8 years ago
Peter Jaszkowiak feb8405f95 ESlint eol-last 8 years ago
Peter Jaszkowiak 41896e1fc7 ESlint lines-around-directive 8 years ago
Peter Jaszkowiak f3a8256f35 ESlint strict 8 years ago
Peter Jaszkowiak a038c66549 ESlint quotes 8 years ago
Peter Jaszkowiak 604358ecc4 ESlint keyword-spacing, no-multi-spaces 8 years ago
Peter Jaszkowiak a5a3f3089a ESlint no-mixed-operators 8 years ago
Peter Jaszkowiak 2e031f3759 ESlint comma-spacing 8 years ago
Peter Jaszkowiak 277a7fb8b4 ESlint key-spacing, no-trailing-spaces 8 years ago
Peter Jaszkowiak 34e233fe1d ESlint spaced-comment 8 years ago
Peter Jaszkowiak 532951c24f ESlint space-in-parens, block-spacing 8 years ago
Peter Jaszkowiak b1b486f729 ESlint quote-props 8 years ago
Peter Jaszkowiak 3361a72725 ESlint no-plusplus
and no-empty, space-unary-ops
8 years ago
Peter Jaszkowiak d1101a7fb4 ESlint dot-notation
and func-call-spacing
8 years ago
Peter Jaszkowiak d7526b5e44 ESlint array-bracket-spacing
and object-property-newline
8 years ago
Peter Jaszkowiak 554075b312 ESlint no-continue 8 years ago
Peter Jaszkowiak d9c1f6f088 ESlint no-extra-semi 8 years ago
Peter Jaszkowiak 3d6bfa47c5 ESlint no-useless-return 8 years ago
Peter Jaszkowiak 879470f417 ESlint brace-style 8 years ago
Peter Jaszkowiak 52f2028206 ESlint no-multiple-empty-lines 8 years ago
Peter Jaszkowiak b09b3aef7f ESlint no-undef, remove global comments 8 years ago
Peter Jaszkowiak 2ba46808a1 ESlint one-var, fix comma-dangle 8 years ago
Peter Jaszkowiak bc1d70c126 ESlint comma-dangle 8 years ago
pichalite 8dab8864f6 Add extensions for cropped images 8 years ago
barisusakli d6cdc6d34d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Peter Jaszkowiak 9f15008247 Address review issues 8 years ago
Julian Lam a379b03e71 lint 8 years ago
Julian Lam f7f5b2c8d9 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Julian Lam 802878c371 Merge pull request #5455 from pichalite/cropper
Make cropper in to a module
8 years ago
barisusakli e009ce5609 closes #5443 8 years ago
barisusakli 4d05e492cc closes #5312 8 years ago
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
8 years ago
pichalite 2ca8f60e77 Finalize cropper module 8 years ago
pichalite d784a8dce8 Restore uploader.js 8 years ago
pichalite 43f4d9819e Linting 8 years ago
pichalite 484891472e Make cropper in to a module 8 years ago
barisusakli dad5b135c3 lint 8 years ago
barisusakli c285eb7fcd closes #5450 8 years ago
Julian Lam 8bf719b258 Merge pull request #5431 from NodeBB/ajaxify-cache-buster
Ajaxify improvements, `/assets/uploads/` fixes, cache buster improvements
8 years ago
Julian Lam fcaefbadca Merge remote-tracking branch 'origin/master' into develop 8 years ago
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:
8 years ago
psychobunny 0667870286 set an active state for pageview options 8 years ago
psychobunny ccfec622d4 Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop 8 years ago
psychobunny 9e354a09d1 prettier stats on dashboard 8 years ago
Julian Lam 7f124a3ccf Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak 8f27d7810b Ajaxify improvement, `/assets/uploads` 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
Julian Lam 6a591069c5 fixes issue with ajaxify.end not firing 8 years ago
Julian Lam 43056a4bfa Merge branch 'master' into develop 8 years ago
Julian Lam 64e4ef042b allowing plugins to subscribe to action:script.load and pass in function references 8 years ago
Peter Jaszkowiak ffa2bd14f8 Fix reverse proxies breaking admin translations 8 years ago
Julian Lam 2c6beb9ffb Merge branch 'master' into develop 8 years ago
Barış Soner Uşaklı aa32e7b359 fix indents 8 years ago
loopback0 a86134cc5b Fix selection
Tweak to allow the shift + click behaviour for the checkboxes while still letting the browser behaviour work
8 years ago
Julian Lam 3861b2dd80 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak cb82824c13 Fix ACP title bug with hashes (#5331) 8 years ago
Anil Mandepudi 8ddf7eb922 Use scrollStop in chat (#5326) 8 years ago
pichalite 5b646495af Confirm before removing user and group cover picture 8 years ago
Julian Lam db20df0110 Merge branch 'master' into develop 8 years ago
Julian Lam a8521d0349 remove double-click to mark all notifications read 8 years ago
barisusakli 190b3759a0 fix tests 8 years ago
barisusakli 827e4b4ffd refactor post tools 8 years ago
pichalite cae5a9ac58 Update ACE editor to latest 8 years ago
Julian Lam 29c7ae7645 Merge remote-tracking branch 'origin/master' into develop 8 years ago
psychobunny f742c847e1 Merge pull request #5304 from pitaj/master
Fix ACP title issues
8 years ago
Peter Jaszkowiak 6d00d5f6a5 Fix ACP title issues 8 years ago
Barış Soner Uşaklı c4d4d2385b closes #3973 closes #5303 8 years ago
Julian Lam c640bdf2b9 Merge branch 'master' into develop 8 years ago
Julian Lam d77f417cf3 allowing timeago timestamps to be in the future 8 years ago
Peter Jaszkowiak 460b830a96 Fix ajaxify loading default language translations 8 years ago
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`
8 years ago
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
8 years ago
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
8 years ago
Peter Jaszkowiak 3008794797 `admin/general` JS translations and misc 8 years ago
Peter Jaszkowiak 95bef8f3f6 `admin/extend` JS translations and misc 8 years ago
Peter Jaszkowiak 38eba81933 ACP menu and title translations 8 years ago
Peter Jaszkowiak bae1daf5dc Bootbox wrapper improvements 8 years ago
Peter Jaszkowiak 606de990e9 `admin/advanced` JS translations 8 years ago
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
8 years ago
Peter Jaszkowiak 4eca23174a Translate dynamically added admin content 8 years ago
barisusakli 1fed01fe43 ability to filter search by tags 8 years ago
Julian Lam 76bcc1c327 Merge branch 'flagging-refactor' into develop 8 years ago
Barış Soner Uşaklı 4ff3d06f90 escape labelColor, icon, cover:position, validate toPid 8 years ago
barisusakli 55b68197aa closes #4544 8 years ago
barisusakli 9d75c48236 closes #4563 closes #4569 closes #4566 8 years ago
Julian Lam e6768ab572 some more fixes to flags, simplifying qs manipulation in flags search
re: #5232
8 years ago
Julian Lam 451c2838d0 Merge remote-tracking branch 'origin/master' into flagging-refactor 8 years ago
barisusakli c32e6aaabb use build module instead of forking 8 years ago
barisusakli e86708cb0c add cid to widgets.render
init date pickers in widgets ACP
8 years ago
Julian Lam b79073cf32 Merge branch 'translator-escapes' of https://github.com/pitaj/NodeBB into pitaj-translator-escapes 8 years ago
Julian Lam e227f5842a Merge remote-tracking branch 'origin/master' into flagging-refactor 8 years ago
Mathias Schreck b1a48981ef Check if href exists before accessing it (#5281)
I got a lot of errors in Firefox 50 `TypeError: $(...).attr(...) is undefined  nodebb.min.js:25167:24` which points exactly to that line I’ve changed.
Since HTML5 `href` is not a required attribute of an `a` tag. We have a couple of links without `href` and every time you click it you will get this error.
8 years ago
Peter Jaszkowiak bb5fe0cc83 Escape arguments in `Translator.compile` 8 years ago
Peter Jaszkowiak a81aad61ab Add tests for translator static methods 8 years ago
Peter Jaszkowiak 7c697759e9 Escape and ignore `%` and `\,` in translator args 8 years ago
Julian Lam aaec71bc0c added stepSize to flags chart, #5232 8 years ago
Julian Lam dc508fa0cb Merge remote-tracking branch 'origin/master' into flagging-refactor 8 years ago
Julian Lam ebc9abd773 upgrade script and graphs for #5232 8 years ago
barisusakli 0b9829850c closes #5273 8 years ago
Julian Lam 5d63c0aa3b Merge remote-tracking branch 'origin/master' into flagging-refactor 8 years ago
Julian Lam 5dd892bd01 a bunch of changes here... allowing user profiles to be flagged, #5232 8 years ago
psychobunny 6b7b51eaf0 Merge pull request #5170 from pitaj/master
ACP search updated to support translations
8 years ago
Peter Jaszkowiak e2ea3cb21e Fix linting error 8 years ago
Julian Lam a2fecf5ae4 Merge remote-tracking branch 'origin/master' into flagging-refactor 8 years ago
Julian Lam 9f9051026b more work on #5232 8 years ago
Stuart Williams 647d0e0a75 Avoid encoding HTML in Twitter social share text 8 years ago
Stuart Williams cafc5cd891 closes #5259 8 years ago
Peter Jaszkowiak 8ca98625b9 Key through search results 8 years ago
Peter Jaszkowiak f1cfed50a1 Translate skins and themes fully 8 years ago
Peter Jaszkowiak 5843e8dd77 Fix Translator to work with namespace paths 8 years ago
Julian Lam cd3002e812 removed user flag reset method and associated socket call from ACP 8 years ago
Julian Lam 88958049eb added some more filters, and appending event to history on flag creation
issue #5232
8 years ago
Julian Lam 8e1d441e20 Added some quick filters, #5232 8 years ago
Julian Lam 753d4b0275 wrapped up basic functionality of list and detail for flags, filter support. #5232 8 years ago
Julian Lam f1d144f15e history appending, finished up notes, #5232 8 years ago
Peter Jaszkowiak 5223bb5191 Merge branch 'master' of github.com:nodebb/nodebb 8 years ago
Julian Lam d9d60c20bd flag updating and note appending, #5232 8 years ago
barisusakli 4cb48c46ab closes #5242 8 years ago
barisusakli 2291899f4f show chat room title in taskbar 8 years ago
Peter Jaszkowiak 240e958fb1 Use config.relative_path instead of allcaps 8 years ago
Peter Jaszkowiak de6ced4e07 Tests for admin search, simplifications 8 years ago
Peter Jaszkowiak e3dd68e19c Explanations and simplifications 8 years ago
Peter Jaszkowiak a431dc0305 ACP search updated to support translations 8 years ago
barisusakli 2e28a8f7c7 closes #5239 8 years ago
barisusakli a4b46fd5ce closes #5236 8 years ago
Peter Jaszkowiak c5237443cd Standard language codes (#5218)
* Use standard language codes. Fallback for plugins.

* Fix transifex config

* Tab vs space here for some reason

* Remove redundancies

* config.relative_path instead of allcaps

* added upgrade script for existing users' accounts
8 years ago
Julian Lam c987b8474e fixing new post parsing to not add img-responsive to avatars 8 years ago
Julian Lam 6f1e5a83ab resolve regression caused by part of d28f7de 8 years ago
Julian Lam d28f7de19e fixes #5228 8 years ago
barisusakli db14c29e41 socket.io/categories tests 8 years ago
barisusakli 0756fcce7e eslint 8 years ago
barisusakli 2c77a88ba4 closes #5220 8 years ago
Julian Lam 0e8bf17ff0 re: #5211, bringing back the RELOAD BUTTON :rage2: 8 years ago
Barış Soner Uşaklı 0c9f61c629 Merge pull request #5217 from yariplus/patch-15
Allow sending Error objects to alertError instead of just plain strings.
8 years ago
Timothy Fike f1e3e155c4 Update app.js 8 years ago
Timothy Fike 2d84c98565 Allow sending Error objects to alertError instead of just plain strings. 8 years ago
pichalite d4040ed52e Fixes #5213 8 years ago
Julian Lam ede7a71db7 Fixes #5186
On socket.io connection, all clients join a room pertaining to
their express session id. We use this room to keep track of any
sessions in different browser windows (but the same cookie jar),
so if a login/logout occurs, we can throw a session mismatch
modal.

This room can also be used to emit messages across windows/tabs...
8 years ago
Julian Lam 0f93206122 lint 8 years ago
Julian Lam 7d523fae0f closes #5200 8 years ago
Julian Lam 885316d78f also show minutes and hours in cut off timestamp 8 years ago
Julian Lam 75ff60e4d5 partial revert of a9984bb, adding in a layer to translate ISO
timestamp to datetime attribute and save localised string into
title attribute.

Fixes #5109
8 years ago
barisusakli a9984bb926 closes #5108 8 years ago
barisusakli 1a9dd2311c closes #5175 8 years ago
Ben Lubar e151916f1a
Fix followed topic notifications going to the last unread post
Regression introduced in 1b34ebe230.

Bug originally reported in #4469.
8 years ago
Julian Lam e6c9c89342 closes #5197 8 years ago
barisusakli 8294fc90e3 closes #5084 8 years ago
barisusakli 5703bf6eac fix test 8 years ago
barisusakli ce9be7e694 closes #5132 8 years ago