4447 Commits (d8170d5d1cb36afb364628f162ab561f99f8f270)

Author SHA1 Message Date
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
Barış Soner Uşaklı b38a10f96a add pagination to user profile 8 years ago
barisusakli 5cfe379841 fix recent for inf scroll 8 years ago
barisusakli fb47bf3889 unread/recent changes closes #4774 8 years ago
barisusakli 90c2ca38f9 more nested reply fixes 8 years ago
barisusakli c90f082c77 fix edit/vote/bookmark icons for nested replies 8 years ago
Ben Lubar 2185d8eb99 Ban UI fixes (#5169)
- Permanent bans assigned by global moderators no longer expire immediately
  (does not apply retroactively)
- Bans with no reason given no longer have "undefined" as their reason
  (applies retroactively)
- 0 is now a selectable value for "ban duration, select 0 for permanent"
8 years ago
barisusakli eca850c4b1 nested reply improvements
on new post increase count and add nested reply if replies are expanded
on post purge reduce count and remove nested reply
8 years ago
Julian Lam 66aea0eed1 closes #5167 8 years ago
barisusakli 8f76ebf972 don't start loading again if already loading 8 years ago
barisusakli 3d1d9b8bd5 fix test, process rendered replies 8 years ago
barisusakli ff08cbf677 replies to posts 8 years ago
Barış Soner Uşaklı 0c08e44a34 Merge pull request #5050 from BenLubar/replies-to-post
Add a sorted set for replies-to-this-post
8 years ago
Ben Lubar d74e2d0650
Don't hardcode fa-plus <https://github.com/NodeBB/NodeBB/pull/5050#issuecomment-256862345> 8 years ago
Julian Lam 2da32512af not displaying banned modal if you're not actually banned, heh 8 years ago
Ben Lubar 81211887fc
make eslint happy 8 years ago
Ben Lubar ea10f51f2e
UI for replies-to-post (needs theme update) 8 years ago
Julian Lam f97f45a138 logic to show a modal to banned users when they try to log in via SSO 8 years ago
Peter Jaszkowiak 2824ce5587 Translator modules (#5135)
* Translator modules

* Fix language not being passed on creation

* fix test failures
8 years ago
Julian Lam 0590a4f2cf closes #5156 8 years ago
Sergii Paryzhskyi e515b791da Fix eslint rules (#5117)
* Fix semi linter rule

* Fix semi-spacing linter rule

* Fix no-undef-init linter rule

* Fix space-before-blocks linter rule
8 years ago
Julian Lam d002c3eb76 fixing session revocation on account info page 8 years ago
barisusakli b16671caa5 dont do IS if there is a search term 8 years ago
Julian Lam 9a0d81ef6b closes #5152 8 years ago
Julian Lam 05700c951c add slash before route in ajaxify debug string 8 years ago
Julian Lam 7caad67ef2 resolve regression introduced by 1d9c2f49d2 8 years ago
Julian Lam 9f226b2305 LINT :rage2: 8 years ago
Julian Lam 42b01060d7 up themes, allow chat modal to be minimised 8 years ago
psychobunny ee4943c485 fix regression: open chat page when in chats route instead of in modal 8 years ago
Julian Lam 1d9c2f49d2 added debug info to console on ajaxify, added throttler so requests only go through once every half second 8 years ago
Julian Lam 83a0fff887 lint :rage2: @Psychobunny 8 years ago
psychobunny ad52d1a1aa latest chats design 8 years ago
Julian Lam dd8759b0e9 fixes #5146 8 years ago
Barış Soner Uşaklı cbd936c547 closes #5140 8 years ago
Julian Lam 091ac95649 allowing + in usernames @barisusakli 8 years ago
Julian Lam 8159c44df2 exposing pid, username, and userslug to flag modal 8 years ago
barisusakli a0cf6046f1 new clientside hook action:profile.update 8 years ago
barisusakli 600082adc7 closes #5116 8 years ago
Peter Jaszkowiak f519a36560 Fix #5112, translator now accepts keys with `/` (#5114) 8 years ago
HeeL 4a3c31b2dc Fix space-before-function-paren linter rule 8 years ago
HeeL 3fa1c1f927 Fix space-infix-ops linter rule 8 years ago
HeeL 9a0d764bbd Fix wrap-iife linter rule 8 years ago
Peter Jaszkowiak 2ce33ba2b0 Fix #5102, translator made more safe (#5106) 8 years ago
barisusakli 9b59bc3247 closes #5103 8 years ago
Barış Soner Uşaklı 99744071eb Merge pull request #5099 from pichalite/edit-password
modify user -> edit password screen
8 years ago
barisusakli 3c52327c0b closes #5098 8 years ago
pichalite cd35c135cc modify user edit password screen to match register page for displaying validations 8 years ago