1337 Commits (6c3ebf3b1c6dd24ba91d08893fc4311d0488213a)

Author SHA1 Message Date
Barış Soner Uşaklı 157b921e14 fix: #7634, make strip exif configurable 6 years ago
Barış Soner Uşaklı f55cc66723 fix: {username} not working in notification.tpl
fix images going out of notification email
6 years ago
Julian Lam f552cea523
fix: #7600, removing nbsp from email CTAs (#7606)
* fix: #7600, removing nbsp from email CTAs

* fix: added right arrow to CTA button
6 years ago
Julian Lam b32da57faf
fix: #7604 shortened CTA text and added custom text for some notifs (#7605)
* fix: #7604 shortened CTA text and added custom text for some notifs

Specifically, new-reply and new-chat have different CTA text as they
do not go to the forum home like other email templates send users to.

* fix: minor optimization as suggested by @barisusakli
6 years ago
Barış Soner Uşaklı dfab231afd
Copy group privs (#7610)
* feat: ability to copy a groups privileges

ability to copy a group's privileges to all categories, or children of current category

* feat: switch to dropdown

added copy from category to groups

* fix: indents
6 years ago
Baris Usakli cf5aeace6b feat: closes #7583 6 years ago
Barış Soner Uşaklı 96cb29aab0 fix: #7461 6 years ago
Baris Usakli 07e9b67e8d fix: #7565 6 years ago
Baris Usakli 8778f00b69 fix: #7540 6 years ago
Julian Lam c38db4f765 feat: #7515
This reverts commit 81f8cfe3da.
6 years ago
Barış Soner Uşaklı 81f8cfe3da Revert "feat: #7515"
This reverts commit ac889db16b.
6 years ago
Barış Soner Uşaklı ac889db16b feat: #7515 6 years ago
Julian Lam 3871a02ccc fix: resolve CORS error on uploading via URL
On uploading a new profile picture via URL, a CORS error presents
itself during the .toDataUrl() call due to misconfigured CORS
handling in the library. The change here allows cropper.js to
check crossorigin attribute in image and handle appropriately.

Also, the error handling is improved so the error is caught on
Firefox, as it sends a different error message than on Chrome.
6 years ago
Barış Soner Uşaklı dbc4d8403d fix: #7461 6 years ago
Barış Soner Uşaklı 8cc1864aa7 fix: #7491 6 years ago
Barış Soner Uşaklı 2ee2cd528f feat: #7501 6 years ago
Julian Lam 63e16ec0a2 fix: #6911, email throttling options set 6 years ago
Andrew Rodrigues cead89f0ba fix: #7342 6 years ago
Andrew Rodrigues 24dcae2193 feat: manual password expiry. closes #7471 6 years ago
Andrew Rodrigues 962b7f73d3 fix: #7472 6 years ago
Baris Usakli 7211dde7b9 feat: #7358 6 years ago
Barış Soner Uşaklı 2b6f1a05bf feat: admin/groups style change 6 years ago
Barış Soner Uşaklı db47753877 feat: add process cpu usage to admin 6 years ago
Julian Lam 6c1f9c3c46 fix: restored email logo to all outgoing emails 6 years ago
Julian Lam 43c4eb2350 fix: normalized font sizes for paragraphs in digest 6 years ago
Julian Lam d3a10628e7 fix: broken 50% border radius on emails, failing tests 6 years ago
Julian Lam f32a992237
feat: revamp email templates to be more style agnostic (#7375)
* feat: re-designed digest

Updated design, logic no longer shows "no topics", just doesn't
show the list at all, teaser re-retrieved for digest so that it
always grabs a teaser even if there is no reply, changed default
email background to a light grey.

* fix: minor padding issues in digest

* fix: banned template

* fix: invitation.tpl

* fix: removed unused notif_chat and notif_post email templates

* fix: notification template

* fix: registration_accepted template

* fix: reset tpl

* fix: test tpl

* fix: email verify tpl

* fix: reset notify tpl

* fix: welcome tpl

* fix: additional minor font fixes

* fix: removed unused email header image assets

* fix: internationalised 'your daily digest' string

* fix: broken url in digest 🤦

* feat: added RTL support for emailer

/cc @PostMidnight
6 years ago
Julian Lam 57069a5c48 fix: #7385 better handling for errors in Adv>Databases 6 years ago
Barış Soner Uşaklı c2e7ae7f41 fix: #7373 6 years ago
Barış Soner Uşaklı 70d9c6c4ce fix: #7232 6 years ago
Barış Soner Uşaklı c72da5595a fix: #6806
3 new global privileges
view:users
view:tags
view:groups
6 years ago
Barış Soner Uşaklı 9d1fcf4e36 fix: closes #7217 6 years ago
Andrew Rodrigues 5031bfe8c0 feat: allow themes to define custom classes for categories via filter:admin.category.get
`datalist` isn't supported in all browsers but this will fallback to the original behavior. The first item in the list is the placeholder.
6 years ago
Aziz Khoury 6cd8248cae added empty array for customActions and another indentation fix attempt, related to #7284 6 years ago
Aziz Khoury 14addef67b indentation fix #7284 6 years ago
Aziz Khoury d94f6248ca related to https://github.com/NodeBB/NodeBB/issues/7212 6 years ago
Aziz Khoury eb21ca1190 added customAction in the registration queue users list, related to #7212 6 years ago
Julian Lam df6f75eb05 fix: #7298 privilege header misalignment 6 years ago
Barış Soner Uşaklı cf918078e5 fix: #7211 6 years ago
Barış Soner Uşaklı 28459d04c6 fix: #7187 6 years ago
Barış Soner Uşaklı 7e828404f6 fix: #7116
dont save relative_path in db for group covers
6 years ago
Baris Usakli 0c1ac4d6a2 feat: #7032 6 years ago
Barış Soner Uşaklı eb7ae54f81
Category watch state (#7109)
* feat: wip, category watch change

* feat: pass data to client

* feat: allow changing state

* fix: account page categories

* fix: show in unread if topic is followed or category is watched

* feat: add default watch state to acp

* feat: save user category watch state

* feat: update unread recent pages

* fix: remove dupe code

* fix: flip conditions

* fix: handle empty arrays

* fix: ignore/watch on others profile

* feat: upgrade script for category states

if there are any users ignoring categories set their state in new zset and delete cid:<cid>:ignorers

* fix: upgrade

* fix: tests

* fix: redis count

* fix: more tests
6 years ago
Barış Soner Uşaklı f581c052ee feat: #7023
- add category selector to privileges and category create modals
- allow category selector to work for multiple selectors on same page
6 years ago
Barış Soner Uşaklı 6330d51446 less derpy output 6 years ago
Barış Soner Uşaklı ed1bf9a16f add more info to advanced db page 6 years ago
Barış Soner Uşaklı 00a066985a cache categories:cid and cid:<cid>:children
these rarely change, no need to go to db for them
6 years ago
Barış Soner Uşaklı b331ca26a1 add search to acp 6 years ago
Barış Soner Uşaklı 33986f38e3 closes #6954 6 years ago
Peter Jaszkowiak 57b39d5ba2 fix(acp): small UI fixes for ACP privileges category selector (#6946)
- Add dropdown chevron
- Change translations
- Safety against `category` not an object
6 years ago
Julian Lam b3f96d28aa fix(acp): hard-to-discover dropdown selector in ACP
Made the dropdown an MDL button fab with better positioning via
a p.lead so that it is more easily discoverable and obvious that
it is a button that can be pressed.

Fixes #6899
6 years ago
Barış Soner Uşaklı b6771836cf closes #6937 6 years ago
Barış Soner Uşaklı 973b5fcfe0 closes #6932 6 years ago
Barış Soner Uşaklı 4e297921c4 dont show object cache if it doesnt exist 6 years ago
Julian Lam 5ccdc1c017 internationalising english labels in session time ACP block, #6883 6 years ago
Julian Lam 58b088c054 update html on session time ACP block, #6883 6 years ago
Barış Soner Uşaklı 2e579ee0f9 closes #6883 6 years ago
Julian Lam 4919e9efa3 feat: allow disabling of GDPR features via ACP toggle, closes #6847 6 years ago
Barış Soner Uşaklı 9c03881d5a add threshold for image resizing 6 years ago
Barış Soner Uşaklı 69253d9a7f use chart.js legend 7 years ago
Barış Soner Uşaklı ab7657d445 closes #6854 7 years ago
Barış Soner Uşaklı 9dd65cf772 closes #6822 7 years ago
Barış Soner Uşaklı 6c15aee888 add cache hits/misses to posts cache 7 years ago
Barış Soner Uşaklı b57db7fd8e
update groups join to take array of group names (#6834)
* allow groups.join to take an array of group names

* pass an array to groups.join/leave in privileges

* split up groups/membership

* add hits/miss to group cache

* fix typo
7 years ago
Barış Soner Uşaklı 49ba5af5fa
closes #6810 (#6813) 7 years ago
Barış Soner Uşaklı 77beaf2e15
Allow local login,closes #6800 (#6803)
* WIP

* reset groups cache after every suite
7 years ago
Baris Usakli edefab1d69 closes #6728
add option to disable a category on creation
show disabled categories on manage privileges
7 years ago
Barış Soner Uşaklı b7ead6dc9c
Replace jimp with sharp (#6774)
* add probe image size and max image size

* replace jimp and image-probe with sharp

* better name for test

* resize with just path

* resize thumb inplace

* use filename
7 years ago
Andrew Rodrigues 12940b577b closes #6703 7 years ago
Ben Lubar 33228bb7fe PostgreSQL database driver (#5861)
* [test/database/list] Fix test list 4 being used in two different tests

* [database/postgres] PostgreSQL database driver

* [database/postgres] Make transactions work based on continuation scope.

* [database/postgres] Implement nested transactions

* eslint --fix

* Add database changes from earlier this week to the PostgreSQL driver.

* Fix typo

* Fix postgres.incrObjectFieldBy returning undefined instead of null when given NaN

* [database/postgres] Fix sortedSetsCard returning an array of strings.

* Update socket.io postgres adapter

* Fix PostgreSQL erroring when multiple updates are made to the same sorted set entry in a single operation.

Add a test case to catch this error.

* Fix lint errors.

* Only prune sessions on one instance in a cluster to avoid deadlocks.

They're caught and handled by the database server, but they spam the logs.

* Fix arguments.slice.
7 years ago
Jimb Esser 3cccbbc1f2 Add option to enable/disable HSTS
Also fix HSTS middleware being added twice.
7 years ago
Barış Soner Uşaklı 1c286e4536 not even used 7 years ago
Julian Lam ea2bd33bfa fixes #6608, restored template values in widget containers 7 years ago
Barış Soner Uşaklı 85a55d1740 closes 7 years ago
Barış Soner Uşaklı cfb9784527 closes #6641 7 years ago
Julian Lam cb8e62cd7c fixes #6626 7 years ago
Julian Lam 5cf662e565 closes #6613 7 years ago
Barış Soner Uşaklı 57b7c7ede4 closes #6607 7 years ago
Peter Jaszkowiak 70ff2d9b88 Support scoped theme packages 7 years ago
Julian Lam cb3b2bd27b closes #6562 7 years ago
Julian Lam 99dc3feeb2 Edit history is now a category-level privilege
Closes #6425
7 years ago
Barış Soner Uşaklı 14f6e74bad closes #6556 7 years ago
Barış Soner Uşaklı 11bb2f1560 closes #6528 7 years ago
Barış Soner Uşaklı 6eea11a4fd closes #6529 7 years ago
Barış Soner Uşaklı a7267df404 closes #6464 7 years ago
Barış Soner Uşaklı fc56347c22 closes #6520 7 years ago
Barış Soner Uşaklı e50302505b dont show form if installing 7 years ago
Barış Soner Uşaklı 4e495adcd7 add installing notice and refresh 7 years ago
Barış Soner Uşaklı a48c0a4c3d if installing show working icon on refresh 7 years ago
Barış Soner Uşaklı c2f088cb61 dont install multiple times 7 years ago
Julian Lam 943d33ed09 closes #6502, also fixed issue with type: 'literal' in config.json 7 years ago
Julian Lam 9b592c2ed1 prettify last restart date in acp just a bit 7 years ago
Barış Soner Uşaklı 1f8b000530 log and show last restart on ACP dashboard 7 years ago
Julian Lam 7089e5c6a6 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam 9eac794e8e normalising behaviour for subfolder installs, #6410 7 years ago
Julian Lam 388765bdf9 added post usage column to uploads ACP page
re: #6455
7 years ago
Julian Lam 364ded4f8e Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam 5420c4bb68 fix relative_path issue with uploads ACP page 7 years ago
Barış Soner Uşaklı 501d02220c closes #6456 7 years ago
Barış Soner Uşaklı 3fb28e9246 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Barış Soner Uşaklı 4cd0020584 closes #6449 7 years ago
Julian Lam 7ba2ac9f69 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam 8e822c7772 Added user consent pages (#6430)
- "Your Rights & Consent" user settings page
7 years ago
Andrew Rodrigues 67c8d4b560 maximize graph w/ fullscreen API 7 years ago
Julian Lam 13a3f44ed3 closes #6432 7 years ago
Barış Soner Uşaklı 47606c8df5 merge 7 years ago
Julian Lam c1aa46c663 added new option to disable post diffs /cc @BenLubar 7 years ago
Barış Soner Uşaklı 2faaf5b35f closes https://github.com/julianlam/nodebb-plugin-mentions/issues/99 7 years ago
Timothy Fike 585d613d4b fix reload actions (#6394)
* fix reload actions

* wait until restart action is complete instead of using timeouts.

* Change Reload nominclature to Rebuild and Restart.
7 years ago
Peter Jaszkowiak dcf1865b54 Fix ACP alerts to use same system as client (#6396)
* Fix PostCSS warning message

* Fix disconnect indicator styling

Would increase size of quick actions when active

* Use same alert system in ACP and client

- Remove snackbar
- Add styling and fix template for ACP (based on Persona)
7 years ago
Barış Soner Uşaklı ae0f1847ae allow multiple origins for access-control-allow-origin header
add access-control-allow-credentials header to acp
7 years ago
Peter Jaszkowiak eaae5b52cd ACP quick actions (#6374)
* ACP quick actions

- Moved restart, build & restart, and logout into separate buttons
- Moved buttons on mobile into the side menu
- Added version and upgrade alert to header / mobile menu
- Moved version checking to server-side with a cache for rate limiting
- Changed "reload" translations to "rebuild and restart"

* Change info alert to black-on-white to match focused search bar

* Fix tests

* Fallback for failed fetch of latest version
7 years ago
Barış Soner Uşaklı dcb6af5768 closes #6373 7 years ago
Baris Usakli 8492a1586f closes #6360 7 years ago
Andrew Rodrigues 5602092de9 closes #6347 7 years ago
Julian Lam c93f943bef Merge branch 'develop' 7 years ago
Barış Soner Uşaklı b79cd93a49 add some ids to acp elements 7 years ago
Julian Lam c25d752573 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı c7b73b4e41 closes #6337 7 years ago
Julian Lam 1ce448f2a1 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı a224c557c0 closes #6326 7 years ago
Barış Soner Uşaklı 723f31a362 closes #6323 7 years ago
Barış Soner Uşaklı 651b1cc9f8 closes #6321 7 years ago
Barış Soner Uşaklı 7a2d6fe22d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Barış Soner Uşaklı 42b447ce6a closes #6297 7 years ago
psychobunny 29be18ae5b closes #6268 7 years ago
psychobunny d9ccd9c319 closes #6173 7 years ago
psychobunny d8deb322ff closes #6295 7 years ago
Barış Soner Uşaklı 08fa0683eb check is file 7 years ago
Barış Soner Uşaklı c7506d77b0 closes #6247 7 years ago
Julian Lam ac2e185e34 Fixes #6261
If a connection to the parent process is not detected, disable
the restart and reload buttons (as they won't work anyway).
7 years ago
Barış Soner Uşaklı f3fda152bf closes #6216 7 years ago
Barış Soner Uşaklı 72140e5338 closes #5991, closes #5884 7 years ago
Barış Soner Uşaklı 735534c719 #6225 7 years ago
Baris Usakli ecf6c0f3ec closes #4652 7 years ago
Barış Soner Uşaklı 8446a733e5 closes #5569 7 years ago
Barış Soner Uşaklı ff6c6a54c1 make upload permissions global
give upload image permission to registered users on install
add global privileges to app.user.privileges for client side use
7 years ago
Baris Usakli 242dc41aca move privileges to same page 7 years ago
Baris Usakli 4a73621dca chat privilege 7 years ago
Barış Soner Uşaklı 926b763f74 show hit ratio instead 7 years ago
Barış Soner Uşaklı e453057acc add settings-menu id 7 years ago
Barış Soner Uşaklı 99eb1d1785 closes #6163 7 years ago
Barış Soner Uşaklı b84e132601 remove unused settings 7 years ago
Barış Soner Uşaklı 19ae8dc7e7 closes #6154 7 years ago
Baris Usakli f177b01022 closes #6147 7 years ago
Barış Soner Uşaklı e3fd402070 escape email in registration queue and invites 7 years ago
Julian Lam f08627be17 minor whitespace fix 7 years ago
Julian Lam 8affaac8f0 tweaking source copy and removing a bit more commented out html. Moving some items around 7 years ago
Linda Badurina 5924713a3b ACP > Posts
- Removed all commented out tpls but one because js file for it is in the works
- Removed unfinished js file
- Removed unfinished checkbox html
7 years ago
Linda Badurina 5ee098ab2b Failed JS Attempt
(For Andrew to see)
7 years ago
Linda Badurina 8b354a26e0 "Post" Settings Fixes 7 years ago
Linda Badurina c72864888d ACP "Posts" Changes
- Seperate section for "Post Length" settings
- New section for settings that only apply to new users
- Changed order of some settings under "posting restrctions" and "new user restrictions"
- Uncapitalized words that shouldn't have been capitalized
7 years ago
Julian Lam 17c52a515d fix incorrect padding/margin values in images in digest 7 years ago
Julian Lam e37c8003b9 replaced 40px padding with more sensible sizes, fixes #6138 7 years ago
Julian Lam b1cd68928b updated digest header 7 years ago
Peter Jaszkowiak 9b11413d14 Bundle admin scripts, remove CDN scripts (#6122)
Close #6120
7 years ago
Peter Jaszkowiak c731661a39 Remove external sources from installer page (#6101)
* Remove external sources from installer page

* Remove bootstrap.min.css

* Make spinner display consistently cross-platform

* Change spinner to look better
7 years ago
Baris Usakli 2065f895d5 closes #6037 7 years ago
Baris Usakli ea3fde332b notification email fixes
add new notification image
fix url to user settings, no need for userslug to be passed in
7 years ago
Julian Lam 321998dd4f Merge branch 'develop' 7 years ago
Barış Soner Uşaklı dd176dd5f2
Notification delivery (#6072)
* ability for users to choose how they receive notifications

add type field to more notifications, the type field is used to
determine what to do based on user
setting(none,notification,email,notificationemail)

* change var name to types

* cleanup

* add event types for privileged users

* remove unused language keys

* fix uids check

* changed if statements

* upgrade script to preserver old settings
7 years ago
Baris Usakli 9e5a8856d1 fix wrong sorting option in acp 7 years ago
yariplus 7ac01b4c06 Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/6 Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/11 7 years ago
acardinale 5ed6b5c414 Add User (uid) Welcome Notification (#6045) 7 years ago
Julian Lam 766f94745f updated bootstrap and bootswatch css on installer template, closes #6033 7 years ago
Julian Lam 7e0d0e0eb5 Merge remote-tracking branch 'origin/develop' 7 years ago
Barış Soner Uşaklı 008f757a9b closes #6030 7 years ago
Baris Usakli e3a7649290 closes #6027 7 years ago
Barış Soner Uşaklı 25cd21fba8 closes #6019 7 years ago
Barış Soner Uşaklı 41fbf7117d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Barış Soner Uşaklı a73c2628c4 cache improvements, stats 8 years ago
Peter Jaszkowiak 62ae171432 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Barış Soner Uşaklı e7318a1cea Mongo cache (#6002)
* cache mongodb objects

remove user settings cache since it is cached at the object level

* removed indexOf from isMemberOfSets

* change has to get, change maxAge to 0
8 years ago
Julian Lam 9cbf1597cd Merge remote-tracking branch 'origin/master' into develop 8 years ago
Julian Lam cd6dcff38b Split up customJS into customHTML and customJS for better organisation (#5981)
* WIP

* fixed customJS not actually working in footer

* Moving scripts to footer, #5980

* Added upgrade scripts for #5980
8 years ago
Baris Usakli 500c978a26 closes #5944 8 years ago
Dravere 38900a9964 Smtp emailer issue 5951 (#5954)
* Fixed typo at emailer.js line 66 (serice -> service)

* When custom SMTP user and password is empty no authentication is attempted

* Added options to choose custom smtp connection security

* Made custom smtp connection security strings translatable

* Changed switch to if-else for custom smtp security option

* Fixed emailer.js lint errors

* Move custom setting to top of list
8 years ago
Julian Lam 6852c92ed6 Merge remote-tracking branch 'origin/develop' 8 years ago
Peter Jaszkowiak dc87d7fc0f Use .js instead of .jst
Fix #5934
8 years ago
Julian Lam 38a7030639 Revert "Merge pull request #5923 from NodeBB/patch-5922"
This reverts commit f8ddabc884, reversing
changes made to 4976d13013.
8 years ago
Peter Jaszkowiak f40d37ad48 Fix #5922 8 years ago
Julian Lam a6b993ef6c updating 500-embed to load after page is fully loaded, #5733 8 years ago
psychobunny fdffaf9ed2 re-organized ip blacklist page 8 years ago
Harmdhast 0b520f8d65 Template - Benchpress | Variable call fix
Change the way the var is called to match the new benchpressjs templating system.
Fixes the admin permission panel.
8 years ago
Peter Jaszkowiak 23e7222dfa Update Nodemailer to v4
also filter out .jst files from email template dropdowns
8 years ago
Barış Soner Uşaklı 5cc39e8546 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
#	src/views/admin/manage/ip-blacklist.tpl
8 years ago
Peter Jaszkowiak abffc29128 Use Benchpress (#5901)
* Use Benchpress

* Use Benchpress.compileParse

* Error for template load failure

* Use benchpressjs package

* Compile templates on demand

* Fix user settings page

* Fix admin search to exclude `.jst` files

* Fix 500-embed

So ajaxify can still show an error if the server goes down
8 years ago
psychobunny 864321f727 re-organize newbiePostDelay fields 8 years ago
Julian Lam 53ca6d1199 closes #5889 8 years ago
Barış Soner Uşaklı 0498832317 closes #5888 8 years ago
psychobunny 714a7066ec add some styling to blacklist rules textarea 8 years ago
psychobunny 5699236fd2 added missing relative_path to view sitemap button 8 years ago
psychobunny c0c0a28f21 point to the correct section for user registration settings 8 years ago
Baris Usakli bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Baris Usakli a9b1a0bdc4 fix tpl name 8 years ago
Baris Usakli 0ce3e4b691 post-queue show category, send notification 8 years ago
Baris Usakli 5a968730d5 closes #5880 8 years ago
Baris Usakli 575c9a41cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Barış Soner Uşaklı f161bbf956 Post queue (#5878)
* #5876

* add user to post queue table

* add time of post into queue

add posting restrictions to queue

* fix shouldQueueLogic for guests

* add test for post-queue route
8 years ago
Barış Soner Uşaklı fc0e5421d6 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Barış Soner Uşaklı 7ab152e582 fix missing template var name 8 years ago
Baris Usakli bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
8 years ago
Baris Usakli e0e783ec05 closes #5866 8 years ago
Baris Usakli e836ddf6e2 fix link to topic 8 years ago
Julian Lam 4f9cbabec3 fixes #5853 8 years ago
Baris Usakli de55c8e431 closes #4070 8 years ago
Baris Usakli 875672522e Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	src/search.js
8 years ago
Baris Usakli a9dbdc75af closes #5825 8 years ago
Julian Lam 84c1a182e5 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Barış Soner Uşaklı 292d27716a closes #5842 8 years ago
Julian Lam 184dacf1d7 Merge branch 'master' into develop 8 years ago
Julian Lam c4fbed24f8 Squashed commit of the following:
commit 9c86d9b2904e14927cd7e9679b92aec0951d1063
Merge: ebfa63a 5a7f811
Author: Julian Lam <julian@nodebb.org>
Date:   Thu Jul 20 08:41:39 2017 -0400

    Merge branch 'noscript-login' of https://github.com/An-dz/NodeBB into noscript

commit 5a7f81185e8f9bd7d2d011c3d495988be7e437a3
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Mon Jul 17 23:07:14 2017 -0300

    Rename clashing variable 'next'

commit ebfa63a984073a58c17aa408c363cdb03ef89985
Merge: c1801cd f159d0d
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Jul 17 16:30:40 2017 -0400

    Merge branch 'noscript-logout' of https://github.com/An-dz/NodeBB into noscript

commit c1801cda14e6363491e30b659902e2ae71f7e1f7
Merge: 7a5f9f3 9fd542d
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Jul 17 16:30:31 2017 -0400

    Merge branch 'noscript-register' of https://github.com/An-dz/NodeBB into noscript

commit 7a5f9f35abc834bb72ddddc9ca07d34f2fde8353
Merge: 44851f9 d37b95c
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Jul 17 16:30:10 2017 -0400

    Merge branch 'noscript-compose' of https://github.com/An-dz/NodeBB into noscript

commit f159d0d9ef1b7f600e830a96fdb4b9c87c79bb4a
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Thu Jul 6 12:16:38 2017 -0300

    Prevent form submit

    Required for theme change

commit d37b95cb71d32d4483190609798e244c331db165
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Thu Jul 6 01:49:52 2017 -0300

    Prevent link action with scripts

    Required for the theme change that changes the buttons to `a` tags.

commit 9fd542d8970b7d1a4126f4edc4b44eab7d708fb0
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 19:57:56 2017 -0300

    Fix tests

commit cdad5bf8c2891ad76f7441fd4d8a74b058a14e6d
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 19:09:17 2017 -0300

    Update error handling

commit 4ff11cd136a4fb98483f837e2cebc741380dfe76
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 17:29:08 2017 -0300

    Remove async waterfall

commit df01d44e821a70c984b89e9585a325c3e02c6e37
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 16:59:43 2017 -0300

    Set noscript compose as noscript at start

commit 4bcc380da72239b8315cc849a77a3036e06e4a12
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 16:59:12 2017 -0300

    Remove last useless next

commit b5eac6fea11e209934c0648a7e75ad07a2167123
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sun Jul 2 18:35:08 2017 -0300

    Last function requires no next

commit 20a5cce6e6e32a454c304c448383707ec44c75a8
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sun Jul 2 18:06:58 2017 -0300

    Remove more useless next calls

commit 85ee22a79bcbbb1995106f43d4c74d6ba9206cab
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sun Jul 2 17:46:07 2017 -0300

    Remove useless next calls

commit 7d984c47ad24faac1fe537dee4a5a7d697e8634c
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sun Jul 2 15:45:31 2017 -0300

    Support old themes

commit 4a09dfbd08253115c342a9e829c4e6940cecb8cc
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sun Jul 2 15:37:23 2017 -0300

    Moved all error handling into helpers function

commit 391aa6e67ef9ab67304005e14ac0633cdb630713
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Thu Jun 8 15:37:37 2017 -0300

    ESLint - Fix mixed conditionals

commit 80ccc6fd581d791f31e7ab62de8de611837bfc3c
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sat Jun 3 18:08:15 2017 -0300

    Compose without scripts

commit 2aca811256721238ca0cede4954213d369009885
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sat Jun 3 18:00:44 2017 -0300

    Register without scripts

commit 097bb51577fb26f8e22f86dc274cb670ab606a8a
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sat Jun 3 16:42:15 2017 -0300

    Logout without scripts

commit d497e08109891079656fee1c145043a9c0e55f2e
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sat Jun 3 16:27:10 2017 -0300

    Login without script
8 years ago
Baris Usakli 43a70270ef closes #5835 8 years ago
Barış Soner Uşaklı b983be2919 fix colspans in category privilege tab 8 years ago
Julian Lam 44851f97ac added logic for hiding logo if none is set, preventing crash on startup if no logo is set 8 years ago
Julian Lam 5cec946871 fixed bug with logo being stretched in emails 8 years ago
Julian Lam c40b11aa6e updated site upload logic so that site logo is resized for email header, implemented site logo in email header 8 years ago
Julian Lam 39e78a8a12 forgot the css :rage2: 8 years ago
Julian Lam bcdfba653a tweaking hero image 8 years ago
Julian Lam 5f24d63005 digest tpl 8 years ago
Julian Lam 4c0135e188 fixed missing payload items in invitation email 8 years ago
Julian Lam 0b8b3fafbf banned and invitation 8 years ago
Julian Lam 065b3a3a03 notif_chat tpl 8 years ago
Julian Lam a9540a13a1 fixing url in footer 8 years ago
Julian Lam f0f856fe6b more padding adjustments 8 years ago
Julian Lam f9233d5c9b more padding fixes 8 years ago
Julian Lam b7d0ea900e who knew you couldn't put two paragraphs inside a td 8 years ago
Julian Lam 733f694cf3 adjusted some margins 8 years ago
Julian Lam f128f988f3 slimmed down some data, testing notif_post again 8 years ago
Julian Lam 82dda3e2e6 added email closing back to notif_post 8 years ago
Julian Lam 582dd1ed2e testing new footer with new_post tpl 8 years ago
Julian Lam 51349bb71f more email templates updated 8 years ago
Baris Usakli 5a9ae8f4c7 rearrange menu items 8 years ago
Julian Lam 7c6c1adb04 test email done 8 years ago
Julian Lam 0d0e0d7311 removed prerender text and used partials for header and footer 8 years ago
Julian Lam 6c768030cc using variable for urls again, welcome.tpl done I think 8 years ago
Julian Lam 10d23f5447 resized logo again 8 years ago
Julian Lam a2627d2066 added default payload to emails, and adding nodebb logo for email header 8 years ago
Julian Lam 15d368c6b9 more changes to welcome.tpl 8 years ago
Julian Lam 020d3acfe9 WIP welcome email 8 years ago
Baris Usakli e036e26238 closes #5813 8 years ago
Barış Soner Uşaklı 923bd86662 Widgets refactor (#5817)
* widgets refactor

render widgets server side
widgets can use all the data the template can use

* fix tests
8 years ago
Barış Soner Uşaklı e9360347ea less padding, closes #5811 8 years ago
Baris Usakli e0de922ede Revert "widgets refactor"
This reverts commit 9e94edb5aa.
8 years ago
Baris Usakli 9e94edb5aa widgets refactor
render widgets server side
widgets can use all the data the template can use
8 years ago
Barış Soner Uşaklı f1cbf563fc closes #5751 8 years ago
Baris Usakli da8b1b605c #5723 8 years ago
Baris Usakli d13eb52f39 closes #5722 8 years ago
psychobunny fa25dcd6a5 move ACP category selector in line with pills 8 years ago
psychobunny 88d5f97280 closes #5717 8 years ago
Baris Usakli de5fe25e57 closes #5715 8 years ago
Barış Soner Uşaklı 9664033b73 add memory usage to info page 8 years ago
psychobunny 1b98449686 closes #5704 8 years ago
Barış Soner Uşaklı 5e4b9479d4 closes #5677 8 years ago
Julian Lam 816809ce3c fixes #5606 8 years ago
Julian Lam 064a8aa6d7 Allowing custom date range to be supplied in pageviews graph, closes #5541 8 years ago
Barış Soner Uşaklı aca07a0f20 fix typo 8 years ago
Barış Soner Uşaklı 3a1eba2537 merge 8 years ago
psychobunny 480352c650 send the banned user an email with reason + time limit if applies 8 years ago
Barış Soner Uşaklı ea6f981686 closes #5638 8 years ago
Barış Soner Uşaklı e7d076a084 closes #5634 8 years ago
Barış Soner Uşaklı af6cde5534 show how many nodes responded 8 years ago
barisusakli 33e8ecc1f4 closes #5404 8 years ago
barisusakli b91b41dfa3 show database values in gbs 8 years ago
Peter Jaszkowiak c7929ec7d8 Add option for disabling language autodetection 8 years ago
barisusakli 7b91da067b closes #5602 8 years ago
Julian Lam d18cfced96 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak 484a800327 Merge branch master into develop 8 years ago
Peter Jaszkowiak 010473e5cc Merge branch 'master' into patch-pitaj 8 years ago
Peter Jaszkowiak 0ef30e91ba Use ace-builds npm package instead of vendor
ace can be referenced as an r.js module, reduces acp bundle size
8 years ago
pichalite 4c89497cc4 Closes #5521 8 years ago
psychobunny 5985a8a7a3 closes #5574 8 years ago
psychobunny e121a5a798 closes #5574 8 years ago
Julian Lam 4b3dcd1a02 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Ben Lubar 7f713ee822 Admin option to allow all users to view votes (#5534)
* Admin option to allow all users to view votes

* Fix </strong></strong>
8 years ago
Julian Lam 860999fa6c Merge remote-tracking branch 'origin/master' into develop 8 years ago
psychobunny 62f445ad7f ACP: added tagsinput to other fields that are "comma separated" 8 years ago
psychobunny debe34b96c better styling for tagsinput in ACP and added it to general -> keywords 8 years ago
psychobunny 447b7b02ca use tagsinput for #5439 instead 8 years ago
psychobunny f2eb4b8083 closes #5439 8 years ago
psychobunny 8da8e4d8c3 closes #5469 8 years ago
Julian Lam af2d9fb85b Merge branch 'master' into develop 8 years ago
psychobunny 2ccf60a6ec fixed duplicate uninstall button 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
psychobunny 09a1ed0869 Merge pull request #5371 from kingjan1999/master
Update FontAwesome to 4.7.0
8 years ago
Julian Lam 72e77772db Merge branch 'master' into develop 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 aea40902b0 Fix markup in category privileges template 8 years ago
pichalite f09f1f6ed8 Fix ACP templates markup 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
pichalite a99572fc48 Use ACP profile image dimension setting in cropper 8 years ago
Peter Jaszkowiak 9f15008247 Address review issues 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
Julian Lam fcaefbadca Merge remote-tracking branch 'origin/master' into develop 8 years ago