de55c8e431
closes #4070
8 years ago
875672522e
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# src/search.js
8 years ago
a9dbdc75af
closes #5825
8 years ago
84c1a182e5
Merge remote-tracking branch 'origin/master' into develop
8 years ago
292d27716a
closes #5842
8 years ago
184dacf1d7
Merge branch 'master' into develop
8 years ago
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: 44851f9https://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
43a70270ef
closes #5835
8 years ago
b983be2919
fix colspans in category privilege tab
8 years ago
44851f97ac
added logic for hiding logo if none is set, preventing crash on startup if no logo is set
8 years ago
5cec946871
fixed bug with logo being stretched in emails
8 years ago
c40b11aa6e
updated site upload logic so that site logo is resized for email header, implemented site logo in email header
8 years ago
39e78a8a12
forgot the css :rage2:
8 years ago
bcdfba653a
tweaking hero image
8 years ago
5f24d63005
digest tpl
8 years ago
4c0135e188
fixed missing payload items in invitation email
8 years ago
0b8b3fafbf
banned and invitation
8 years ago
065b3a3a03
notif_chat tpl
8 years ago
a9540a13a1
fixing url in footer
8 years ago
f0f856fe6b
more padding adjustments
8 years ago
f9233d5c9b
more padding fixes
8 years ago
b7d0ea900e
who knew you couldn't put two paragraphs inside a td
8 years ago
733f694cf3
adjusted some margins
8 years ago
f128f988f3
slimmed down some data, testing notif_post again
8 years ago
82dda3e2e6
added email closing back to notif_post
8 years ago
582dd1ed2e
testing new footer with new_post tpl
8 years ago
51349bb71f
more email templates updated
8 years ago
5a9ae8f4c7
rearrange menu items
8 years ago
7c6c1adb04
test email done
8 years ago
0d0e0d7311
removed prerender text and used partials for header and footer
8 years ago
6c768030cc
using variable for urls again, welcome.tpl done I think
8 years ago
10d23f5447
resized logo again
8 years ago
a2627d2066
added default payload to emails, and adding nodebb logo for email header
8 years ago
15d368c6b9
more changes to welcome.tpl
8 years ago
020d3acfe9
WIP welcome email
8 years ago
e036e26238
closes #5813
8 years ago
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
e9360347ea
less padding, closes #5811
8 years ago
e0de922ede
Revert "widgets refactor"
...
This reverts commit 9e94edb5aa
8 years ago
9e94edb5aa
widgets refactor
...
render widgets server side
widgets can use all the data the template can use
8 years ago
f1cbf563fc
closes #5751
8 years ago
da8b1b605c
#5723
8 years ago
d13eb52f39
closes #5722
8 years ago
fa25dcd6a5
move ACP category selector in line with pills
8 years ago
88d5f97280
closes #5717
8 years ago
de5fe25e57
closes #5715
8 years ago
9664033b73
add memory usage to info page
8 years ago
1b98449686
closes #5704
8 years ago
5e4b9479d4
closes #5677
8 years ago
816809ce3c
fixes #5606
8 years ago
064a8aa6d7
Allowing custom date range to be supplied in pageviews graph, closes #5541
8 years ago
aca07a0f20
fix typo
8 years ago
3a1eba2537
merge
8 years ago
480352c650
send the banned user an email with reason + time limit if applies
8 years ago
ea6f981686
closes #5638
8 years ago
e7d076a084
closes #5634
8 years ago
af6cde5534
show how many nodes responded
8 years ago
33e8ecc1f4
closes #5404
8 years ago
b91b41dfa3
show database values in gbs
8 years ago
c7929ec7d8
Add option for disabling language autodetection
8 years ago
7b91da067b
closes #5602
8 years ago
d18cfced96
Merge remote-tracking branch 'origin/master' into develop
8 years ago
484a800327
Merge branch master into develop
8 years ago
010473e5cc
Merge branch 'master' into patch-pitaj
8 years ago
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
4c89497cc4
Closes #5521
8 years ago
5985a8a7a3
closes #5574
8 years ago
e121a5a798
closes #5574
8 years ago
4b3dcd1a02
Merge remote-tracking branch 'origin/master' into develop
8 years ago
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
860999fa6c
Merge remote-tracking branch 'origin/master' into develop
8 years ago
62f445ad7f
ACP: added tagsinput to other fields that are "comma separated"
8 years ago
debe34b96c
better styling for tagsinput in ACP and added it to general -> keywords
8 years ago
447b7b02ca
use tagsinput for #5439 instead
8 years ago
f2eb4b8083
closes #5439
8 years ago
8da8e4d8c3
closes #5469
8 years ago
af2d9fb85b
Merge branch 'master' into develop
8 years ago
2ccf60a6ec
fixed duplicate uninstall button
8 years ago
58cbf44143
Merge branch 'master' into develop
8 years ago
007051c14c
Fix #5476
8 years ago
b1ceec7571
Merge remote-tracking branch 'origin/master' into develop
8 years ago
09a1ed0869
Merge pull request #5371 from kingjan1999/master
...
Update FontAwesome to 4.7.0
8 years ago
72e77772db
Merge branch 'master' into develop
8 years ago
1d5b3cc73f
ACP manage tags page UI changes
8 years ago
a9f144230e
Merge branch 'master' into develop
8 years ago
7b7565ee8e
Merge pull request #5468 from pichalite/acp-groups
...
ACP manage groups UI updates
8 years ago
672d7352bb
Merge branch 'master' into develop
8 years ago
aea40902b0
Fix markup in category privileges template
8 years ago
f09f1f6ed8
Fix ACP templates markup
8 years ago
dcb0f18422
ACP manage groups UI updates
8 years ago
e887dda37a
Merge pull request #5461 from pichalite/image-dimension
...
Use ACP profile image dimension setting in cropper
8 years ago
a99572fc48
Use ACP profile image dimension setting in cropper
8 years ago
9f15008247
Address review issues
8 years ago
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
fcaefbadca
Merge remote-tracking branch 'origin/master' into develop
8 years ago
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
0667870286
set an active state for pageview options
8 years ago
3d1425605a
prettification of pageview stats
8 years ago
5e35170805
ghfw :rage1:
8 years ago
9e354a09d1
prettier stats on dashboard
8 years ago
387110fecc
closes #5315
8 years ago
8a0a74d95e
Merge remote-tracking branch 'origin/master' into develop
8 years ago
b5daedb7a3
Merge remote-tracking branch 'origin/master' into develop
8 years ago
bb1bfb0449
Merge branch 'master' into assets-route
8 years ago
df1a1811f2
add horizontal rule on top of image crop tools
8 years ago
2c5f8ed8e6
Add image options to cropper modal
8 years ago
dbc3113940
Merge pull request #5412 from pichalite/cropperjs
...
Ability to crop profile images before uploading
8 years ago
b757f563df
Move tpl and less to core
8 years ago
6a073277ac
Fix ACP layout on tablets
8 years ago
360a35d0a6
Resolve merge conflicts
8 years ago
374bc04cdb
fixed missing translation string
8 years ago
48909e753c
Merge branch 'master' into develop
8 years ago
3507e4ce0e
Adding closing <p>
8 years ago
a06e39528f
Code review change
8 years ago
cbe8807ebd
update fontawesome.tpl
8 years ago
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
ed19454eca
Adding more specific timing for session timings
8 years ago
05fdd35818
removed menu item for flags management in ACP
8 years ago
db20df0110
Merge branch 'master' into develop
8 years ago
476ec6e4ee
closes #5307
8 years ago
66d8c29d25
use different path for installer files
8 years ago
29c7ae7645
Merge remote-tracking branch 'origin/master' into develop
8 years ago
29cf6f528c
no need to check for logged in status in ACP
8 years ago
c640bdf2b9
Merge branch 'master' into develop
8 years ago
926186108b
ACP Translations
8 years ago
daf3ab4db4
WIP
8 years ago
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
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
3008794797
`admin/general` JS translations and misc
8 years ago
95bef8f3f6
`admin/extend` JS translations and misc
8 years ago
38eba81933
ACP menu and title translations
8 years ago
20db4657b2
`admin/general` translations
8 years ago
3cd6a8a94b
`admin/extend` translations
8 years ago
50aed01c57
`admin/development` translations
8 years ago
6c1b852d48
`admin/appearance` translations
8 years ago
8931702136
`admin/advanced` translations
8 years ago
76bcc1c327
Merge branch 'flagging-refactor' into develop
8 years ago
55b68197aa
closes #4544
8 years ago
9d75c48236
closes #4563 closes #4569 closes #4566
8 years ago
dc508fa0cb
Merge remote-tracking branch 'origin/master' into flagging-refactor
8 years ago
ebc9abd773
upgrade script and graphs for #5232
8 years ago
0b9829850c
closes #5273
8 years ago
5d63c0aa3b
Merge remote-tracking branch 'origin/master' into flagging-refactor
8 years ago
6b7b51eaf0
Merge pull request #5170 from pitaj/master
...
ACP search updated to support translations
8 years ago
f1cfed50a1
Translate skins and themes fully
8 years ago
cd3002e812
removed user flag reset method and associated socket call from ACP
8 years ago
bcb3903446
priv table headers
8 years ago
5223bb5191
Merge branch 'master' of github.com:nodebb/nodebb
8 years ago
fb42b83e1b
remove hardcoded value @pichalite
8 years ago
d6c2779ed0
remove placeholder #5242
8 years ago
4cb48c46ab
closes #5242
8 years ago
a431dc0305
ACP search updated to support translations
8 years ago
0e8bf17ff0
re: #5211 , bringing back the RELOAD BUTTON :rage2:
8 years ago
a20027d8f5
Add missing relative path to Admin tags and widgets links
8 years ago
7d523fae0f
closes #5200
8 years ago
e6c9c89342
closes #5197
8 years ago
9bcb5710c1
UI fixes for ACP -> Manage -> Registration Queue
8 years ago
0087a672ba
UI fixes for ACP -> Manage -> Users
8 years ago
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
7993f6a4d8
fix duplicate labels in cookies ACP template
8 years ago
66aea0eed1
closes #5167
8 years ago
619ca48403
remove shims for IE8 ( #5157 )
8 years ago
02998669c3
introducing option to disable chat message editing/deletion
8 years ago
d4d3fa3102
add warning about gmail routing
8 years ago
1e486875f4
add top posters and most rep to acp
8 years ago
7ba76fc0b6
showing assignee avatar in flags list
8 years ago
5f16205d15
closes #5109
8 years ago
dd7839b7f5
add admin next to username
8 years ago
9a55498fc1
changes to manage/users
8 years ago
80fe6bde5d
removed 'No Assignee' option, updated flag saving logic
8 years ago
f1e6ccdbfc
remove dupe header
8 years ago
9d0dc35703
closes #5081
8 years ago
e2cbc8bc69
fix timeago on acp users
8 years ago
d7c559a209
moved active users up
9 years ago
2c140c2107
ability to filter flags by category
9 years ago
cecdd205cd
Merge pull request #5035 from phit/mixed-content
...
Fix mixed content warning on 503 status page and installer
9 years ago
72c75bd781
add pagination to flags page
9 years ago
2342d59e6f
fix mixed content warning on 503 status page and installer
9 years ago
b12607b1de
added uid to flag history, fixed loading on IS, worked around tjs bug
9 years ago
4e6b2555d0
moved flag history expansion to its own method, showing usernames in assignee history event
9 years ago
d04a10225c
WIP showing updated flag data, history, updating flag data
9 years ago
8dc57cba58
allowing updating of flag data
9 years ago
7d53b778de
WIP extending flags management interface with new options for state, assignee, notes, etc
9 years ago
447fc26b9a
fix styling issue on reqister queue
9 years ago
a42d8c5be2
simplify keys
9 years ago
fcbdfa5688
remove post cache dump
9 years ago
1364fb94bf
show debug info
9 years ago
fac68d52f6
cache group membership methods
...
groups.isMember
groups.isMembers
groups.isMemberOfGroups
clear cache for user on group.join & group.leave
9 years ago
becacdefb0
new hooks to customize registration queue with custom data
9 years ago
46d2168918
closes #5017
9 years ago
c01a2bfa33
default sounds to off, show correct setting in user settings page
9 years ago
3056adf0e1
change to inactive
9 years ago
162f14b229
closes #4908
9 years ago
194716cd68
re: #5002
9 years ago
6d34bb4657
closes #2166
9 years ago
cbafbab107
closes #4986
9 years ago
56118ec1da
fix 500-embed.tpl
9 years ago
785f4fc5a0
updating to jQuery 3.x on frontend and ACP
9 years ago
25cd772e0e
closes #4766
9 years ago
e5ecb333f9
closes #4978
9 years ago
2428d5e442
Update bootstrap in ACP
...
Also fixed #4872 by moving user creation modal to root level
(outside of .panel)
9 years ago
f7540a7edc
closes #4811
9 years ago
de49de3c56
Show accounts using the same IP address as a registration queue entry ( #4965 )
9 years ago
e4fa0289d6
closes #4961
9 years ago
093b21fc31
fixes #4954
9 years ago
f77d9053ad
closes #4795
9 years ago
bc255110cc
closes #2832
9 years ago
ed756f18f4
Merge branch 'master' of https://github.com/NodeBB/NodeBB
9 years ago
e55043e5ab
closes #4867
9 years ago
bc961e2157
removing reload, closes #4936 , closes #4929
9 years ago
037b901e85
closes #4919
9 years ago
e1c0a8f3b3
Merge pull request #4909 from BenLubar/self-topic-deletion
...
add edit/delete post, delete topic privileges per-category
9 years ago
f62da5c4e9
see NodeBB/NodeBB#4909
9 years ago
9b8bbde0d3
tweak ACP email settings form syntax
9 years ago
26df552d55
Add edit, delete, and topics:delete permissions for users acting on their own posts
9 years ago
f060c7a378
not using relative reference for tjs value
9 years ago
7902987900
added jqueryUI to list of prefetched resources, and updated its loader to not use $.getScript(). Updated require.js files to use ?v= in the url argument for cache buster
9 years ago
077f90581b
updated plugin tab labels, and added out of date plugin count
9 years ago
2cc804084f
closes #4890
9 years ago
fc387111e2
make keeping avatar versions an option in the ACP that is turned off by default
9 years ago
e7386e20cf
closes #4505
9 years ago
40b57d6cbe
add "Admin Approval for IPs", which works like Normal for new users and Admin Approval for sockpuppet accounts ( #4882 )
9 years ago
3744f1ecd2
updated fontawesome.tpl
9 years ago
45ff71fd06
closes #2475
9 years ago
8fd5236641
closes #4844
9 years ago
d2cbd7e6dc
new priv for uploads
9 years ago
1a48f47e2b
Merge pull request #4690 from pichalite/fix-mobile-menu
...
fixes #4660
9 years ago
a2b0576b79
showing temporary ban indicator in Users ACP, #4807
9 years ago
61fe9594d7
ban integration frontend for ACP, #4807
9 years ago
789a3736af
closes #4820
9 years ago
14b067a838
closes #4800
9 years ago
1102a685d9
closes #4749
9 years ago
3e23426c31
better messaging on flags page
9 years ago
bbc570c499
socket disconnected icon for ACP #4609
9 years ago
c44fa866e7
nprogress bar in ACP #4609
9 years ago
b3d6a8ef9a
mobile fixes for registration queue page
9 years ago
b30151725d
fixed error shown when saving sounds ACP page
9 years ago
b37b083a4d
new privilege: Access Topic
...
differentiation between Access Category and Access Topic, ie. allows you
to see the category view but not actually enter the topic itself
9 years ago
bdfad2beda
fixes #4660
9 years ago
efbc5f729d
update fontawesome.tpl to FA 4.6.2 ( #4607 )
...
remove newline
sort icons
9 years ago
920bc213d3
updated acp advanced/errors table to span the entire page
9 years ago
ba412f4a56
fully completed #4658
9 years ago
149565169b
closes #4658
9 years ago
54ccdf5262
closes #4651
9 years ago
86cab0787a
closes #4668
9 years ago
b3fa5583f8
closes #4650
9 years ago
fb9c97e2c8
:shipit: @pichalite
9 years ago
a507768a8f
fix ACP->General->Sounds layout on mobile ( #4606 )
...
* fix ACP->General->Sounds layout on mobile
* just to make @juluanlam happy
9 years ago
c758f59014
closes #2302
9 years ago
77cf860c7a
closes #4588
9 years ago
Baris Usakli
Julian Lam
Barış Soner Uşaklı
psychobunny
Peter Jaszkowiak
pichalite
Ben Lubar
Anil Mandepudi
Stephan
Dominic Lennon
kingjan1999
Stuart Williams
phit
Julian Lam
Ben Lubar