d4464f6ab1
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
public/src/client/topic/posts.js
9 years ago
6aa0f8eb8a
fix #4452 : default to scroll to my post
9 years ago
0c1376c884
closes #4390
9 years ago
5d77e37a3c
closes #4403
9 years ago
56ef1e9869
closes #4444
9 years ago
25f4400569
Reverting all but en-GB
9 years ago
1423b1443d
Fixing 'Go to last read' popup text
...
Since clicking the popup goes to the last _read_ post, not the last unread
9 years ago
0bf05a17bf
closes #4378
9 years ago
7e6e3b3a40
closes #4383
9 years ago
e2f78a9585
closes #4432
9 years ago
fd932462f6
edit profile language key
9 years ago
e0f3ac8cb7
change to editedISO
9 years ago
fd854b134d
Allow for a little scrolling before dismissing bookmark alert
...
This is just in case someone scrolls a little accidentally; the alert remains so they can still follow it if they want to
9 years ago
f40ec978cb
Merge branch 'master' of https://github.com/NodeBB/NodeBB
9 years ago
489bdcced6
#4423
9 years ago
3e14606226
added roomId to match the other hook
9 years ago
301f12d630
fix conditional
9 years ago
f665a1e353
closes #4394
9 years ago
9cb2f9e05f
removed JS fake link #4407
9 years ago
e9648daf7f
Merge pull request #4421 from pichalite/issue-4386
...
fixes #4386
9 years ago
fe7d4999c9
Merge pull request #4418 from BenLubar/post-tools-stream
...
fix post tools not showing up for other users on new posts
9 years ago
4eb7468dcd
already checked in scrollToPostIfSelf
9 years ago
9c9e49e2f6
properly fix with styling
9 years ago
497592965f
fixes issue-4386
9 years ago
bb88c82ffd
fix post tools not showing up for other users on new posts (src/topics/posts.js has this condition already)
9 years ago
3d0012d730
Loads posts if appropriate, but doesn't scroll to new post according to the scroll to my post setting. Addresses #4412 .
9 years ago
9e44bd3d21
up themes
9 years ago
d5e875538b
Merge pull request #4374 from boomzillawtf/master
...
Setting to show new post after reply
9 years ago
c71ffed69c
closes #4362
9 years ago
eb7c2d5872
Use scrollToMyPost setting with both pagination and infinite scroll
9 years ago
ceb3b6ebe7
Add setting to avoid showing a post after it is submitted to keep the user's place on the page to address issue #4363
9 years ago
54e36f7c54
Update ajaxify logic w/ returnPath support
...
If returnPath is defined, and url is null, then ajaxify will
execute a replaceState instead of an ajaxification.
Used in cases where a separate route is pushed but you'll want to
return to the page you were on previously. (see: #4371 )
9 years ago
c8b179e492
better settings for birthday datepicker
9 years ago
c9cfe5b089
closes #4355
9 years ago
b6e22b7723
closes #4367
9 years ago
184a2c4540
IP blacklist functionality -- re: #4367
...
Squashed commit of the following:
commit 5c42fd732d091fa66cf5b45a2af5e1697cc1efcd
Author: Julian Lam <julian@nodebb.org>
Date: Mon Mar 14 17:29:45 2016 -0400
allowing blacklist.test to be called synchronously
commit 979faf2dba5e6f6e2ae1bd07341e63678438daf1
Author: Julian Lam <julian@nodebb.org>
Date: Mon Mar 14 17:01:14 2016 -0400
added plain ipv6 support and finished middleware logic
commit d4b72fc1aadff34df3ed7dec52ca8d3c3728a078
Author: Julian Lam <julian@designcreateplay.com>
Date: Fri Mar 11 16:05:31 2016 -0500
WIP IP Banning logic middleware
commit f08b2553890c5522b6a1eaf521fe4e94df40574a
Author: Julian Lam <julian@designcreateplay.com>
Date: Fri Mar 11 15:26:27 2016 -0500
tweaks to ACP, rule validator
commit 868abacaa494e6b8a88bd4ea429b1b066a9ecb2e
Author: Julian Lam <julian@designcreateplay.com>
Date: Fri Mar 11 13:50:05 2016 -0500
IP Banning ACP page, styling, save&load functionality
9 years ago
a275aaeaf5
fixes #4361
9 years ago
263b09f11a
fix typo in group cover upload
9 years ago
d876763846
added logic to filter out prerelease versions of NodeBB from the update checker
9 years ago
b73af30a2b
added git ignore file for modules directory
9 years ago
74449dc074
Merge branch 'pichalite-issue-4258'
9 years ago
50b813ae2f
merging pull 4347
9 years ago
944509406a
Create jquery.timeago.de-short.js
9 years ago
e49af50ac8
Merge pull request #4346 from pichalite/issue-4340
...
check for last owner on user kick from group
9 years ago
3981e230c4
category children helper
9 years ago
d67ec1d096
fix indent
9 years ago
05cc3fe4ef
closes #4335
9 years ago
c156d1cb34
closes #4344
9 years ago
e878b32444
closes #4258
9 years ago
c1c5db4b77
check for last owner on user kick from group
9 years ago
e11140b7ef
retry once
9 years ago
bd6d44aeaa
closes #4327
9 years ago
3f912e2c6a
closes #4334
9 years ago
72a05c1d07
disabling graph animation on mobile devices
9 years ago
104d677271
latest translations and fallbacks
9 years ago
3d55eec885
Merge pull request #4317 from samhax/delete-user-invites
...
Delete user invites from APM
9 years ago
37d53db693
Removed unused variable from click events.
9 years ago
dc7a861a49
removed unused vars
9 years ago
7441c181b4
closes #4312
9 years ago
7bf808d0f4
closes #4322
9 years ago
07c1a822db
closes #4318 closes #4309
9 years ago
54d47e1e24
allow data-ajaxify=false for external links to override config.openOutgoingLinksInNewTab
9 years ago
a62e31dc70
Finished the invite removal button changes.
9 years ago
48db16fba7
Finished adding a new delete to also remove the reference from the invites list on the APM.
9 years ago
cf681721d5
responseJSON is undefined on 502
9 years ago
6828d4c239
closes #4306
9 years ago
4d87f0276b
In the process of adding the delete button to the invitation panel. Apparently, the delete method doesn't work with the invitation items, so I might need to add some extra logic.
9 years ago
e03bacf032
fixes timeago
9 years ago
5d01060fbc
closes #4302
9 years ago
650890ad83
Revert "temp disable for #4302"
...
This reverts commit 974fa7b253
9 years ago
b2b104dab3
closes #4306
9 years ago
974fa7b253
temp disable for #4302
9 years ago
a67f3d2a15
closes #4299
9 years ago
45bc387749
Revert "fixes #4289"
...
This reverts commit c2b428cc95
9 years ago
07266eab9e
closes #3793
9 years ago
09e5f053f0
action:post.tools.load
9 years ago
c2b428cc95
fixes #4289
9 years ago
9d0f53fcd6
closed #4098
9 years ago
783f570213
latest translations and fallbacks
9 years ago
4b5ec512b9
refactor/cleanup uploader.js
9 years ago
65dda58e0c
renamed tpl
9 years ago
df9558f1fa
closes #4268
9 years ago
cd99a46918
don't show rooms without messages
9 years ago
571f364922
fix for post menu display on newPost
9 years ago
5f3473142e
fix reply as topic quoting
9 years ago
4c5ebe4985
fixed #4020
9 years ago
99e9508131
fixed #4270
9 years ago
3e46ef8c35
closes #4276
9 years ago
13623a620b
fixed #4277
9 years ago
432c3d777d
Merge branch 'master' into fix-vendors
9 years ago
3f2872979f
added buzz
9 years ago
44aae7daa5
removed hammer, updated semver, added mousetrap
9 years ago
3871f6f191
removed chart.js lib from repo
9 years ago
e1323c0295
Updated js code so vendors can be added to the modules folder, so
...
they can be required properly and we can finally get rid of that
really annoying "mismatched anonymous" error in Require.js.
First module to make the transition: Chart.js
9 years ago
7ffbf35bcf
closes #4273
9 years ago
2b10ef97b2
closes #4262
9 years ago
5f6a1a0acd
complete fixes for #4144
9 years ago
db3446b1ca
updated some of the graph colours
9 years ago
088940d4c7
Squashed commit of the following:
...
commit 49e6c0040cc82c1e2684933a8e167ef14854aff8
Author: Julian Lam <julian@designcreateplay.com>
Date: Thu Feb 25 16:12:15 2016 -0500
added recording and charts for topic and post counts globally and by cid
commit e02ff70757f778aa016fbc42ef10a5da2d07a9d9
Author: Julian Lam <julian@designcreateplay.com>
Date: Thu Feb 25 15:35:49 2016 -0500
added labels to charts
commit e75d83bf3886e5183bcf5fcd848d71c513761e01
Author: Julian Lam <julian@designcreateplay.com>
Date: Thu Feb 25 13:30:47 2016 -0500
added per category graphs to ACP management page
commit e3f543200950925cc9e8bf33cccb592f949a100e
Author: Julian Lam <julian@designcreateplay.com>
Date: Thu Feb 25 12:36:11 2016 -0500
updated analytics to move helper methods to analytics lib and sending per category analytics to ACP page
commit 01891d8f7c408925fcdad18dcaa941e5ebbeb9b2
Author: Julian Lam <julian@designcreateplay.com>
Date: Wed Feb 24 16:48:55 2016 -0500
saving per-category analytics, and updated the writeData method to use async for "clarity"
9 years ago
a320ec3efb
closes #4178
9 years ago
9e832e006a
closes #2920
9 years ago
8bc80abde6
removed notify typing code, not even working
9 years ago
78bb4776df
fix crazy indents
9 years ago
3567f2ad55
closes #4208
9 years ago
2fdb8fc5e1
closes #3709
9 years ago
34f68a029a
closes #4204
9 years ago
9d045e70f5
change xregexp
9 years ago
95d6895f13
Merge pull request #4255 from pichalite/master
...
fix Mac platform case
9 years ago
f512cb543f
closes #4256
9 years ago
eba107cef4
fix Mac platform case
9 years ago
e37cbca977
closes #3320
9 years ago
f51698804a
closes #4177
9 years ago
b74022689f
closes #4174
9 years ago
582b69dbbc
Merge pull request #4253 from pichalite/recent-chats
...
account for search input when calculating recent list height
9 years ago
e069150625
closes #2165
9 years ago
991d85cae2
account for search input when calculating recent list height on expanded chats
9 years ago
637c20f44d
closes #3526
9 years ago
946a082eaa
latest translations and fallbacks
9 years ago
1dba781923
closes #4203
9 years ago
a3530340a9
Merge pull request #4250 from pichalite/issue-4228
...
throw error in chat if no users in room
9 years ago
322d4052b0
chat controls now hidden instead of taking up space in chat modal
9 years ago
a0a98e64b7
closes #4220
9 years ago
3b76b0343b
Revert "fixes NodeBB/nodebb-theme-persona#218"
...
This reverts commit ee529d92d3
9 years ago
6951dc1fe2
closes #4211
9 years ago
4608b8f07b
closes #4183
9 years ago
6ecc05afd4
throw error in chat if no users in room
9 years ago
2cf42f55f5
latest translation
9 years ago
13dfe6cd51
Merge pull request #4243 from pichalite/issue-4241
...
don't mention guest on reply
9 years ago
20103b64ce
Merge pull request #4219 from pichalite/groups
...
add missing translation in groups
9 years ago
fba4e93cfe
remove translator
9 years ago
872b33f0cc
fix typo
9 years ago
60a5a1b422
latest translations
9 years ago
a61fea862b
Merge pull request #4245 from pichalite/issue-4159
...
fixes #4159
9 years ago
f22b218250
fixes #4235
9 years ago
ca3fa023e8
fixes #4159
9 years ago
a22d7290ec
fix logout on user delete
9 years ago
3024d2e661
don't mention guest on reply
9 years ago
f637521105
chat edit fixes
9 years ago
c80bd0c413
Added app.newTopic
...
Make a new topic from anywhere. #4223
9 years ago
9f760f9b55
translate string in groups
9 years ago
6b341a844d
remove notifyTyping
9 years ago
42239e119d
search banned users only on /users/banned route
9 years ago
573840ccbd
changed to title raw
9 years ago
2fc385f723
closes #4141 , closes #4149
9 years ago
759b183967
fixes a bug in instant updates on category view
9 years ago
6a98758a01
closes https://github.com/NodeBB/nodebb-theme-lavender/issues/60
9 years ago
8c3b52ef36
closes #4096
9 years ago
3348d51f69
closes #4185
9 years ago
88e4591f88
closes #4194
9 years ago
82875de32d
remove / from startsWith
9 years ago
boomzillawtf
psychobunny
barisusakli
RaceProUK
pichalite
Ben Lubar
Julian Lam
Julian Lam
Barış Soner Uşaklı
Stephan
samhax
HSam
pichalite
Timothy Fike