Josh Rickers
|
f9e6fab3ea
|
Fixed line spacing/tabbing
|
11 years ago |
Josh Rickers
|
55b0270b34
|
Merge branch 'master' into admin-group-fix
|
11 years ago |
Josh Rickers
|
a91e464787
|
updated groups to stop you from removing yourself from the admin group
|
11 years ago |
Baris Soner Usakli
|
56c789ed61
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
Baris Soner Usakli
|
aa2978976c
|
notif fix
|
11 years ago |
Julian Lam
|
73d9d6e1d3
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
92706a6550
|
fixed #826
|
11 years ago |
Baris Soner Usakli
|
74ccfd1e4d
|
moved islatin out too
|
11 years ago |
Baris Soner Usakli
|
8f8ea4de92
|
slug fix
|
11 years ago |
Baris Soner Usakli
|
104ec7de6e
|
last poster is visible, slugify check for latin #777
|
11 years ago |
Baris Soner Usakli
|
f107803550
|
fix
|
11 years ago |
Baris Soner Usakli
|
039f02456d
|
if user is in the topic when a new post comes in mark the topic read
|
11 years ago |
Baris Soner Usakli
|
ccc62a202b
|
dont go to top on search icon click
|
11 years ago |
Baris Soner Usakli
|
56fcae1cb2
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
Baris Soner Usakli
|
7c16a8be31
|
recent reply fix
|
11 years ago |
Julian Lam
|
cc236c1f72
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
39d9dd76dc
|
removed preview button from ACP/themes
|
11 years ago |
Baris Soner Usakli
|
55d4a5fe3a
|
template fixes closes #825
|
11 years ago |
Baris Soner Usakli
|
12a5b6b4c6
|
body margin for composer
|
11 years ago |
Aziz Khoury
|
4fad334e18
|
Merge remote-tracking branch 'upstream/master'
|
11 years ago |
Barış Soner Uşaklı
|
94f38d0622
|
Merge pull request #822 from BitBangersCode/admin-fix
Confirmation when removing user from a group
|
11 years ago |
Josh
|
f7a290d0b3
|
removed function
removed function that did not work
|
11 years ago |
Josh
|
a86ff15f7b
|
Removed code for yourid
removed code that will give the current user id in a var called yourid
|
11 years ago |
Baris Soner Usakli
|
030cfbffa4
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
Baris Soner Usakli
|
ed1c276739
|
only drag chat modal from header
|
11 years ago |
Josh
|
f14ad11dd0
|
add remove user from group confirmation
Added confirmation request when removing user from a group.
|
11 years ago |
Julian Lam
|
663aff4b24
|
fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL
|
11 years ago |
Aziz Khoury
|
ba85ffb292
|
Merge remote-tracking branch 'upstream/master'
|
11 years ago |
Julian Lam
|
f9e8178d25
|
fixed timeagago for zh_cn
|
11 years ago |
Aziz Khoury
|
f74f01ca77
|
Changed User.create signature to accept a hash, added a couple of utility functions as well
|
11 years ago |
Julian Lam
|
95355f9036
|
added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary
|
11 years ago |
Julian Lam
|
2cfe59f124
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
e542da1f52
|
added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins
|
11 years ago |
Baris Soner Usakli
|
050ab738e4
|
fixed drop area top
|
11 years ago |
Baris Soner Usakli
|
3d30c0bd87
|
tmp fix for nested if
|
11 years ago |
Baris Soner Usakli
|
32adbc8c77
|
close modal on error
|
11 years ago |
Julian Lam
|
0ccb8a77ba
|
Merge pull request #811 from BitBangersCode/alternate_title_fix
Only alternate title when not focused
|
11 years ago |
Julian Lam
|
e8d6df22cb
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
5861630dec
|
- removed autocomplete in composer core (now entirely in mentions)
- upped jQuery UI to 1.10.4
|
11 years ago |
MrWaffle
|
c1fea52a93
|
Only alternate title when not focused
|
11 years ago |
Baris Soner Usakli
|
1980e945da
|
fixed admin page active sockets
|
11 years ago |
Baris Soner Usakli
|
16a42619b5
|
closes #809
|
11 years ago |
Baris Soner Usakli
|
9879f645f6
|
added check for undefined, null empty string
|
11 years ago |
Baris Soner Usakli
|
bbac361670
|
fixed crash if empty topic was loaded without ajaxify
|
11 years ago |
Baris Soner Usakli
|
8c1c844007
|
closes #806
|
11 years ago |
Baris Soner Usakli
|
72447c9b9c
|
grouped post buttons in dropdowns
|
11 years ago |
Baris Soner Usakli
|
d8e14acbbf
|
closes #799
|
11 years ago |
Baris Soner Usakli
|
959e6e83ea
|
closes #796
|
11 years ago |
Baris Soner Usakli
|
324bec41c4
|
chain
|
11 years ago |
Baris Soner Usakli
|
0db6423c26
|
closes #792, fixes multiple composers
|
11 years ago |
Baris Soner Usakli
|
fd92d7b02a
|
can mark topic unread for all
|
11 years ago |
Baris Soner Usakli
|
25b50323fa
|
markdown text in composer
|
11 years ago |
psychobunny
|
4e5dfbc1c9
|
find .post-row instead of any li
|
11 years ago |
Baris Soner Usakli
|
24ceb0f083
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
Baris Soner Usakli
|
48eb6a3f22
|
composer changeS
|
11 years ago |
Julian Lam
|
123f92ca1e
|
fixed #711
|
11 years ago |
Julian Lam
|
917dfe74e6
|
removing console log and removing a bit of code that would cause infinite loader to take 2.5s extra each round :P
|
11 years ago |
Julian Lam
|
d8c4609ee0
|
fixed #649 - Once you hit the end, infinite loader will stop for good. If infinite loader is active when the browser hits the bottom, updateHeader will not assume 100%.
|
11 years ago |
Julian Lam
|
51abf60b3a
|
Merge branch 'socketAL-fix'
|
11 years ago |
Julian Lam
|
48c22567c2
|
fixed #791
|
11 years ago |
Baris Soner Usakli
|
c0712583f2
|
fixed category sockets
|
11 years ago |
Baris Soner Usakli
|
a802dc4b68
|
admin.js socket fixes
|
11 years ago |
Julian Lam
|
c1c9438220
|
patching translator to ignore non-js files
|
11 years ago |
Julian Lam
|
7e9d344487
|
patching translator to ignore non-js files
|
11 years ago |
Baris Soner Usakli
|
b062af2c4b
|
fixed user pwd reset
|
11 years ago |
Baris Soner Usakli
|
b7f0c90bf7
|
more fixes
|
11 years ago |
Baris Soner Usakli
|
b3816b98a1
|
more post fixes
|
11 years ago |
Baris Soner Usakli
|
9e6f7fa960
|
reset
|
11 years ago |
Baris Soner Usakli
|
31d353ab0e
|
more fixes
|
11 years ago |
Baris Soner Usakli
|
8740cc0fc7
|
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
|
11 years ago |
Baris Soner Usakli
|
ae76bb3928
|
lots of err first fixeS
|
11 years ago |
Julian Lam
|
111776d878
|
notifications socket callbacks
|
11 years ago |
Julian Lam
|
e95da77fe8
|
Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
|
11 years ago |
Julian Lam
|
bc48ba874d
|
fixed module.js callback format
|
11 years ago |
Baris Soner Usakli
|
ced37044ca
|
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
|
11 years ago |
Baris Soner Usakli
|
426d3e871f
|
more fixes
|
11 years ago |
Julian Lam
|
cbb630fd6b
|
fixed categories.js socket callbacks
|
11 years ago |
Baris Soner Usakli
|
ddb9a4a60e
|
fixed user load more
|
11 years ago |
Baris Soner Usakli
|
4366c11ec0
|
users.js fix
|
11 years ago |
Baris Soner Usakli
|
39b631a3a8
|
more fixes
|
11 years ago |
Baris Soner Usakli
|
e061978bd5
|
more fixes
|
11 years ago |
Baris Soner Usakli
|
2515ba9455
|
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
|
11 years ago |
Baris Soner Usakli
|
afe97233aa
|
more fixes
|
11 years ago |
Julian Lam
|
765402a2a0
|
fixed ACP online count
|
11 years ago |
Baris Soner Usakli
|
e5c8caf5ff
|
more fixes
|
11 years ago |
Baris Soner Usakli
|
1ec21c2bfd
|
metatitle
|
11 years ago |
Baris Soner Usakli
|
7470c1bbd9
|
more fixes
|
11 years ago |
Julian Lam
|
3177fdfa74
|
partially fixed acp active users
|
11 years ago |
Baris Soner Usakli
|
8bb24fa034
|
fixed update header
|
11 years ago |
Julian Lam
|
c215e61541
|
fixed up admin.js
|
11 years ago |
Baris Soner Usakli
|
67799eac95
|
removed api: from client side socket calls
|
11 years ago |
Julian Lam
|
4184574164
|
WIP admin.js socket underping
|
11 years ago |
Julian Lam
|
dfd2df99e6
|
removed "mark all as read" language strings and removed button from notifications page -- fixes #785
|
11 years ago |
Baris Soner Usakli
|
2d87ba534c
|
can paste images directly from clipboard
|
11 years ago |
Baris Soner Usakli
|
b303fdcfd7
|
removed inline css
|
11 years ago |
MrWaffle
|
b78dc3eca8
|
Chat now supports markdown
|
11 years ago |
Baris Soner Usakli
|
1bf3d33765
|
prevent clicks on autocomplete to scroll window to the top
|
11 years ago |
Baris Soner Usakli
|
cd4cb240c8
|
upload file icon in composer was visible even when uploads were disabled
|
11 years ago |
Baris Soner Usakli
|
c94da47ae8
|
added profile func, shorter getRecentReplies
|
11 years ago |
Julian Lam
|
facacc65aa
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
442c543d27
|
fixed #776
|
11 years ago |
psychobunny
|
98d42b0ade
|
moving social sharing parsing code from server side to client side & cleaned up templates
|
11 years ago |
psychobunny
|
6f129d9c68
|
allow password fields to be saved in ACP
|
11 years ago |
Julian Lam
|
acc390f6ef
|
added timeago locales, fixed timeago template error in ACP.
|
11 years ago |
Julian Lam
|
0ea09972b4
|
fixed issue where outgoing links warning page would intercept clicks to the search button in the headerbar (thanks @dove)
- linted some files
|
11 years ago |
Baris Soner Usakli
|
243cb5af61
|
fixed mobile search link
|
11 years ago |
Baris Soner Usakli
|
26274bd75a
|
closes #767
|
11 years ago |
Julian Lam
|
619fe74fc0
|
moved groups admin socket calls into admin file instead of standalone groups file
|
11 years ago |
Julian Lam
|
4453d055ea
|
linted socket/admin.js
|
11 years ago |
Julian Lam
|
aa689a7a29
|
fixed active users socket calls in ACP
|
11 years ago |
Julian Lam
|
2078fa25f8
|
added classname to chat dropdown if there are no chats
|
11 years ago |
Julian Lam
|
b86ae3f7f0
|
fixed #756 - sequestering Notifications and Chat DOM functions in their module, and not in footer
|
11 years ago |
bdharrington7
|
bf96903d6e
|
removed submenu for login / register in guest menu options
|
11 years ago |
Baris Soner Usakli
|
5febb3dc23
|
clicking the pagination block no longer sends page to top
|
11 years ago |
Baris Soner Usakli
|
a885444740
|
fixes toggle_mod_tools undefined error
|
11 years ago |
Julian Lam
|
3da96faa12
|
fixed email exists error... weird.
|
11 years ago |
Julian Lam
|
98e4257939
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
eb974ec1d8
|
fixing user register socket calls
|
11 years ago |
Baris Soner Usakli
|
8bc0096b00
|
dont closed composer if callback isn't called
|
11 years ago |
Julian Lam
|
ee963e0c2a
|
moved reconnected socket call to SocketsMeta
|
11 years ago |
Julian Lam
|
6d300e1110
|
updated chat i18n strings to use new modules.json file, added said files to language dirs
|
11 years ago |
Julian Lam
|
3264658269
|
Merge remote-tracking branch 'origin/master' into socketAL
|
11 years ago |
psychobunny
|
97ec312c72
|
console.log
|
11 years ago |
psychobunny
|
05edfdc9c1
|
templates.js - if custom theme is missing a template, render default template
|
11 years ago |
Julian Lam
|
067a7a544b
|
Merge remote-tracking branch 'origin/master' into socketAL
|
11 years ago |
Julian Lam
|
a150691b5e
|
that's the last of it!! :D
|
11 years ago |
Baris Soner Usakli
|
ee1ac1b2c3
|
fixes post move
|
11 years ago |
Julian Lam
|
ea8aa3fff2
|
admin stuff, removed deprecated install templates, blah blah
|
11 years ago |
Julian Lam
|
c5d8a5a6b2
|
thread tools (phew!) -- sessionData is getting larger :P
|
11 years ago |
Julian Lam
|
8dd8412ae3
|
so far so good... user, meta, notifications, categories
|
11 years ago |
Julian Lam
|
5a589c885a
|
Merge remote-tracking branch 'origin/master' into socketAL
|
11 years ago |
Julian Lam
|
dfa9f203e6
|
crashing a lot less now, heh
|
11 years ago |
Baris Soner Usakli
|
92ca739002
|
center on load
|
11 years ago |
Baris Soner Usakli
|
c19d3e8063
|
closes #738
|
11 years ago |
Baris Soner Usakli
|
30624d4ad8
|
tabbified the admin settings page
|
11 years ago |
Baris Soner Usakli
|
9c60182da4
|
closes #749
|
11 years ago |
Julian Lam
|
c2a1cd94d0
|
addressing issue for #728 where existing NodeBBs don't have a defaultLang set
|
11 years ago |
Julian Lam
|
df4c6ca1c8
|
integrating client side translator into new languages tab in ACP
|
11 years ago |
Julian Lam
|
cd6af45afb
|
added icons to all h1s in admin panel
languages tab in ACP
each language now also has a "language.json"
|
11 years ago |
Baris Soner Usakli
|
dff10045da
|
removed my console.logs as usual
|
11 years ago |
Baris Soner Usakli
|
dabd2f29af
|
closes #747
|
11 years ago |
Julian Lam
|
c2c1632c0e
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
2495b5b89b
|
refactored group category permissions, removed getCategoryAccess method call
|
11 years ago |
Baris Soner Usakli
|
176ac54cdf
|
closes #745
|
11 years ago |
Baris Soner Usakli
|
e07c848da7
|
closes #737
|
11 years ago |
Baris Soner Usakli
|
6b8f7dba4f
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
Baris Soner Usakli
|
825e4cca5a
|
closes #744
|
11 years ago |
Julian Lam
|
127261100e
|
fixed #698 - ajaxify.go will now cancel any active API requests when it is called
|
11 years ago |
Baris Soner Usakli
|
67f8af7e3e
|
#744
|
11 years ago |
Baris Soner Usakli
|
d2c0aa9949
|
fixed auto complete for insertion in the middle, 6am commits FTW
|
11 years ago |
Baris Soner Usakli
|
2d384a68d2
|
oops extra $
|
11 years ago |
Baris Soner Usakli
|
414eaea413
|
username mention auto completes
|
11 years ago |
Baris Soner Usakli
|
8e6606fb5a
|
move post
|
11 years ago |
Baris Soner Usakli
|
2e575bb2d8
|
closes #524
|
11 years ago |
psychobunny
|
7c8c735e05
|
i8n - if translation not present, use a readable key
|
11 years ago |
psychobunny
|
0e5358a701
|
closes #698
|
11 years ago |
psychobunny
|
7be16eab06
|
closes #722
|
11 years ago |
Baris Soner Usakli
|
58580bd866
|
closes #716, also moved chat to its own template
|
11 years ago |
Julian Lam
|
f7b7af3004
|
so xregexp uses double backslashes...
|
11 years ago |
Julian Lam
|
5a88a5ca60
|
allow underscores in slugs
|
11 years ago |
Baris Soner Usakli
|
4dc8f2c2e1
|
closes #665
|
11 years ago |
Baris Soner Usakli
|
32f17d5e13
|
closes #729
|
11 years ago |
Julian Lam
|
bee3c06a07
|
clicking 'quote' now shows the quoted username before said quote
|
11 years ago |
Baris Soner Usakli
|
e5ec5242c6
|
added relative_path
|
11 years ago |
Baris Soner Usakli
|
43a1ce66a1
|
added relative_path to recent_replies and browsing users
|
11 years ago |
psychobunny
|
ea49295774
|
some translator methods useful for plugins that wish to support i8n
|
11 years ago |
Julian Lam
|
f1412193ef
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
b6fdc5595d
|
removed handlebars dependency for emailer, using ANDREWBARS now
|
11 years ago |
psychobunny
|
fda68bc5dd
|
added templates.setGlobal - allows you to add default template vars that are sent to all tpls upon parsing; added relative_path as global
|
11 years ago |
Baris Soner Usakli
|
751dc73ebe
|
fixes login/register and auth routes in relative path install
|
11 years ago |
Julian Lam
|
5c048ac20a
|
closed #727
|
11 years ago |
Baris Soner Usakli
|
f21a98f37f
|
first pass, #524, #667
|
11 years ago |
psychobunny
|
0edd6985ec
|
templates.js added support for !@first and !@last conditionals
|
11 years ago |
psychobunny
|
03c4a1bc73
|
remove console.log(file) - no more exploding terminals
|
11 years ago |
Julian Lam
|
08bdbc0bcc
|
cleanup of PR - fixed some logic bugs and linted
|
11 years ago |
Julian Lam
|
35d6a99775
|
Merge branch 'AdminButton' of github.com:genderup/NodeBB into genderup-AdminButton
|
11 years ago |
Baris Soner Usakli
|
1996e64c9b
|
if imgur client id is not set but local file uploads are enabled use that
|
11 years ago |
Baris Soner Usakli
|
d43f3cebc6
|
closes #707, closes #686
|
11 years ago |
Julian Lam
|
9d452241ad
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
c19a51e1b6
|
tweaking slugify code to not remove numbers
|
11 years ago |
Baris Soner Usakli
|
8cfb239aac
|
closes #705
|
11 years ago |
Julian Lam
|
1e61033667
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
53caa5e422
|
full unicode support in slugify method, thanks to XRegExp
|
11 years ago |
Baris Soner Usakli
|
204913c63d
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
Baris Soner Usakli
|
6c30437c47
|
closes #706, refactor admin image uploads, fixed gif uploads
|
11 years ago |
psychobunny
|
69e0aa338d
|
resolved some todo that's been in there for many months
|
11 years ago |
psychobunny
|
6dcd06b63c
|
removed unused parameter in templates.prepare
|
11 years ago |
Baris Soner Usakli
|
fbb4998999
|
closes #676
|
11 years ago |
Baris Soner Usakli
|
a55fc364a0
|
closes #697
|
11 years ago |
Baris Soner Usakli
|
2f90949560
|
vanilla color fixes
|
11 years ago |
Baris Soner Usakli
|
a940219321
|
remvoed the timeout on the login call
|
11 years ago |
Michael Mitchell
|
0f0913bfe5
|
add admin button
|
11 years ago |
Baris Soner Usakli
|
ba2f47ead6
|
closes #690, closes #691
|
11 years ago |
Julian Lam
|
b52782deb8
|
removed use of strip_tags and using String library instead
|
11 years ago |
Baris Soner Usakli
|
83cc8f3ba8
|
fixed header template value too
|
11 years ago |
Baris Soner Usakli
|
e9fbed71ae
|
closes #613, fixed allowRegistration incase its undefined
|
11 years ago |
Baris Soner Usakli
|
ea84fd70af
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
Baris Soner Usakli
|
09efb83ef3
|
make sure relativeTime doesn't display negative values
|
11 years ago |
Julian Lam
|
0ed8fd6cbd
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
2f1a3b9789
|
enabled touch events for composer resizing -- composer is now ipad
supported!
|
11 years ago |