barisusakli
5de430deb5
add taskbar to body
2014-04-03 17:30:46 -04:00
Julian Lam
e1c9bd7229
updated shrinkwrap file
2014-04-02 09:15:11 -04:00
Julian Lam
eabbc81b40
Merge branch 'master' into v0.4.x
2014-04-02 09:05:46 -04:00
Julian Lam
ec062533a0
updating minvers, removing cerulean from bundled themes
2014-04-02 08:56:13 -04:00
Julian Lam
fdf9deb7aa
latest translations and fallbacks
2014-04-02 08:54:10 -04:00
Julian Lam
339d0e5495
flag post translations
2014-04-02 08:18:28 -04:00
Julian Lam
bc29f832fe
language keys for password changing -- issue #1278
2014-04-01 21:44:04 -04:00
Julian Lam
1abba25f83
language keys for accountedit.tpl
2014-04-01 21:44:04 -04:00
barisusakli
10f56faf9d
admin cleanup
...
removed unnecessary admin checks in src/admin/user then realized they
are just one liners so moved them to src/socket.io.admin.js moved
categories update to categories folder
2014-04-01 17:12:07 -04:00
Julian Lam
e29aa5abf8
Merge branch 'master' into v0.4.x
2014-04-01 17:00:43 -04:00
barisusakli
ac88b5fc25
fixing user deletion, missing cb
2014-04-01 17:00:24 -04:00
Julian Lam
cde7168f9c
adding shrinkwrap file for release
2014-04-01 16:41:06 -04:00
Julian Lam
f12b641d11
whoops, fixing bad db call
2014-04-01 16:37:02 -04:00
Julian Lam
2c1978218c
moving the db require to where it is actually needed
2014-04-01 16:35:44 -04:00
Julian Lam
5daf89f263
0.4.0
2014-04-01 16:21:39 -04:00
psychobunny
4693f64bef
better layout for global sidebars on mobile
2014-04-01 14:49:30 -04:00
psychobunny
15c2e4d968
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-04-01 14:00:36 -04:00
psychobunny
488e31df64
added X-Powered-By header for builtwith.com
2014-04-01 14:00:33 -04:00
barisusakli
b5f4503e9f
fixed share url
2014-04-01 12:11:45 -04:00
psychobunny
e886e232c5
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-04-01 12:02:54 -04:00
psychobunny
e32adf9477
console.log
2014-04-01 12:02:51 -04:00
barisusakli
99e6223bf0
removed console.log
2014-04-01 12:02:05 -04:00
barisusakli
f185e13175
added check to isReadyToPost, banned and exists
2014-04-01 12:01:16 -04:00
psychobunny
3aa4ae4b99
move deprecated vanilla footer widgets into draft zone
2014-04-01 11:48:15 -04:00
psychobunny
d1495102f2
fixed positioning if no sidebar widget selected
2014-04-01 11:22:03 -04:00
psychobunny
260579b525
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-04-01 11:19:15 -04:00
psychobunny
b82b5794bc
add copyright widget on fresh install
2014-04-01 11:19:12 -04:00
Julian Lam
10fc991a7b
Merge branch 'master' of github.com:MrHohenheim/NodeBB into MrHohenheim-master
...
Conflicts:
public/language/hu/global.json
public/language/hu/topic.json
2014-03-31 22:06:44 -04:00
Julian Lam
3ff588415c
latest translations
2014-03-31 18:04:29 -04:00
Julian Lam
bb4d4eaec7
added pirate english... yarrr
2014-03-31 18:04:03 -04:00
Pénzes Tamás
d6682048a1
Update topic.json
...
not finished
2014-03-31 23:36:28 +02:00
Pénzes Tamás
83156701df
Update reset_password.json
...
done
2014-03-31 23:31:09 +02:00
Pénzes Tamás
175da41131
Update pages.json
...
done
2014-03-31 23:29:24 +02:00
Pénzes Tamás
4a1bd2fe93
Update notifications.json
...
done
2014-03-31 23:27:41 +02:00
Pénzes Tamás
b23a6fecc3
Update login.json
...
done
2014-03-31 23:26:27 +02:00
Pénzes Tamás
c199aca4e8
Update global.json
...
translated some but still not finished
2014-03-31 23:24:50 +02:00
Pénzes Tamás
c4f436283e
Update user.json
...
fixed line 47
2014-03-31 23:15:28 +02:00
psychobunny
5305bc0138
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-31 16:20:00 -04:00
psychobunny
7926514c95
draft zone for widgets, closes #1238
2014-03-31 16:19:57 -04:00
barisusakli
e7a791ab74
removed unused globals from share module
2014-03-31 15:29:29 -04:00
barisusakli
273f499cc2
moved the duplicated sharing code to requirejs module
2014-03-31 15:22:35 -04:00
barisusakli
1d3c25fdcc
moved alert to its own requirejs module
2014-03-31 14:49:48 -04:00
barisusakli
b1a6d394e3
moved format number functions to utils
2014-03-31 14:43:48 -04:00
psychobunny
f01cb88c57
deprecated: plugins/fireHook, filter:server.create_routes, filter:admin.create_routes
2014-03-31 13:03:22 -04:00
psychobunny
0f20352fbb
closes #1289
2014-03-31 13:00:01 -04:00
psychobunny
924388d96f
widgets - only collapse / expand divs that specify a target location
2014-03-31 12:54:27 -04:00
psychobunny
375c2c2ce1
upgrade.js for re-adding copyright footer
2014-03-31 12:42:13 -04:00
psychobunny
576246c315
global widget areas (sidebar/footer) - closes #1097
2014-03-31 12:27:24 -04:00
barisusakli
ed3a1b47bd
category changes
2014-03-30 19:17:48 -04:00
Julian Lam
0b6817b9a7
latest translations
2014-03-30 13:34:23 -04:00
Julian Lam
4161f138f3
adding data-dir attribute for languages
2014-03-29 21:43:33 -04:00
Julian Lam
b3e8b1a152
removed language strings for logout page that doesn't exist anymore
2014-03-29 20:48:16 -04:00
barisusakli
35eebbf20a
chat message fix
2014-03-29 19:40:53 -04:00
Julian Lam
3f1df52773
settings.get should return empty obj instead of null
2014-03-29 17:58:41 -04:00
Julian Lam
2430b970f3
fixed issue where timeago strings were not rendering in the correct language on cold loads
2014-03-29 17:44:13 -04:00
Julian Lam
4b45a4b168
fixing persian language timeago mapping
2014-03-29 17:33:20 -04:00
psychobunny
0ba7c4891c
closes #1295
2014-03-29 17:16:41 -04:00
psychobunny
7678eaf528
fixes #1296
2014-03-29 17:13:33 -04:00
psychobunny
5ce069fdd3
imported latest templates.js
2014-03-29 17:08:23 -04:00
psychobunny
ab20880332
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-29 16:48:24 -04:00
psychobunny
31d8f13f7b
closes #1297
2014-03-29 16:48:21 -04:00
barisusakli
70f415446b
added watch title language string
2014-03-29 16:05:29 -04:00
barisusakli
500ca33675
changed bootswatch to protocolless
2014-03-29 15:29:39 -04:00
psychobunny
d27eb17b32
fixes #1294
2014-03-29 15:03:14 -04:00
psychobunny
d89c0d698e
prevent crash on widget containers
2014-03-29 14:44:51 -04:00
psychobunny
15773f28f2
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-29 14:37:47 -04:00
psychobunny
c76a073482
added skins tab; closes #1293
2014-03-29 14:37:44 -04:00
Julian Lam
365c889dbd
Latest transations (oh boy, there were a lot), and fallbacks for those that haven't been translated yet.
2014-03-29 14:29:10 -04:00
Julian Lam
bcae47bb1e
Welcome to NodeBB, Persian language pack! :D
2014-03-29 14:28:23 -04:00
psychobunny
d89f280c73
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-29 13:18:51 -04:00
psychobunny
7c8d5614c6
update nodebb-widget-essentials to latest; fixes #1292
2014-03-29 13:18:48 -04:00
barisusakli
219c0d75c4
fix for #1290
2014-03-28 21:30:02 -04:00
psychobunny
ed87d40f71
helpers.buildMetaTag
2014-03-28 18:59:10 -04:00
psychobunny
40cc21fad8
closes #1100
2014-03-28 18:30:11 -04:00
psychobunny
baadd0f2ed
allow logged in users to access /users page
2014-03-28 17:58:28 -04:00
psychobunny
dab91d6ce9
fixed require.js error
2014-03-28 17:54:27 -04:00
psychobunny
3ae8aa1c55
helpers.js (client/server); closes #1275
2014-03-28 17:49:58 -04:00
psychobunny
eab0ca7463
allow custom themes to include templates that don't exist in the base theme
2014-03-28 17:05:09 -04:00
psychobunny
fb7e0bb7c2
updating vanilla/lavender deps
2014-03-28 16:47:31 -04:00
psychobunny
f913c58925
imported latest templates.js updates
2014-03-28 16:14:18 -04:00
psychobunny
0c8c246be4
simplified widgets
2014-03-28 16:01:33 -04:00
psychobunny
4f04bd82a6
some fixes
2014-03-28 15:35:07 -04:00
psychobunny
4d02600820
fixing some things code climate was qq'ing about
2014-03-28 14:21:34 -04:00
psychobunny
b023ef01af
moving widgets and variables code out of ajaxify
2014-03-28 14:18:42 -04:00
psychobunny
0dd7339bec
fixed admin/users banning/admin
2014-03-28 14:10:14 -04:00
psychobunny
1b206a6ae8
ajaxify cleanup
2014-03-28 14:06:34 -04:00
psychobunny
67b1dd546c
Merge remote-tracking branch 'origin/master' into templates.js-merge
2014-03-28 13:58:18 -04:00
psychobunny
dbb75f181d
more cleanup
2014-03-28 13:54:20 -04:00
psychobunny
e4f136c208
cleanup
2014-03-28 13:34:20 -04:00
psychobunny
2ae0b3905d
forgot to remove error first from templates.js
2014-03-28 13:32:10 -04:00
psychobunny
7e11d29f06
got rid of all templates.prepare; pull blocks using templates.getBlock instead of parsing twice
2014-03-28 13:29:51 -04:00
psychobunny
339eafd6be
updating templates.parseTemplateVariables to ajaxify.variables.parse
2014-03-28 13:02:36 -04:00
psychobunny
7217954078
updating all templates.get to ajaxify.variables.get
2014-03-28 13:02:13 -04:00
psychobunny
113eb38f9a
moving ajaxify-related things out of templates and into ajaxify
2014-03-28 13:01:43 -04:00
psychobunny
608a1ce6d0
https://github.com/psychobunny/templates.js
2014-03-28 13:01:24 -04:00
barisusakli
3a69a191ff
closes #1285
2014-03-28 12:13:06 -04:00
Julian Lam
131b71f361
language: fr
2014-03-28 10:51:41 -04:00
barisusakli
fdf0076f37
decrease user count when user is deleted
2014-03-27 19:59:44 -04:00
Julian Lam
1eab829dec
Merge pull request #1255 from theon/absolute-path-config
...
Allow absolute config paths
2014-03-27 13:10:29 -04:00
barisusakli
0e5c65199d
simpler static
2014-03-27 12:59:27 -04:00
barisusakli
824d849a52
removed req
2014-03-27 03:12:23 -04:00
barisusakli
a3842d2c61
removed similar code
2014-03-26 23:29:50 -04:00
barisusakli
e5a5b8e8bf
added privateUserInfo and isLoggedIn for #1275
2014-03-26 11:57:46 -04:00
Julian Lam
be45ad163a
properly fixed #1274
2014-03-26 11:43:42 -04:00
Julian Lam
585eb9e1be
fixed #1274
2014-03-26 11:39:27 -04:00
barisusakli
4f88e9cf2c
shortened the user postcount update code
2014-03-26 11:15:27 -04:00
barisusakli
d6ad100ed5
not used anymore
2014-03-25 14:50:08 -04:00
barisusakli
68db8c04f7
added missing radix
2014-03-25 14:18:24 -04:00
barisusakli
5fe5e3d893
topics.js refactor
2014-03-25 14:17:00 -04:00
barisusakli
2507d6c853
display_moderator_tools is already returned
...
when new posts were loaded, we were making a socket call for each post
to check if the post is editable, but this data is already returned in
display_moderator_tools when posts are loaded.
2014-03-25 13:52:25 -04:00
barisusakli
e4fbb31e68
some cleanup
2014-03-25 13:24:51 -04:00
barisusakli
61ae01543c
fixed to use postsPerPage
2014-03-25 12:47:15 -04:00
barisusakli
a400e5de81
#1269
2014-03-25 12:23:55 -04:00
barisusakli
e8265efc20
closes #1271
2014-03-25 12:10:42 -04:00
barisusakli
038a833125
check to see if there are topics
2014-03-24 21:53:14 -04:00
barisusakli
3493be4ef0
closes #1268
2014-03-24 21:05:02 -04:00
barisusakli
6fc3103aef
topic og:image changes
2014-03-24 20:43:29 -04:00
Julian Lam
fc1cb76444
fixed #1266
2014-03-24 20:24:22 -04:00
barisusakli
abc7fd54f3
added class to chat messages
2014-03-24 20:12:03 -04:00
barisusakli
48ed540801
closed #1267
2014-03-24 19:57:25 -04:00
barisusakli
22ba104930
chat style
2014-03-24 18:18:00 -04:00
Julian Lam
31606578f5
putting cache buster back in header template arguments
2014-03-24 18:09:49 -04:00
Julian Lam
1487545fd2
fixing issue where cold loads were calling client-side event action:ajaxify.end with the wrong "url"
2014-03-24 16:22:10 -04:00
barisusakli
0c744a947e
chat will use timeago
2014-03-24 15:58:02 -04:00
Julian Lam
17dd113a94
fixed issue where plugin css and js wasn't loaded -- also less files no longer blow up
2014-03-24 15:35:58 -04:00
Julian Lam
c2f6717e88
adding cache-buster to template globals
2014-03-24 14:36:20 -04:00
Julian Lam
8c7b474e8b
moved fontawesome CSS into stylesheet.css, and updating the js and css middlewares to compile at app start, not on first load
2014-03-24 14:36:20 -04:00
barisusakli
980cf2ccf9
closes #1184
2014-03-24 14:30:11 -04:00
barisusakli
1664d179b9
closes #1245
2014-03-24 13:45:31 -04:00
Julian Lam
0ef2be61b1
translations
2014-03-24 11:42:48 -04:00
Julian Lam
6fb69e6c19
removing error output for incorrect pw on login
2014-03-24 11:07:39 -04:00
Barış Soner Uşaklı
9f5893bc83
Update delete.js
2014-03-23 23:34:04 -04:00
barisusakli
642b9e4d69
fixed extra space in new if there is no username
2014-03-23 19:00:08 -04:00
barisusakli
0741b162cb
#1265
2014-03-23 18:53:21 -04:00
barisusakli
f247c2195e
fixed user picture in og:image
2014-03-23 17:17:56 -04:00
barisusakli
94a589e0e4
#1190
2014-03-23 16:57:04 -04:00
barisusakli
bcc464a196
fixed reverse loading of topics
...
data.after can be zero which was causing a invalid data error
2014-03-23 15:05:04 -04:00
barisusakli
a3404d3d4f
closes #1253
2014-03-23 14:25:16 -04:00
barisusakli
36dc086470
no need to get signature and custom profile info
2014-03-22 21:04:53 -04:00
Julian Lam
fdc6b004c5
closed #1260 , closed #1261
2014-03-22 09:51:29 -04:00
barisusakli
04e0c58b84
fixes realtime update of home
2014-03-21 22:16:30 -04:00
Barış Soner Uşaklı
4e10ee473c
Merge pull request #1257 from theon/fix-syntax-error
...
Fix syntax error
2014-03-21 20:51:38 -04:00
Ian Forsey
28f186d4a7
Fix syntax error
2014-03-22 00:46:11 +00:00
barisusakli
1f2d5abbb7
possible fix for #1256
2014-03-21 20:37:53 -04:00
Ian Forsey
6ca5a42936
Allow absolute config paths
2014-03-21 23:07:05 +00:00
barisusakli
2b2e83992e
changed messages
2014-03-21 18:44:14 -04:00
barisusakli
0cfd05d839
closes #1254
2014-03-21 18:36:06 -04:00
barisusakli
d6223406e9
added space between uploading and number
2014-03-21 18:23:59 -04:00
barisusakli
ca0dbf84be
no need for exists check
...
if topic doesnt exist topicData will be null
2014-03-21 18:20:06 -04:00
barisusakli
a695c6134b
added missing meta
2014-03-21 17:59:46 -04:00
barisusakli
db3632557e
moved notification push out of markAsRead
2014-03-21 17:48:32 -04:00
barisusakli
7a1037dc11
moved posts and recent to new files
2014-03-21 17:04:15 -04:00
barisusakli
38733ef94b
moved reply post create to topics/create.js
2014-03-21 15:55:03 -04:00
barisusakli
478429af3a
moved fork to new file
2014-03-21 15:47:46 -04:00
barisusakli
bac3cf03cb
moved unread to new file
2014-03-21 15:40:37 -04:00
barisusakli
ec63ba4b17
removed unused method
2014-03-21 15:04:10 -04:00
barisusakli
8b6f701246
removd dupe
2014-03-21 14:57:38 -04:00
barisusakli
b470a9b264
fixes jumping to top on vote
2014-03-21 14:00:13 -04:00
barisusakli
7f193041a8
removed admin topics
2014-03-21 13:24:31 -04:00
Julian Lam
8abaa812ec
fixing client-side script for groups page in ACP
2014-03-21 13:20:13 -04:00
barisusakli
880c393b6d
fixed admin groups page
...
changed gid to groupName
2014-03-21 12:52:35 -04:00
Julian Lam
6f78d29498
upgrade script should not delete non-hidden groups
2014-03-21 12:14:58 -04:00
Julian Lam
1e3b9b7cf6
removing console logs
2014-03-21 12:11:34 -04:00
Julian Lam
d33253bc3a
Merge remote-tracking branch 'origin/master'
2014-03-21 12:06:19 -04:00
Julian Lam
96d58288c9
tweaking upgrade script so it works with a real db
2014-03-21 11:29:00 -04:00
Julian Lam
4701eb1cee
updating groups so that members leave a group when it is deleted
2014-03-21 09:27:13 -04:00
Julian Lam
ce867aec53
updated upgrade script date
2014-03-21 09:18:33 -04:00
Julian Lam
4206c17da3
rounding out tests for groups
2014-03-21 09:05:29 -04:00
Julian Lam
1dcac09e53
OMG TESTS #1252
2014-03-20 20:49:57 -04:00
Julian Lam
0e44eb8629
final refactoring pass for groups -- #1252
2014-03-20 16:26:00 -04:00
barisusakli
26d67257fe
moved privilege check out of getRecentReplies
...
it was being called twice in api/home
2014-03-20 14:58:45 -04:00
barisusakli
ef0740049a
dont return everything in followers, #1250
2014-03-20 14:28:37 -04:00
barisusakli
b2a837d283
getPostSummary change
2014-03-20 13:18:12 -04:00
barisusakli
301008b9cb
missed this one
2014-03-20 12:49:31 -04:00
Julian Lam
7b4f596aba
updating all group lib methods, and their callers -- #1252
2014-03-20 09:13:09 -04:00
barisusakli
c7c3bc1c8e
no need to create empty array
2014-03-19 21:40:26 -04:00
barisusakli
fa98da6978
related to #1250
2014-03-19 21:32:13 -04:00
Julian Lam
befaa56ad0
derp derp derp more refactoring of groups
2014-03-19 20:40:34 -04:00
Julian Lam
c893effcb9
WIP commit -- groups refactoring + upgrade scripts
2014-03-19 20:33:39 -04:00
barisusakli
2f8ecc00d8
closes #1250
2014-03-19 18:31:19 -04:00
Julian Lam
d6b6e39f2a
Sardinian (sc) and Thai (th)
2014-03-19 16:18:16 -04:00
Julian Lam
85a5c123af
minor tweak to winston logging for user jobs
2014-03-19 16:11:20 -04:00
barisusakli
c070808209
store postcontainer
2014-03-19 15:56:22 -04:00
barisusakli
cabc3e5e3d
more cleanup
2014-03-19 15:47:53 -04:00
barisusakli
9b63facf6f
more postTools refactor
2014-03-19 15:26:38 -04:00
barisusakli
9dd0f3c9b9
some more
2014-03-19 15:04:56 -04:00
barisusakli
363e7c23bd
postTools cleanup
2014-03-19 14:53:31 -04:00
barisusakli
8ffaecaa4c
fixed paginator on entry, moved out postTools to a new file
2014-03-19 14:29:59 -04:00
psychobunny
3bd93a40fc
closes #1235
2014-03-19 14:05:48 -04:00
Julian Lam
c709b7ed5b
Merge remote-tracking branch 'origin/master'
2014-03-19 10:28:40 -04:00
Julian Lam
4239c376c8
truncating user list in Groups ACP page, resolved #1132 . Refactored system groups handling
2014-03-19 10:27:02 -04:00
Julian Lam
3c5fc72e20
adding "system" flag to system groups
2014-03-19 09:28:18 -04:00
barisusakli
567d867b1e
fixed require to missing public config.json
2014-03-19 02:07:18 -04:00
Julian Lam
ab5ec68f2f
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-18 20:22:02 -04:00
Julian Lam
da1a1d5930
adding callback to settings.load, and omitting password validation check on user creation if no password is entered (e.g. SSO login)
2014-03-18 20:21:47 -04:00
barisusakli
e86eb8667e
threadTools jshint
2014-03-18 20:03:56 -04:00
barisusakli
f61ca4327d
fixed profile
2014-03-18 18:51:08 -04:00
Julian Lam
cc0fabc619
removing console logs from upgrade script
2014-03-18 18:31:38 -04:00
barisusakli
7d382b2900
closes #1243
2014-03-18 18:15:07 -04:00
barisusakli
d2af4a6b69
user images wont be responsive in widgets
2014-03-18 18:06:00 -04:00
barisusakli
0f66e80a5a
added setting to disable notification sounds
2014-03-18 17:01:41 -04:00
Julian Lam
36e949acea
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-18 16:53:40 -04:00
Julian Lam
3308da64cb
updating language strings for it and nb
2014-03-18 16:53:27 -04:00
barisusakli
45f0021503
moved follow to thread tools
2014-03-18 16:46:07 -04:00
Julian Lam
98745ae0c4
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-18 15:38:06 -04:00
Julian Lam
2b8a7c73ac
daily digest emails! resolved #326
2014-03-18 15:37:17 -04:00
barisusakli
64676b66c8
removed unused validator require
2014-03-18 14:28:45 -04:00
barisusakli
6774f0f52f
fit image to 128x128 and keep aspect ratio, closes #1240
2014-03-18 14:27:00 -04:00
barisusakli
6a4dd5cc05
closes #1160
2014-03-18 14:11:26 -04:00
barisusakli
e11efad0b7
added getSortedSetRangeByScore
2014-03-18 13:25:09 -04:00
Julian Lam
2badb76fc2
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-18 11:44:56 -04:00
Julian Lam
61afee98c3
updates to new settings mechanism, updating markdown minver, minor linting for upgrades.js, and upgrade stmt for markdown migration
2014-03-18 11:44:22 -04:00
barisusakli
e67e9aee42
moved user creation to new file
2014-03-17 21:47:37 -04:00
barisusakli
3f23821580
moved topic moving and thread tools out of topic.js
2014-03-17 21:23:30 -04:00
barisusakli
f83b7ee972
renamed event
2014-03-17 17:38:47 -04:00
barisusakli
8efc33d6a1
closes #976
2014-03-17 17:27:47 -04:00
psychobunny
ef97f627f4
closes #1237
2014-03-17 17:25:22 -04:00
Julian Lam
39b22058b7
tilde, not nothing.
2014-03-17 17:07:43 -04:00
Julian Lam
3cb2ac166b
Merge branch 'patch-1' of github.com:JohnMcLear/NodeBB into JohnMcLear-patch-1
2014-03-17 17:07:16 -04:00
psychobunny
af997061aa
Merge pull request #1185 from gusnips/patch-1
...
accept arguments on setup
2014-03-17 16:37:25 -04:00
barisusakli
10d8eed7b9
closes #1229
2014-03-17 16:28:00 -04:00
psychobunny
f0a19b06c2
launch aesthetics
2014-03-17 16:22:03 -04:00
psychobunny
c6a89b504f
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-17 16:09:22 -04:00
psychobunny
6262312747
closes #1153
2014-03-17 16:09:20 -04:00
Julian Lam
012480c2e1
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-17 15:48:47 -04:00
Julian Lam
43e0c726fa
relaxed isClientScript regex, fixed #1198
2014-03-17 15:48:34 -04:00
barisusakli
e49d445422
added err checking
2014-03-17 15:46:53 -04:00
psychobunny
da7d6a3137
closes #1175
2014-03-17 15:38:06 -04:00
psychobunny
11dddc9c6f
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-17 15:15:18 -04:00
psychobunny
653007b72e
closes #1231
2014-03-17 15:15:16 -04:00
barisusakli
76d8f19e73
forgot to return #963
2014-03-17 14:56:32 -04:00
barisusakli
cd4a204f99
closes #963
2014-03-17 14:56:05 -04:00
psychobunny
99108c750a
don't refresh widgets on every new post
2014-03-17 14:45:08 -04:00
psychobunny
197b34461f
potentially fixes #1228
2014-03-17 14:18:58 -04:00
psychobunny
e60b2f7716
closes #1174
2014-03-17 13:38:32 -04:00
psychobunny
1804373322
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-17 13:23:08 -04:00
psychobunny
0627734fc0
trim leading whitespace/#/? in search closes #1195
2014-03-17 13:23:05 -04:00
Julian Lam
d30acee9d3
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-17 13:20:29 -04:00
Julian Lam
0459e242fc
resolved #1223
2014-03-17 13:20:07 -04:00
psychobunny
6e64712fd3
fixed bug in api/search causing it to crash if term is not passed in via ajaxify, see #1195
2014-03-17 13:18:43 -04:00
psychobunny
941c3b2d7e
added emitter class; express.listen only after background tasks complete; closes #1227
2014-03-17 12:53:31 -04:00
Julian Lam
16f1db4f5d
fireEvent reflection socket call, tweaks to Sounds page in ACP
2014-03-17 11:36:30 -04:00
Julian Lam
14a0b45ae8
securing settings.save socket listeners behind admin namespace
2014-03-17 10:48:30 -04:00
Julian Lam
c1ccc81400
ACP integration for Sounds
2014-03-17 10:37:11 -04:00
Julian Lam
eeb3bdc7f7
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-17 08:54:47 -04:00
barisusakli
4cadd8da7a
missing radix
2014-03-16 14:29:51 -04:00
barisusakli
367a9aa022
composer jshint
2014-03-16 14:17:43 -04:00
John McLear
ecd3f15381
Use specified Less version
...
Fixed https://github.com/designcreateplay/NodeBB/issues/1219
2014-03-16 18:13:54 +00:00
Julian Lam
17903adace
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-16 14:13:27 -04:00
barisusakli
b4af4c72cc
alertSuccess can take language strings
2014-03-15 18:05:59 -04:00
barisusakli
da8c2896d7
moved to showForkModal
2014-03-15 17:56:21 -04:00
barisusakli
38d4fd1a59
took out forking to its own file
2014-03-15 17:50:19 -04:00
barisusakli
46a475fdde
controllers/admin/users cleanup
2014-03-15 16:28:57 -04:00
barisusakli
ea4931fa1d
removed dupe from controllers/user.js
2014-03-15 16:18:03 -04:00
barisusakli
19c2a85bf1
logger jshint
2014-03-15 16:08:31 -04:00
barisusakli
37e8856861
new middleware to add slug to topic and category
2014-03-15 15:29:56 -04:00
barisusakli
1eafc6ba3d
moved user delete to its own file, closes #746
2014-03-15 15:09:54 -04:00
Julian Lam
f942c03a58
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-15 14:39:16 -04:00
barisusakli
611c16b5a6
closes #1126
2014-03-15 00:26:09 -04:00
Barış Soner Uşaklı
d233e7927d
added tablet screenshot
2014-03-14 20:56:06 -04:00
barisusakli
7873b90caf
missing ;
2014-03-14 20:06:46 -04:00
barisusakli
3d6cce44c7
dont display chats with deleted users
2014-03-14 19:34:05 -04:00
barisusakli
42f42adfaf
clean up, radix
2014-03-14 19:22:56 -04:00
barisusakli
1354739d19
user deletion #746
...
user deletion NOT SKALABLE
2014-03-14 19:07:50 -04:00
Julian Lam
0ea14324ac
adding missing files
2014-03-14 00:35:36 -04:00
Julian Lam
ebe61450a1
WIP - settings.prepare refactoring... because.
2014-03-14 00:34:51 -04:00
Julian Lam
6d03f713c5
"Sounds" tab in Settings page... WIP, needs fixing.
2014-03-13 23:43:36 -04:00
barisusakli
a0e784a612
closes #1138
2014-03-13 20:24:04 -04:00
barisusakli
6011399063
removed comment
2014-03-13 18:50:57 -04:00
barisusakli
d2bef79888
closes #1194
2014-03-13 18:11:41 -04:00
Julian Lam
97a64122b4
updates to language files
2014-03-13 17:39:00 -04:00
Julian Lam
66fd13be97
Merge branch 'master' of github.com:qk168899/NodeBB into qk168899-master
2014-03-13 17:35:17 -04:00
sam
9c3c536ae8
fine tune zh-TW
2014-03-14 05:21:16 +08:00
barisusakli
ccc717b339
account posts jshint
2014-03-13 17:19:28 -04:00
Julian Lam
401bd02748
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-13 17:15:24 -04:00
Julian Lam
553cabdcfa
refactored sound system so that they can be specified in ACP, updated soundfile to work in FF, which fixes #1209
2014-03-13 17:15:09 -04:00
barisusakli
bddc270033
changed addUserInfoToPost to add a user object
2014-03-13 16:41:45 -04:00
barisusakli
e0911c1fff
replaced exists check with getCategoryData
2014-03-13 16:21:16 -04:00
psychobunny
9223865c80
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-13 15:46:22 -04:00
psychobunny
9de21995c4
added category bgColor and color to topics api
2014-03-13 15:46:19 -04:00
barisusakli
9685cb7fe0
removed broken post update
2014-03-13 15:23:02 -04:00
barisusakli
161c7f1875
closes #1201
2014-03-13 15:13:47 -04:00
barisusakli
175230e337
closes #1205
2014-03-13 14:08:58 -04:00
barisusakli
2bb5918b6c
closes #1208
2014-03-13 13:49:22 -04:00
psychobunny
e3df487173
cleanup
2014-03-13 02:06:59 -04:00
psychobunny
79bacfe164
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-13 00:52:12 -04:00
psychobunny
6563a72b5b
fixed emailer templates
2014-03-13 00:49:32 -04:00
barisusakli
7668b95c66
register.js cleanup
2014-03-12 23:18:54 -04:00
barisusakli
d8e00f95a2
moved user search to its own file
2014-03-12 22:11:48 -04:00
barisusakli
383b68e7fc
user js refactor
2014-03-12 21:57:25 -04:00
barisusakli
cc0ac29b36
categories refactor
2014-03-12 21:41:53 -04:00
barisusakli
970639274e
fixes image uploads
...
if images had special regex characters in them upload text was failing
2014-03-12 21:18:39 -04:00
barisusakli
90e398e5c9
user js refactor, category fix
...
if a category that didn't exist was request with category/1231 or
api/category/1231 it was crashing.
2014-03-12 20:53:48 -04:00
Julian Lam
67ef155c60
fixing image uploads
2014-03-12 20:03:20 -04:00
psychobunny
b2986f2a4e
removing use strict from forum/topic.js until its refactored properly
2014-03-12 18:32:40 -04:00
psychobunny
bdfe12f365
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-12 18:30:17 -04:00
psychobunny
35ac0bb793
linted app.js
2014-03-12 18:30:13 -04:00
psychobunny
dd7433bab6
fixed active users icon in thread
2014-03-12 18:30:06 -04:00
barisusakli
3f5c51174d
refactored user.js
...
took out notifications, email and reset code to separate files
2014-03-12 18:00:33 -04:00
psychobunny
f47f146320
moved out uploads and users from controllers/admin into their own files
2014-03-12 17:59:29 -04:00
psychobunny
641ec3ef82
moved duplicate upload validation code into its own fn
2014-03-12 17:46:03 -04:00
psychobunny
0bbff06cfa
use middleware.authenticate instead of checking in each fn
2014-03-12 17:39:10 -04:00
psychobunny
01cda60704
moved admin upload functions into controllers/admin; re-organized routes/admin to look like routes/index; removed unused deps
2014-03-12 17:34:59 -04:00
psychobunny
01077cb35b
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-12 17:11:20 -04:00
psychobunny
0d625761be
fixing bug introduced @ da0355ef79 (multiple widget areas defined = explosion)
2014-03-12 17:11:13 -04:00
barisusakli
0f19578523
removed dupe body
2014-03-12 17:08:06 -04:00
psychobunny
bdc7a19bd7
don't attempt to parse a non-existing widget area
2014-03-12 16:51:59 -04:00
psychobunny
58fe16e15c
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-12 16:31:29 -04:00
psychobunny
7fc2e627c5
linting templates.js; got rid of some unused server-side code
2014-03-12 16:31:26 -04:00
Julian Lam
e611a8174e
linting setting.js again and abstracting out saveField
2014-03-12 16:21:19 -04:00
psychobunny
0a293be823
linting categories.js and footer.js
2014-03-12 16:18:48 -04:00
psychobunny
d183e58771
linting admin/groups
2014-03-12 16:17:00 -04:00
psychobunny
6ea760d636
linting admin/index; admin/languages
2014-03-12 16:15:39 -04:00
psychobunny
2d65a746e4
linting admin/settings
2014-03-12 16:14:18 -04:00
psychobunny
81de895c0e
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-12 16:12:27 -04:00
psychobunny
b515995432
removed unnecessary switch case
2014-03-12 16:12:23 -04:00
Julian Lam
4da1a2da97
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-12 16:11:49 -04:00
Julian Lam
1e0ec5dd47
appending relative path to user images for subfolder installs
2014-03-12 16:11:33 -04:00
psychobunny
8e4c23149c
more re-organization of routes/index.js
2014-03-12 16:07:54 -04:00
psychobunny
e9fb2f4135
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-12 16:02:03 -04:00
psychobunny
44a91fe9ea
linting admin/themes
2014-03-12 16:01:58 -04:00
barisusakli
2220483915
notifications
2014-03-12 15:59:02 -04:00
Julian Lam
5647354421
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-12 15:51:49 -04:00
Julian Lam
ca2e9d7d9e
linting and moving xregexp back to .js
2014-03-12 15:51:24 -04:00
psychobunny
bff722925f
Merge pull request #1206 from BitBangersCode/plugin-templates-fix
...
Fix importing of templates served by plugins
2014-03-12 15:46:53 -04:00
MrWaffle
c1a580c51d
Fix importing of templates served by plugins
2014-03-12 20:45:07 +01:00
Julian Lam
738ada9b16
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-12 15:41:26 -04:00
Julian Lam
816d9e5d12
minifying xregext lib
2014-03-12 15:41:21 -04:00
psychobunny
fdb9b889ec
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-12 15:20:23 -04:00
psychobunny
fb1ddc3d9b
minifying colorpicker.js
2014-03-12 15:20:20 -04:00
Julian Lam
b525d95915
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-12 15:18:22 -04:00
Julian Lam
6aa8df1d24
removed unminified buzz library, keeping minified version
2014-03-12 15:18:16 -04:00
psychobunny
da0355ef79
remove async dep for widgets (30kb was overkill for one use of async.each); linting
2014-03-12 15:05:07 -04:00
Julian Lam
dc99701d42
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-12 14:09:11 -04:00
Julian Lam
2826381b20
draft saving in composer -- resolved #1197
2014-03-12 14:08:55 -04:00
barisusakli
7b409c095c
mongo callback refactor
2014-03-12 13:38:25 -04:00
barisusakli
4f72513f19
removed keys
2014-03-12 12:46:34 -04:00
Julian Lam
da0793c011
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-12 11:41:55 -04:00
Julian Lam
da05330ded
updated cron dependency to require v0.1.4 at least, due to fixes upstream
...
re-enabling notifications pruning
2014-03-12 11:41:41 -04:00
barisusakli
6eff7d4c51
mongo cleanup
2014-03-12 02:04:31 -04:00
barisusakli
c320051a1e
chat jshint
2014-03-12 01:40:35 -04:00
Julian Lam
e757183cec
linting
2014-03-12 01:29:24 -04:00
Julian Lam
89ba0840e6
minor reordering of jslint comment
2014-03-12 01:23:35 -04:00
Julian Lam
0668556d4f
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-12 01:23:20 -04:00
Julian Lam
c000a8c5ba
linting
2014-03-12 01:23:11 -04:00
barisusakli
a0222b69bb
closes #1200
2014-03-12 00:45:15 -04:00
barisusakli
e9ab9dcce2
search cleanup
2014-03-12 00:13:42 -04:00
barisusakli
33e34ca864
change getRecentPosts to take count
2014-03-11 23:31:28 -04:00
Julian Lam
caa9c17bc2
fixed login routes on subfolder installs
2014-03-11 23:26:33 -04:00
Julian Lam
5e5c6014ac
updated vanilla minver
2014-03-11 23:20:35 -04:00
Julian Lam
9bf1d345e2
adding relative path to a category image for subfolder installs
2014-03-11 23:19:48 -04:00
barisusakli
67f1251ba3
pagination cleanup
2014-03-11 22:54:17 -04:00
barisusakli
3f12e51045
removed relative path from upload_url
2014-03-11 22:34:27 -04:00
barisusakli
6e6c5688d9
more cleanup
2014-03-11 22:31:09 -04:00
barisusakli
2befa06a33
some cleanup to socket posts
2014-03-11 21:52:22 -04:00
barisusakli
92267de9d8
feeds
2014-03-11 20:48:06 -04:00
Julian Lam
313c51cfb1
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-11 20:14:53 -04:00
Julian Lam
392075eb27
fixing theme previews in subfolder installs
2014-03-11 20:14:45 -04:00
barisusakli
3a42200e24
refactored feeds
2014-03-11 20:10:09 -04:00
Julian Lam
bf8f91f0d9
'less bad' handling of background image in home.tpl
2014-03-11 20:08:52 -04:00
Julian Lam
82a3415ab1
fixing admin routes on subfolder installs
2014-03-11 19:46:33 -04:00
Julian Lam
f28c690f2f
fixing up robots.txt
2014-03-11 19:44:48 -04:00
Julian Lam
08b2106e0f
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-11 19:42:18 -04:00
Julian Lam
7111adb3c2
fixed subfolder installs again (a bit), also stopped apple-touch-icon from clobbering /apple-touch-icon
2014-03-11 19:41:58 -04:00
barisusakli
d4556d4da3
added minifed js files
...
replace jquery form and timeago with minified versions
2014-03-11 19:31:30 -04:00
Julian Lam
a500899fdf
removing unused bootstrap js file
2014-03-11 19:13:18 -04:00
Julian Lam
4343f240d0
moving async back to proper vendor folder
2014-03-11 18:51:59 -04:00
Julian Lam
2f1707e772
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-11 18:48:57 -04:00
barisusakli
813b3d6fcc
changes for live streaming of posts
2014-03-11 18:46:27 -04:00
psychobunny
1e9850b6b9
vendor*
2014-03-11 18:38:23 -04:00
psychobunny
df29410c08
moving async back to require.js modules/vendor folder
2014-03-11 18:37:16 -04:00
psychobunny
5dc5eb41df
fixed ajaxify bug introduced in last commit
2014-03-11 18:33:19 -04:00
psychobunny
e451a145dd
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-11 18:10:11 -04:00
psychobunny
c8bf617f4b
allow plugins to override any route (except for admin routes)
2014-03-11 18:09:56 -04:00
Julian Lam
3dc4fd9fd9
added sounds for incoming and outgoing chat, and new notification
2014-03-11 17:47:13 -04:00
Julian Lam
4cb9f34253
adding buzz and sound assets
2014-03-11 17:10:49 -04:00
Julian Lam
f65a7f96ff
moving async to proper vendor folder
2014-03-11 16:32:28 -04:00
Julian Lam
cb304d7d54
fixed #1188
2014-03-11 15:56:04 -04:00
Julian Lam
41116bc0b2
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-11 15:51:29 -04:00
Julian Lam
4bb6d89e83
fixed #1172
2014-03-11 15:51:25 -04:00
Julian Lam
b259c3d422
categoryData should return better topics (non-anon uid passed in now)
2014-03-11 15:48:29 -04:00
Julian Lam
82a82afe99
updated the way privileges were handled in the .get() category controller
2014-03-11 15:32:32 -04:00
barisusakli
350070339b
added home room emit
2014-03-11 15:18:14 -04:00
barisusakli
a5f4135c62
added socket listeners to home
2014-03-11 15:15:54 -04:00
psychobunny
5abc96399e
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-11 14:48:38 -04:00
psychobunny
5f7f5a37c1
linting
2014-03-11 14:48:35 -04:00
barisusakli
76037a5f14
closes #1191
...
added a new method called isSetMembers takes in an array of values to
test if they are members of a set
2014-03-11 14:43:42 -04:00
psychobunny
29ad8d2582
closes #1192
2014-03-11 14:41:32 -04:00
Julian Lam
21d28b0f58
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-11 11:26:22 -04:00
Julian Lam
de6f58842b
fixed issue where events page would error out if log was not already created.
2014-03-11 11:26:06 -04:00
barisusakli
88c4b90fc8
accounts controller removed duplication
2014-03-11 04:33:08 -04:00
barisusakli
037e8943a8
removed left over
2014-03-11 04:10:39 -04:00
barisusakli
9564b6fda2
closes #1165
2014-03-11 04:10:00 -04:00
barisusakli
3d68c7c6b6
added getObjectsFields methods to db class, changed getUsers methods to use the new method, refactor to user.js and mongo.js
2014-03-11 03:39:41 -04:00
Julian Lam
8873963946
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-10 21:55:57 -04:00
Julian Lam
88b4516ef8
added compiled templates to gitignore
2014-03-10 21:55:32 -04:00
Julian Lam
ffa42ffea3
moving pluginRoutes to top of route stack (like others), put app.load hook behind plugins' ready callback
2014-03-10 21:54:30 -04:00
barisusakli
c41ef10572
removed routes/user.js
2014-03-10 20:35:55 -04:00
barisusakli
661dff2f9b
added jquery css
2014-03-10 20:19:27 -04:00
barisusakli
326eddf39e
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-10 19:00:30 -04:00
barisusakli
4e3819603b
jshint fixed missing var
2014-03-10 19:00:23 -04:00
Barış Soner Uşaklı
900c0d838d
Update README.md
2014-03-10 18:56:17 -04:00
barisusakli
e83ad1ab4a
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-10 18:28:42 -04:00
barisusakli
974333dbc3
fixed missing currentPage
2014-03-10 18:28:34 -04:00
Julian Lam
efb933f102
backwards-compatibility for plugins if they return a callback
2014-03-10 17:32:50 -04:00
Julian Lam
19c9f1bb19
backwards compatibility with plugins that are assuming no callback
2014-03-10 16:58:16 -04:00
Julian Lam
a7f310b49a
fixed #1189
2014-03-10 15:31:47 -04:00
psychobunny
65b49d5de8
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-10 14:41:35 -04:00
psychobunny
116dad2858
updated widget-essentials dep to 0.0.11
2014-03-10 14:41:32 -04:00
barisusakli
656ec227e9
merge
2014-03-10 14:39:40 -04:00
barisusakli
78f9c25c9c
added autocomplete to jquery fixed search results
2014-03-10 14:36:29 -04:00
psychobunny
337b3a2aa7
updated nodebb dependencies
2014-03-10 14:34:52 -04:00
psychobunny
d61a75a5c2
updated deprecation notices
2014-03-10 01:30:29 -04:00
psychobunny
2cde4508b0
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
2014-03-10 01:28:13 -04:00
psychobunny
23983c4c80
cleanup - search routes
2014-03-10 01:07:37 -04:00
barisusakli
71f84655ca
minor cleanup
2014-03-10 00:17:06 -04:00
barisusakli
b413f06b72
removed unused function from groups, jshint
2014-03-09 23:51:09 -04:00
psychobunny
a68ba044c3
fixed missing topic_name and viewcount when reverse infinite scrolling
2014-03-09 23:48:22 -04:00
psychobunny
30cfddda68
fix for topics view count, and marking topics as unread
2014-03-09 23:20:59 -04:00
barisusakli
16d2e65ea0
optimized getCategories
2014-03-09 23:09:08 -04:00
psychobunny
857df86726
fixed pagination, and loading of template blocks on cold load (temp solution)
2014-03-09 22:35:09 -04:00
psychobunny
6ea4d89edc
fixed search routes
2014-03-09 21:43:35 -04:00
psychobunny
875c8ed66c
console.log
2014-03-09 21:21:57 -04:00
psychobunny
62afe65ccf
bugfix + deprecated templates.getTemplateNameFromUrl
2014-03-09 21:05:01 -04:00
psychobunny
712c382a28
optimizing ajaxify (still needs work though)
2014-03-09 20:48:15 -04:00
psychobunny
4e54d500c0
fix bug where inactive plugin templates were being compiled as well
2014-03-09 20:45:37 -04:00
psychobunny
4793b6b4f9
fixed invalid path for apple-touch-icon
2014-03-09 20:08:51 -04:00
psychobunny
a99be8e7be
got rid of all the res.locals.isAPI checks in all controller methods. now 1000% cleaner :shipit:
2014-03-09 20:05:14 -04:00
psychobunny
faf3de7e27
added a check for res.locals.isAPI inside res.render, instead of doing it all over the place in code
2014-03-09 19:54:16 -04:00
psychobunny
1b3f089804
fixed /admin/index 404
2014-03-09 19:47:39 -04:00
psychobunny
6acdc66470
fixed bug if default templates folder missing (in case you planned on building an entire theme from scratch)
2014-03-09 19:47:33 -04:00
psychobunny
464c2f42c3
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
public/templates/admin/themes.tpl
src/meta.js
src/routes/api.js
2014-03-09 19:19:13 -04:00
psychobunny
37840d35f0
missing variable - numCSS
2014-03-09 19:15:18 -04:00
psychobunny
68b41083ad
removing re-added templates from core
2014-03-09 19:14:50 -04:00
Gustavo Salomé Silva
475ac1e772
accept arguments on setup
...
useful if you want to setup a new instance programatically
2014-03-09 19:07:28 -03:00
barisusakli
73c89010cb
closes #1182
2014-03-09 17:29:05 -04:00
barisusakli
57f9f8bc57
closes #1176
2014-03-09 16:39:31 -04:00
psychobunny
1ef95bd09e
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
app.js
public/templates/category.tpl
public/templates/popular.tpl
public/templates/recent.tpl
public/templates/unread.tpl
src/routes/plugins.js
src/webserver.js
2014-03-09 16:07:34 -04:00
barisusakli
281c482f1c
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-09 14:02:33 -04:00
barisusakli
6496b91c29
closes #1180
2014-03-09 14:02:30 -04:00
Julian Lam
4309fe3192
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-09 00:47:25 -05:00
Julian Lam
820cdf8a47
temporarily removing cronjob until upstream bugs are fixed -- resolved #1178
2014-03-09 00:47:21 -05:00
barisusakli
ec86aafb48
return user object
2014-03-09 00:20:29 -05:00
barisusakli
b4b9ed1841
optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data
2014-03-09 00:16:05 -05:00
barisusakli
1568c50906
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-08 17:41:51 -05:00
barisusakli
23e1cc010c
removed removeHiddenFields function, using mongo selector instead
2014-03-08 17:41:23 -05:00
Julian Lam
6fb393de78
fixing #1177
2014-03-08 16:50:32 -05:00
Julian Lam
f00f7c8818
fixed apple-touch-icon for subfolder installs
2014-03-08 16:08:52 -05:00
Julian Lam
d9d04a3982
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-08 16:04:43 -05:00
Julian Lam
5a8a3627d2
bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER
2014-03-08 16:04:22 -05:00
barisusakli
7fa8f5ef36
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-08 15:45:56 -05:00
barisusakli
284276cbb6
messaging jshint
2014-03-08 15:45:42 -05:00
psychobunny
f99c1f9921
removed code climate badge until analysis is complete
2014-03-08 02:56:24 -05:00
psychobunny
e84dd4fd94
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
public/templates/accountedit.tpl
public/templates/header.tpl
src/routes/meta.js
src/webserver.js
2014-03-07 19:21:40 -05:00
Julian Lam
c9642cecd2
setting Lavender as default theme for 0.4.0, woo!
2014-03-06 23:24:47 -05:00
Baris Soner Usakli
e51016ee66
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-06 20:53:51 -05:00
Baris Soner Usakli
30130b2d62
set back to false when loading indicator fades out
2014-03-06 20:53:41 -05:00
Julian Lam
90b29031fe
backwards compatibility with older plugins using css with staticDir
2014-03-06 20:36:05 -05:00
Julian Lam
6a31bd9af6
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-06 19:48:54 -05:00
Julian Lam
552a63367d
workaround for problem arising from switch to Date.UTC()
2014-03-06 19:48:38 -05:00
Baris Soner Usakli
6a824a2e10
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-06 17:57:15 -05:00
Baris Soner Usakli
7dfdab0a2d
search page change
2014-03-06 17:57:07 -05:00
Julian Lam
5880590425
removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change.
...
fixes #1168
2014-03-06 17:51:17 -05:00
psychobunny
23e4eb7cd9
deprecating filter:server.create_routes and filter:admin.create_routes; maintains limited functionality but recommended you migrate asap
2014-03-06 16:49:32 -05:00
psychobunny
7183fda2eb
console.log
2014-03-06 16:48:55 -05:00
psychobunny
bcd8137d0e
console.log
2014-03-06 16:47:59 -05:00
psychobunny
55a7838725
temporary templateMapping fix for admin side; will come back to this after merging this branch
2014-03-06 16:00:17 -05:00
Julian Lam
958e85a31f
updated readme to point to wiki for platform specific install docs
2014-03-06 15:56:14 -05:00
Julian Lam
4add89cea4
Merge branch 'master' of github.com:tparnell8/NodeBB into tparnell8-master
2014-03-06 15:40:07 -05:00
Julian Lam
1f23642ab4
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-06 15:38:02 -05:00
Julian Lam
b2bc1d4555
setting password to null in getUserData, because Object.delete is bad? :P (thanks @barisusakli)
2014-03-06 15:37:29 -05:00
Julian Lam
e9e53ad95e
added a new property to userData "hasPassword", disabling "current password" field in user editing if no password is set (for SSO logins, for example)
2014-03-06 15:32:06 -05:00
Baris Soner Usakli
d34e68ca25
convert score to int in mongo
2014-03-06 15:31:10 -05:00
Baris Soner Usakli
acd4771012
dbmock changes
2014-03-06 15:11:29 -05:00
Baris Soner Usakli
da0e1a8eb9
added back err to redis flushdb
2014-03-06 14:52:34 -05:00
Baris Soner Usakli
4986c8ed3a
fixed tests
2014-03-06 14:51:43 -05:00
psychobunny
8c8055fbae
fix for multiple synchronous hooks (synchronous hooks to be deprecated in 0.4x)
2014-03-06 14:23:48 -05:00
psychobunny
178edd150a
moved action:app.load out of webserver; passing in app, mdw, and controllers into action:app.load. now we can create routes dynamically ;)
2014-03-06 14:09:10 -05:00
psychobunny
a9cccc9b9c
allow hooks to accept single/multiple arguments instead of requiring you to send in a hash
2014-03-06 14:07:56 -05:00
Baris Soner Usakli
7135e9424c
closes #1167
2014-03-06 13:32:26 -05:00
Baris Soner Usakli
3fe9bdc24c
removed the postbar selector from activeusers
2014-03-06 13:08:22 -05:00
psychobunny
a9046b926d
clean templates directory before beginning compilation
2014-03-06 12:25:10 -05:00
psychobunny
90a80ad83d
plugins can now define a templates directory which gets compiled onload without requiring any hooks
2014-03-06 12:06:19 -05:00
psychobunny
c054ae121b
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
2014-03-06 10:56:36 -05:00
Julian Lam
4a1513eabf
fixed #1161 properly - Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/upgrade.js
2014-03-06 10:35:12 -05:00
Barış Soner Uşaklı
b79169a765
Merge pull request #1161 from code-press/master
...
Upgrade script incorrectly looking for "err"
2014-03-06 01:24:32 -05:00
Anthony Webb
21b1bc1729
Revert "Remove text"
...
This reverts commit c25835c63e
2014-03-06 00:13:13 -06:00
Anthony Webb
6f8ed7f073
err doesnt exist here
2014-03-06 00:07:07 -06:00
Anthony Webb
d9ca95a5a3
Merge remote-tracking branch 'upstream/master'
2014-03-06 00:04:47 -06:00
psychobunny
f20a2a2047
merging changes from deprecated routes/user.js
2014-03-06 00:52:12 -05:00
psychobunny
8a05eee1f5
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
src/routes/user.js
2014-03-06 00:51:36 -05:00
Baris Soner Usakli
096f352c82
closes #1130
2014-03-05 23:00:27 -05:00
Julian Lam
e956c19587
#1110 - moved isEmailAvailable into User.email
2014-03-05 21:21:53 -05:00
Julian Lam
e0dcf95138
fixed missing err in upgrade script
2014-03-05 21:19:36 -05:00
Baris Soner Usakli
38145abae1
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-05 20:37:40 -05:00
Baris Soner Usakli
58cb51bb02
removed unused imagemagick require
2014-03-05 20:37:31 -05:00
Julian Lam
b404b0197f
final pass, resolved #1155
2014-03-05 19:51:16 -05:00
Julian Lam
5f52ef5f01
removed all 0.3.x related upgrade scripts, and updated minSchemaDate
2014-03-05 19:41:16 -05:00
Julian Lam
64aa89f5ee
updating upgrade script to use UTC timestamps *facepalm*. God, I hope I didn't break anything...
...
(first pass #1155 )
2014-03-05 19:33:10 -05:00
psychobunny
34552f7fb0
added middleware.guestSearchingAllowed to the actual search API call
2014-03-05 17:37:54 -05:00
psychobunny
542f937589
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
src/routes/api.js
2014-03-05 17:35:41 -05:00
psychobunny
b9e119241e
moved get_custom_templates into plugins.js
2014-03-05 17:23:08 -05:00
psychobunny
8f7a7fec7d
more cleanup; commenting out custom plugin routes until its fixed properly
2014-03-05 17:13:55 -05:00
psychobunny
c0cd6148f4
one final push, cleanup + organize + lint; made feeds/meta/plugins routes follow same pattern as other route files
2014-03-05 17:06:24 -05:00
Baris Soner Usakli
c028761857
new route to get recent posts
2014-03-05 16:49:42 -05:00
psychobunny
1dbc47b890
deps cleanup
2014-03-05 16:25:55 -05:00
psychobunny
73d637096c
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
public/templates/account.tpl
public/templates/accountposts.tpl
public/templates/favourites.tpl
public/templates/search.tpl
2014-03-05 15:59:50 -05:00
psychobunny
3efca794fd
regex cleanup; fixed indenting on partials
2014-03-05 15:58:43 -05:00
Baris Soner Usakli
6f806d80c2
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-05 15:39:02 -05:00
Baris Soner Usakli
c9c25bd174
added getRecentPost
2014-03-05 15:38:54 -05:00
Julian Lam
6192af18ab
Merge pull request #1159 from BitBangersCode/settings-callback
...
Send the callback to the retry
2014-03-05 15:37:45 -05:00
psychobunny
67517c58e3
added warning if partial template was not found
2014-03-05 15:31:02 -05:00
psychobunny
d442e10037
template compilation + partials support
2014-03-05 15:13:54 -05:00
MrWaffle
33a5a2177e
Send the callback to the retry
2014-03-05 20:57:32 +01:00
Baris Soner Usakli
976744480f
post summary change
2014-03-05 14:52:32 -05:00
David Hoff
c25835c63e
Remove text
2014-03-05 13:59:59 -05:00
psychobunny
3614211f0e
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
public/templates/accountposts.tpl
public/templates/header.tpl
2014-03-04 17:52:15 -05:00
psychobunny
552eb78db8
template compiling init; changing themes now finally works on this branch
2014-03-04 17:49:56 -05:00
psychobunny
88e5ddac76
deprecating hook events on body
2014-03-04 17:22:45 -05:00
psychobunny
c67182204f
clean-up + bugfixes
2014-03-04 17:20:12 -05:00
psychobunny
444956d517
deprecated loadTemplates client-side as well
2014-03-04 17:16:12 -05:00
psychobunny
68d526b762
deprecated templates.ready, templates.init, templates.loadServer; start webserver immediately without having to wait for templates.js
2014-03-04 17:14:01 -05:00
psychobunny
d471ea2d5b
app.create_route removed
2014-03-04 17:11:40 -05:00
psychobunny
da331a1e6b
clean up in routes/admin.js
2014-03-04 17:10:51 -05:00
psychobunny
fe147bfb67
have supervisor ignore public/templates folder
2014-03-04 17:08:30 -05:00
psychobunny
f73fd1eeae
removed an unused hack in utils.js
2014-03-04 17:08:15 -05:00
Baris Soner Usakli
76d8d09f9b
closes #1141
2014-03-04 16:48:07 -05:00
psychobunny
1dc63caf77
using views_dir config
2014-03-04 16:12:02 -05:00
psychobunny
d4f453cde3
added gitignore to public/templates dir
2014-03-04 16:11:03 -05:00
psychobunny
a3a0aabd22
return error if template doesn't exist
2014-03-04 16:08:02 -05:00
psychobunny
66ef8c8284
removed vanilla templates from core into nodebb-theme-vanilla :shipit:
2014-03-04 16:07:50 -05:00
Baris Soner Usakli
d100a41ce7
fixes topic follow
2014-03-04 15:23:26 -05:00
psychobunny
6e8c618fb1
prevent translator crash if data is undefined; linted/cleanup
2014-03-04 15:18:05 -05:00
psychobunny
cd336006fc
optimized cold loading
2014-03-04 15:02:05 -05:00
Baris Soner Usakli
8c11299197
template language fix
2014-03-04 14:56:05 -05:00
psychobunny
10f4fa004e
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
2014-03-04 14:53:31 -05:00
psychobunny
48df0cf889
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
...
Conflicts:
src/routes/admin.js
2014-03-04 14:50:44 -05:00
Barış Soner Uşaklı
81378e071b
Merge pull request #1157 from MakerStudios/alertclose_nofire_click
...
Don't fire click when closing an alert
2014-03-04 13:43:04 -05:00
Julian Lam
9b53dd1014
english fallback for 'reset_password' translations
2014-03-04 13:35:20 -05:00
medwards20x6
76b53478ce
Don't fire click when closing an alert
2014-03-04 10:30:44 -08:00
Baris Soner Usakli
b28e4846a4
fixed disconnect check
2014-03-04 13:28:24 -05:00
Baris Soner Usakli
3c97ef6829
closes #1156
2014-03-04 13:09:58 -05:00
Baris Soner Usakli
dbb814fe4e
category permission page fixes
2014-03-04 12:54:25 -05:00
Baris Soner Usakli
7bb3766ebd
2 column layout for admin index
2014-03-03 22:05:25 -05:00
Baris Soner Usakli
814db2e1d8
icon first
2014-03-03 17:52:00 -05:00
Baris Soner Usakli
4b64b9dcdc
closes #951
2014-03-03 17:46:54 -05:00
Baris Soner Usakli
1f7a717bf0
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-03 17:24:52 -05:00
Baris Soner Usakli
50f83abf75
closes 1150
2014-03-03 17:24:38 -05:00
psychobunny
c24c2a5422
search and reset routes, the very last of the views to be refactored :shipit:
2014-03-03 17:16:53 -05:00
psychobunny
8802fc5a33
fixing link tags; misc bug fixes
2014-03-03 16:56:35 -05:00
psychobunny
d3aead7c13
changing renderHeader function signature to req, res, next
2014-03-03 16:54:28 -05:00
Julian Lam
57d0273c13
dutch translations
2014-03-03 16:40:57 -05:00
psychobunny
48b9289002
use the proper footer for admin
2014-03-03 16:40:26 -05:00
psychobunny
7ef6f9bbf5
buckled down and refactored pretty much all of admin routes x_x
2014-03-03 16:35:21 -05:00
Julian Lam
8846f7fb9b
fixing mappedPath in windows
2014-03-03 16:32:41 -05:00
Baris Soner Usakli
37aeda14c4
fixed email retrieval in mongo
2014-03-03 16:16:41 -05:00
Baris Soner Usakli
be70b3de57
closes #1090
2014-03-03 15:26:15 -05:00
Baris Soner Usakli
529cd60dd2
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-03 14:46:57 -05:00
Baris Soner Usakli
70299ea5c2
better search result page
2014-03-03 14:46:50 -05:00
psychobunny
c26af77a24
fixing cold load of admin/index
2014-03-03 14:43:25 -05:00
psychobunny
d360320441
finally got admin header and footer working 👍
2014-03-03 14:30:39 -05:00
psychobunny
eed97648b1
started moving admin mdw into middleware/admin.js; res.render post-processing to append admin footer/header
2014-03-03 13:17:10 -05:00
psychobunny
e588762aa0
yes, I've finally started on the dreaded admin refactor (not much else left to do :/)
2014-03-03 12:50:21 -05:00
psychobunny
209bcaba8c
middleware.updateLastOnlineTime; middleware.prepareAPI (reinstated)
2014-03-03 12:49:47 -05:00
Julian Lam
9c55b202e7
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-03 12:47:43 -05:00
Julian Lam
dc8839b63c
updating validator to 3.4.0
2014-03-03 12:47:40 -05:00
psychobunny
f943a194b6
added plugin deprecation notices to NOTES.md
2014-03-03 12:39:58 -05:00
psychobunny
f785f7f6e3
added deprecation notice to plugins/fireHook
2014-03-03 12:37:57 -05:00
psychobunny
94aeb3ab22
notifications route; added middleware.authenticate to user/uploadpicture api route
2014-03-03 12:30:27 -05:00
psychobunny
5b8e8e4b67
deprecating use of templates.setGlobal on server side in favour of passing in api.config into res.locals (still needs work)
2014-03-03 12:16:46 -05:00
psychobunny
188aeabba8
missed a file in previous commit
2014-03-03 11:45:40 -05:00
psychobunny
7bef58deb1
started moving out api functionality out of the route file into controllers/api.js
2014-03-03 11:45:23 -05:00
psychobunny
138b12e815
re-added linkTags into header; clean up
2014-03-03 11:44:52 -05:00
psychobunny
d18ce28de0
fixxed categories.get; privileges object and currentPage were missing on original route
2014-03-03 11:28:31 -05:00
Julian Lam
64ee792013
fixed #1154
2014-03-03 11:12:28 -05:00
Julian Lam
5a8fa9b1f7
fixed regression in groups management modal
2014-03-03 11:07:37 -05:00
psychobunny
c5066ed100
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
2014-03-03 10:40:56 -05:00
Julian Lam
30e83fdabe
fixing upgrade script if order is not set
2014-03-03 10:17:11 -05:00
psychobunny
31d576e9ed
deprecation notice
2014-03-03 00:22:10 -05:00
psychobunny
fe9d4efa98
moved api-only routes into routes/api.js, cleanup & linting
2014-03-03 00:12:25 -05:00
psychobunny
d75bc9578b
deprecating middleware.prepareAPI in favour of using app.all('*') in /api namespace
2014-03-02 23:49:15 -05:00
psychobunny
5b25e21606
console.log
2014-03-02 23:45:41 -05:00
psychobunny
8ad24818df
fixed FOUS in category sidebar
2014-03-02 23:40:31 -05:00
psychobunny
71675d0aa0
removed required "ajaxifying" class for #content - breaks browsers with noscript turned on.
2014-03-02 23:36:27 -05:00
psychobunny
88ca3733a7
more jshinting
2014-03-02 23:07:16 -05:00
psychobunny
d20501b29d
meta.js merge conflict
2014-03-02 22:59:57 -05:00
psychobunny
cdf92c5cda
fixed a really annoying bug - the original topics route pre-refactor never actually included a privileges object
2014-03-02 22:54:03 -05:00
psychobunny
c44934cc0d
all JS files properly required on cold load
2014-03-02 22:51:40 -05:00
psychobunny
52a50a80ba
templates.parseTemplateVariables, added optional callback
2014-03-02 22:48:18 -05:00
psychobunny
b9264dea76
ajaxify.loadScript
2014-03-02 22:47:14 -05:00
Julian Lam
fc53385ede
removing socket.io library from minfile
2014-03-02 22:34:57 -05:00
psychobunny
fa2b5d1ee6
re-implementing meta and link tags - completified
2014-03-02 22:15:27 -05:00
psychobunny
3eb9f65c2e
jshinting controllers/index.js; adding back meta tags to home page
2014-03-02 22:12:08 -05:00
psychobunny
8df33e65ac
fixing bug in topics causing meta tags to revert on subsequent refresh
2014-03-02 22:10:57 -05:00
Julian Lam
044347ebca
hotfix for vanilla missing socket.io lib
2014-03-02 22:02:55 -05:00
Julian Lam
aadde85e1b
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-02 20:41:49 -05:00
Julian Lam
28832a2540
fixing bug where sometimes a pidfile was left over, and nodebb would refuse to start a daemon again.
2014-03-02 20:37:57 -05:00
Baris Soner Usakli
f5ec24e925
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-02 20:01:01 -05:00
Baris Soner Usakli
016642bc16
show 1 ip per line
2014-03-02 20:00:54 -05:00
Julian Lam
34336a1069
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-02 19:56:27 -05:00
Julian Lam
1837a8443c
shifting socket.io back to the end :\
2014-03-02 19:55:50 -05:00
Baris Soner Usakli
98fa8c419d
closes #1152
2014-03-02 19:55:26 -05:00
Baris Soner Usakli
55b5d0c209
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-02 16:58:56 -05:00
Baris Soner Usakli
e4b6d0e1ff
closes #1096
2014-03-02 16:58:49 -05:00
Julian Lam
a8d2b46911
fixed incorrect path in plugin script inclusion
2014-03-02 16:44:41 -05:00
Julian Lam
e70bc9f163
added deprecation warning for plugins using filter:scripts.get
2014-03-02 16:33:45 -05:00
Julian Lam
5553e07bbd
moving socket.IO client lib to top of file, just in case
2014-03-02 16:29:21 -05:00
Julian Lam
4c2a6953f1
concatenating the client scripts, instead of compressing, in development mode
2014-03-02 15:34:12 -05:00
psychobunny
dbbbe21883
re-implementing meta and link tags part 1
2014-03-02 15:14:38 -05:00
psychobunny
6820e9e662
random jshinting expedition
2014-03-02 14:45:57 -05:00
psychobunny
f0dfee5402
clean up
2014-03-02 14:21:24 -05:00
psychobunny
6c3c669e31
moved middleware out of webserver.js and into middleware.js
2014-03-02 14:16:16 -05:00
psychobunny
936e52a43f
require db
2014-03-02 14:00:28 -05:00
Julian Lam
3860abdc24
plugins can now pass in scripts in plugin.json, and they will be bundled into nodebb.min.js
2014-03-02 13:58:25 -05:00
psychobunny
4d598dcd63
moved process events out of webserver.js and into app.js
2014-03-02 13:56:46 -05:00
psychobunny
ee5596fad5
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
2014-03-02 13:51:34 -05:00
Julian Lam
14d7453a23
bundling socket.io client library into minfile, minfile always used from this point forward, even in development mode.
...
Development mode will not compress the scripts, but will just concatenate.
2014-03-02 13:28:09 -05:00
Julian Lam
033c5d5726
es, fr, nb, sv, zh_CN translations
2014-03-02 11:06:21 -05:00
Baris Soner Usakli
5732994097
reset_code click fix
2014-03-01 23:18:05 -05:00
Baris Soner Usakli
feeb220514
removed console.log
2014-03-01 22:52:30 -05:00
Baris Soner Usakli
1b7f8cc5cb
active users fix
2014-03-01 22:51:39 -05:00
Baris Soner Usakli
fb691b23b4
moved topic locked check to topic.reply
2014-03-01 22:03:21 -05:00
Julian Lam
77f5d6ff7d
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-01 22:00:28 -05:00
Julian Lam
1c324f45cf
tried fixing absentee detection in active users
2014-03-01 21:59:51 -05:00
Baris Soner Usakli
c6ff8e1042
#1148
2014-03-01 21:55:29 -05:00
Julian Lam
079ed10631
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-01 21:32:43 -05:00
Julian Lam
2b178ff76d
proper tracking of users' reply status when others enter the room
2014-03-01 21:31:50 -05:00
Baris Soner Usakli
2966cc4a49
minor fix
2014-03-01 19:18:15 -05:00
Baris Soner Usakli
b2f9184562
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-01 19:15:25 -05:00
Baris Soner Usakli
b6d97281d3
closes #1015
2014-03-01 19:15:18 -05:00
Julian Lam
a9b78d2600
minimizing the composer should unregister it
2014-03-01 17:49:39 -05:00
Julian Lam
68fb6ec09a
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-01 17:36:30 -05:00
Baris Soner Usakli
42a7c037e6
removed dupe i var
2014-03-01 17:36:29 -05:00
psychobunny
f46e563b8a
moved all route definitions in webserver.js into routes/index.js
2014-03-01 17:35:47 -05:00
Julian Lam
f2ffc2b533
properly referencing the tid of the composer instead of blindly checking templates.get('topic_id')
2014-03-01 17:34:06 -05:00
psychobunny
08a9ce4950
moved all app.configure() code into middleware/index.js + organization/cleanup
2014-03-01 17:26:26 -05:00
Baris Soner Usakli
8cda88790e
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-01 17:11:59 -05:00
Baris Soner Usakli
3c6e4ebda1
possible fix to #1148
2014-03-01 17:11:49 -05:00
Julian Lam
fcb44ae256
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-01 17:06:02 -05:00
Julian Lam
d012d237bf
added back clearInterval
2014-03-01 17:05:57 -05:00
Baris Soner Usakli
c4d1c8feff
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-01 16:59:13 -05:00
Baris Soner Usakli
87f337f2fb
cleanup
2014-03-01 16:59:04 -05:00
Julian Lam
7ef84e0daa
switched to 'ping active' system
2014-03-01 16:53:41 -05:00
Julian Lam
7ff9fa1a44
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-03-01 15:46:27 -05:00
Julian Lam
b3d7ae1c86
showing who is replying in the active users block
2014-03-01 15:46:13 -05:00
Baris Soner Usakli
0c9ab5e93f
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-03-01 15:45:55 -05:00
psychobunny
804da0d8de
removed unused deps in webser.js
2014-03-01 15:45:47 -05:00
Baris Soner Usakli
fff3ba5bec
hinted redis.js
2014-03-01 15:45:43 -05:00
psychobunny
26853d024e
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
2014-03-01 15:37:57 -05:00
Tommy Parnell
97cb11628d
Installation instructions CentOS 6.5
...
ReadME.MD Adding installation instructions for CentOS 6.5, also adding npm strict-ssl to false to allow some npm packages that have self signed certs.
2014-03-01 15:37:02 -05:00
Julian Lam
ea222a4295
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-28 23:38:29 -05:00
Julian Lam
0fecbf7cbf
entity decoding in filenames
2014-02-28 23:38:04 -05:00
Baris Soner Usakli
8eca195530
updateHeader once on load
2014-02-28 22:08:33 -05:00
Julian Lam
6bc759748f
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-28 20:51:17 -05:00
Julian Lam
1f136c6a72
ninjafix to mappedPath
2014-02-28 20:51:12 -05:00
Baris Soner Usakli
24b669bd39
some fixes for search plugin
2014-02-28 20:47:49 -05:00
Julian Lam
1c19ae48bd
fixed #1143 -- also removed near-meaningless info messages saying that a Hook had been registered.
2014-02-28 20:39:27 -05:00
Julian Lam
5540313b7f
fixing path resolution for plugins in production mode
2014-02-28 20:13:28 -05:00
Julian Lam
5e2460e17e
fixed #1144
2014-02-28 20:05:19 -05:00
Julian Lam
ac915c1190
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-28 19:56:20 -05:00
Julian Lam
d63ff461f3
changed executable to not run watch-mode using the loader
2014-02-28 19:56:00 -05:00
Baris Soner Usakli
84dc012198
closes #1142
2014-02-28 18:17:17 -05:00
Baris Soner Usakli
e75c303b89
added unique visitor count to admin dashboard
2014-02-28 17:19:42 -05:00
Baris Soner Usakli
7081c7dcc4
moved ip log to api
2014-02-28 16:50:39 -05:00
psychobunny
e73f8d6f37
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
2014-02-28 16:42:05 -05:00
psychobunny
4b2f5cbfab
added NOTES.md to start keeping track of breaking changes in 0.4x refactoring
2014-02-28 16:27:43 -05:00
psychobunny
0211b4484b
on cold load, only display page after widgets are rendered
2014-02-28 16:24:56 -05:00
psychobunny
6f21547a8d
ajaxify.fadeIn, ajaxify.fadeOut
2014-02-28 16:24:25 -05:00
Baris Soner Usakli
9069f9aedc
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-28 16:23:53 -05:00
Baris Soner Usakli
6bf36a0468
if alert is closed dont fire clickfn
2014-02-28 16:23:46 -05:00
Julian Lam
6a649f9b9a
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-28 16:21:09 -05:00
Julian Lam
561b42d0f9
new staticDirs format, @mrwaffle
2014-02-28 16:21:02 -05:00
psychobunny
6827dbc9c4
render widgets on cold load
2014-02-28 16:17:35 -05:00
Baris Soner Usakli
eea677655f
minor clean up to categories.js
2014-02-28 16:13:19 -05:00
psychobunny
23c283f06c
ajaxify.getTemplateMapping
2014-02-28 16:13:00 -05:00
psychobunny
49997639e9
moved widget rendering code into ajaxify.renderWidgets
2014-02-28 16:08:25 -05:00
psychobunny
584347848b
trigger action:ajaxify.start and action:ajaxify.end on cold load
2014-02-28 16:08:13 -05:00
psychobunny
f35c14ee07
bugfixes + cleanup for accounts and users routes
2014-02-28 15:58:29 -05:00
Baris Soner Usakli
eac201cae9
no need to do these on every ajaxify into categories
2014-02-28 15:56:30 -05:00
Baris Soner Usakli
7eae79cee9
anons cant chat
2014-02-28 15:36:57 -05:00
psychobunny
fa103b2d6e
finally done with routes/user.js; accounts.getUserByUID; bug fixing and cleanup
2014-02-28 15:33:25 -05:00
psychobunny
08d3d9feb3
accounts.uploadPicture
2014-02-28 15:26:39 -05:00
Baris Soner Usakli
ccd29bfd61
added callback to category update
2014-02-28 15:25:50 -05:00
psychobunny
e67f6d2169
re-added filter:footer.build temporarily - to be deprecated for 0.4x
2014-02-28 15:15:00 -05:00
psychobunny
607bc8545b
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
2014-02-28 14:35:00 -05:00
psychobunny
cb15655c9c
app.checkAccountPermissions middleware; some clean up & bug fixes
2014-02-28 14:34:35 -05:00
psychobunny
bfcb61f37d
forgot to port getUserDataByUserSlug
2014-02-28 14:22:49 -05:00
psychobunny
d072ad60de
all users/ pages converted
2014-02-28 14:19:43 -05:00
psychobunny
7c873c4314
decided to functionally separate accounts from users
2014-02-28 14:08:06 -05:00
psychobunny
e64d87cb1d
all user account pages; all static pages; outgoing page
2014-02-28 14:04:21 -05:00
psychobunny
db0ad5b57c
Merge pull request #1140 from mathisonian/patch-1
...
fix error with undefined callback
2014-02-28 13:07:49 -05:00
Matthew Conlen
a2a9c8fd8a
fix error with undefined callback
2014-02-28 12:58:05 -05:00
Baris Soner Usakli
8064f7f0db
scroll fix
2014-02-28 00:59:35 -05:00
Baris Soner Usakli
9b4ca12dc1
fixed missing var, posts.js cleanup
2014-02-28 00:14:11 -05:00
Baris Soner Usakli
8c6af7ef59
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-27 23:45:19 -05:00
Baris Soner Usakli
091723a8c5
closes #1101
2014-02-27 23:45:12 -05:00
Julian Lam
ed0a17b94a
reoad, lol
2014-02-27 23:24:52 -05:00
Julian Lam
20b5d577dd
ability to restart nodebb via executable
2014-02-27 20:36:04 -05:00
psychobunny
00df660fa5
robots + sitemap; some clean up
2014-02-27 17:16:06 -05:00
psychobunny
942d16a3b4
confirmEmail route
2014-02-27 17:04:41 -05:00
psychobunny
dae7b06f4d
initial login and register routes
2014-02-27 16:52:46 -05:00
psychobunny
e193d58112
unreadTotal route
2014-02-27 16:39:34 -05:00
psychobunny
08c0a7fa5e
removing old unread and recent routes
2014-02-27 16:38:10 -05:00
psychobunny
beafc881c4
added recent and unread in categoriesController
2014-02-27 16:35:29 -05:00
psychobunny
062e35c89e
app.authenticate middleware; added new recent, unread routes
2014-02-27 16:34:58 -05:00
Baris Soner Usakli
0682b5c5ea
fix admin users link
2014-02-27 15:44:34 -05:00
Baris Soner Usakli
389fc787a3
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-27 15:35:58 -05:00
Baris Soner Usakli
c49c3e3550
fixed jquery ui package
2014-02-27 15:35:50 -05:00
psychobunny
4435a20d90
fixed merge conflict
2014-02-27 15:11:50 -05:00
psychobunny
96d6b96ce4
controllers.home
2014-02-27 15:06:39 -05:00
psychobunny
c084529597
removed old api/home and api/popular
2014-02-27 14:56:54 -05:00
psychobunny
ad222dce2a
controller indexx
2014-02-27 14:56:14 -05:00
psychobunny
233e49fd34
topics controller
2014-02-27 14:56:05 -05:00
psychobunny
62a4b419e3
categories controller
2014-02-27 14:55:53 -05:00
psychobunny
27b99d5c56
webserver.js refactor init
2014-02-27 14:55:41 -05:00
psychobunny
1db0651bff
removing old api/popular code
2014-02-27 14:44:47 -05:00
psychobunny
4a33b41464
deprecating loadServer in favour of using res.render
2014-02-27 14:44:19 -05:00
Julian Lam
e2fb3dacca
pushing new language fallbacks
2014-02-27 14:10:13 -05:00
Julian Lam
dfd13fac0d
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-27 14:05:55 -05:00
Julian Lam
44ac7ec262
added new hooks for rendering help messages in composer, removed markdown text from translation
2014-02-27 14:05:31 -05:00
Baris Soner Usakli
30eb85f96e
fixed conflicts
2014-02-27 12:46:37 -05:00
Baris Soner Usakli
44d40fba35
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-27 12:15:34 -05:00
Baris Soner Usakli
0ca6c58ded
closes #1137
2014-02-27 12:15:26 -05:00
Julian Lam
1a85d45567
portuguese and slovak translations
2014-02-27 10:41:59 -05:00
Julian Lam
a7c53519b6
updated executable help
2014-02-27 10:30:09 -05:00
Julian Lam
c7274e11d0
removing the bit of code that disables plugins if the minver does not satisfy (too annoying imo)... now that we have ./nodebb reset, this is moot
2014-02-27 10:28:49 -05:00
Julian Lam
4567e5fbd0
updated help blurb in executable
2014-02-27 10:13:36 -05:00
Julian Lam
5b301772bb
added daemon capability to ./nodebb start, npm start/stop scripts
2014-02-27 10:06:31 -05:00
Baris Soner Usakli
38e4a6c8b0
better check
2014-02-27 01:51:33 -05:00
Baris Soner Usakli
b8c089cfaa
added check for invalid tags
2014-02-27 01:43:24 -05:00
Baris Soner Usakli
fb1313ec90
load config change
2014-02-27 01:32:20 -05:00
Baris Soner Usakli
dcd3975933
closes #1135
2014-02-27 00:45:29 -05:00
akhoury
2209a55afc
- changes per PR conversation
2014-02-26 23:34:03 -05:00
akhoury
0070e1158e
removing a boolean left out from the addEventListener definition
2014-02-26 22:32:09 -05:00
Baris Soner Usakli
72aa22d824
removed unused timestamp
2014-02-26 22:19:01 -05:00
akhoury
3f1d5c6656
merge fork with upstream master
2014-02-26 22:01:29 -05:00
Baris Soner Usakli
87ccfdf5eb
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-26 21:58:12 -05:00
Baris Soner Usakli
d87034b131
use alert for bookmark
2014-02-26 21:58:04 -05:00
akhoury
1b207d8276
IE8 support, general cleanups, from native to $ objects ...
2014-02-26 21:55:29 -05:00
akhoury
b59c10a1e9
took out some overrides out utils to a new overrides.js
2014-02-26 21:49:22 -05:00
Julian Lam
ef2dbe8df6
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-26 21:10:15 -05:00
Julian Lam
04b2887d88
fixed it language code
2014-02-26 21:10:05 -05:00
Baris Soner Usakli
81f4767687
user.js hint
2014-02-26 21:04:20 -05:00
Baris Soner Usakli
6a962655e4
jshint for topics.js
2014-02-26 20:38:49 -05:00
Baris Soner Usakli
f1f7b59d58
missed this one
2014-02-26 20:31:30 -05:00
Baris Soner Usakli
d398d4c613
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-26 19:55:34 -05:00
Baris Soner Usakli
99bf882a1c
removed cid from getTopicsByTids
2014-02-26 19:55:28 -05:00
Barış Soner Uşaklı
1ca1ace053
Update README.md
2014-02-26 19:45:07 -05:00
Baris Soner Usakli
ad37715972
empty array if not topics in catgory
2014-02-26 17:34:02 -05:00
Baris Soner Usakli
d5268f5497
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-26 17:17:02 -05:00
Baris Soner Usakli
56bbeb9950
use disableSocialButtons from config
2014-02-26 17:16:55 -05:00
psychobunny
2247a8b21f
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-26 17:00:07 -05:00
psychobunny
aee2b2ecd0
allow express to serve parsed tpls via res.render
2014-02-26 17:00:03 -05:00
Baris Soner Usakli
7f2d70d7f6
minor cleanups
2014-02-26 16:58:02 -05:00
Baris Soner Usakli
a83d4a9dd5
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-26 16:43:28 -05:00
Baris Soner Usakli
ea6cf3bbd5
more cleanup and changes to topics
2014-02-26 16:43:21 -05:00
psychobunny
87baeebc3f
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-26 15:58:45 -05:00
psychobunny
5145ba1aac
added a route to get moderators by category id
2014-02-26 15:58:42 -05:00
Baris Soner Usakli
d149622f0b
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-26 15:32:40 -05:00
Baris Soner Usakli
8da7a6f2f3
cleanup
2014-02-26 15:32:32 -05:00
Julian Lam
74d6392bec
added Dutch language
2014-02-26 14:55:45 -05:00
Julian Lam
c38e328377
language files for fi, it, zh_CN, pl, hu
2014-02-26 14:50:44 -05:00
Julian Lam
1397890dd8
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-26 13:45:18 -05:00
Julian Lam
7b46d66e68
having the loader play nicely with supervisor -- ./nodebb watch can now hit the restart button
2014-02-26 13:42:39 -05:00
Baris Soner Usakli
8a2266816d
make plugin names strong
2014-02-26 13:14:48 -05:00
Julian Lam
3f7e458866
fixed #1127
2014-02-25 23:06:21 -05:00
Baris Soner Usakli
947836f815
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-25 22:05:16 -05:00
Baris Soner Usakli
36bc2967c2
fix highlight on vanilla, dont replaceState if url didnt change
2014-02-25 22:05:07 -05:00
Julian Lam
815e78339f
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-25 18:14:11 -05:00
Julian Lam
101a6ab812
minifying css
2014-02-25 18:14:06 -05:00
Baris Soner Usakli
1ba3acfd03
display ips to admins/users on profile
2014-02-25 17:34:42 -05:00
Baris Soner Usakli
de3bc84fde
removed logs
2014-02-25 17:23:13 -05:00
Baris Soner Usakli
ebdfd16e48
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-25 17:21:41 -05:00
Baris Soner Usakli
cc8ac2c026
get ips if admin or self
2014-02-25 17:21:30 -05:00
Julian Lam
6545357969
fixing admin stylesheet + lavender minver
2014-02-25 17:15:46 -05:00
Julian Lam
f5d1ba4231
closed #1113
2014-02-25 17:07:27 -05:00
Julian Lam
ee44778e2b
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-25 17:00:42 -05:00
Julian Lam
309dcaee06
fixed issue where even dev mode would call the minifier for js
2014-02-25 17:00:26 -05:00
Baris Soner Usakli
9683dc27db
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-25 16:55:11 -05:00
Baris Soner Usakli
8913de4ea8
dont add post-bar to each post
2014-02-25 16:55:05 -05:00
Julian Lam
656131be39
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-25 16:52:49 -05:00
Julian Lam
12e3e45398
closed #1095 - js is now minified and saved to memory the first time it is requested (on prod mode), same with theme CSS
2014-02-25 16:50:58 -05:00
Baris Soner Usakli
3c53ebb02e
better scrolling
2014-02-25 16:33:22 -05:00
Baris Soner Usakli
23c20a2821
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-25 15:26:18 -05:00
Baris Soner Usakli
b658c68736
back doesnt work
2014-02-25 15:26:10 -05:00
Julian Lam
4c21b23ea2
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-25 15:21:10 -05:00
Julian Lam
bc1c419722
caching compiled CSS locally, so repeated calls to the stylesheet serve from cache
2014-02-25 15:20:21 -05:00
Baris Soner Usakli
a3855a47e5
check replaceState
2014-02-25 15:12:42 -05:00
Baris Soner Usakli
e050c15474
fixed conflict
2014-02-25 15:11:10 -05:00
Baris Soner Usakli
5567378234
change hash take 2
2014-02-25 15:10:50 -05:00
Julian Lam
7f11d78b82
Merge branch 'master' into less-is-moar
2014-02-25 14:59:21 -05:00
Julian Lam
e3ec4e938a
Revert "update post has in address bar, #1126 "
...
This reverts commit 4b1c8150d3
2014-02-25 14:59:07 -05:00
Baris Soner Usakli
4b1c8150d3
update post has in address bar, #1126
2014-02-25 14:51:11 -05:00
Baris Soner Usakli
7c1a46f25d
misc cleanup
2014-02-25 14:41:14 -05:00
Baris Soner Usakli
14b298eda8
cleaned updateHeader
2014-02-25 14:29:19 -05:00
Baris Soner Usakli
f39248c83b
closes #1123
2014-02-25 14:17:42 -05:00
Julian Lam
53f1e4d3d4
dedicated stylesheet.css route for LESS compilation, no longer usin less-middleware for base theme...
2014-02-25 14:13:09 -05:00
Baris Soner Usakli
fd8e7327f0
removed console.log
2014-02-25 14:05:14 -05:00
Baris Soner Usakli
7e5a7c53bd
changes to templates
2014-02-25 14:03:47 -05:00
psychobunny
156c0302c9
properly namespacing objects in templates
2014-02-25 13:15:23 -05:00
Baris Soner Usakli
037ac9180b
closes #1122
2014-02-24 20:19:31 -05:00
Baris Soner Usakli
0777c96a55
dont highlight reverse infinite loaded posts
2014-02-24 19:26:26 -05:00
Baris Soner Usakli
17f2ff0ed9
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-24 19:16:34 -05:00
Baris Soner Usakli
0da2839943
added the class for topic delete
2014-02-24 19:16:23 -05:00
Julian Lam
c48d81379b
logging unique IPs as well
2014-02-24 17:49:22 -05:00
Julian Lam
aa71f1e088
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-24 17:20:57 -05:00
Julian Lam
1710b97df5
removed console log
2014-02-24 17:20:45 -05:00
Baris Soner Usakli
2597c4fc37
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-24 17:19:56 -05:00
Baris Soner Usakli
3ed2d21eb6
fixed flag post, added highlight to scroll post
2014-02-24 17:19:49 -05:00
Julian Lam
21685f8c84
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-24 17:17:20 -05:00
Julian Lam
8557c56c45
resolved #1117
2014-02-24 17:06:41 -05:00
Baris Soner Usakli
bbc2df11e1
fixed updateTopicCount
2014-02-24 16:24:21 -05:00
Baris Soner Usakli
8feac114c3
closes #1022
2014-02-24 16:23:11 -05:00
Baris Soner Usakli
f7cdc8c68c
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-24 16:01:08 -05:00
Baris Soner Usakli
ed8e76ebce
added error check to getTopicDataWithUser
2014-02-24 16:01:01 -05:00
Barış Soner Uşaklı
9216b29b69
Update README.md
2014-02-24 15:54:43 -05:00
Baris Soner Usakli
0f8ee3a671
added instructions class
2014-02-24 15:45:30 -05:00
Baris Soner Usakli
7c49c32ad3
scroll fix
2014-02-24 15:23:26 -05:00
Baris Soner Usakli
cd9bd91ab2
fixes double hashes in share links
2014-02-24 15:10:27 -05:00
psychobunny
acafa9095f
added footer widget area to topic.tpl
2014-02-24 14:28:09 -05:00
psychobunny
71ea01edb7
switching topics.thumb conditional back
2014-02-24 13:49:47 -05:00
psychobunny
a79ca2b135
clean up ENDIF conditional if object.value is undefined and is used in an ELSE block
2014-02-24 13:49:15 -05:00
Julian Lam
1052165373
updated messages when toggling themes or plugins
2014-02-23 23:13:32 -05:00
Julian Lam
2baa381917
plugins and themes now trigger a restart
2014-02-23 23:08:54 -05:00
Julian Lam
c797d6251d
Revert "emitting alert when restart is attempted in development mode"
...
This reverts commit 059c5452ea
2014-02-23 22:52:59 -05:00
Julian Lam
059c5452ea
emitting alert when restart is attempted in development mode
2014-02-23 22:51:53 -05:00
Julian Lam
4ef1d83acd
Merge branch 'master' into nodebb-loader
2014-02-23 22:48:11 -05:00
Julian Lam
1fa3880ffc
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-23 22:45:21 -05:00
Julian Lam
216ff0f3f9
some checks for handling plugin deletion
2014-02-23 22:44:49 -05:00
psychobunny
8fe9e5ab46
auto installing nodebb-widget-essentials on new setups
2014-02-23 22:22:17 -05:00
Baris Soner Usakli
fd41d93bdb
took out if from the src
2014-02-23 22:09:06 -05:00
Baris Soner Usakli
c96d85911f
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-23 21:50:09 -05:00
Baris Soner Usakli
e3d01df6a2
closes #980
2014-02-23 21:50:02 -05:00
Julian Lam
590fb2e68a
added david dep badge to readme
2014-02-23 21:05:50 -05:00
Baris Soner Usakli
b8b83c2ec2
share buttons
2014-02-23 19:38:26 -05:00
Baris Soner Usakli
f967407805
follow state clean up
2014-02-23 18:38:46 -05:00
Baris Soner Usakli
649bcf49b4
one liner
2014-02-23 18:25:24 -05:00
Baris Soner Usakli
b5c8158ad5
more cleanup
2014-02-23 18:19:10 -05:00
Baris Soner Usakli
403de08d60
cleaned more
2014-02-23 18:05:50 -05:00
Baris Soner Usakli
122d1ad82a
less is more
2014-02-23 17:42:31 -05:00
Julian Lam
2088903358
added check to upgrade.upgrade
2014-02-23 16:35:28 -05:00
Baris Soner Usakli
c1e3d95a84
upgrade fix for new installs
2014-02-23 16:19:30 -05:00
Baris Soner Usakli
e35a54bea4
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-23 15:08:06 -05:00
Baris Soner Usakli
6c6c57f45f
closes #1108
2014-02-23 15:07:47 -05:00
Alejandro Del Rincón
a9f20a7791
More translation
2014-02-23 15:11:10 +01:00
Alejandro Del Rincón
8111b9e91f
Finally reviewed spanish transalation
...
I revised the spanish translation to something more serious and complete. There was a lot of wrong spelled words and some untranslated/bad translated words
2014-02-23 15:00:52 +01:00
Alejandro Del Rincón López
8ef59adb4a
Actualización lenguaje español
...
The translation was very faulty with a lack of accents and some words untranslated
2014-02-23 14:38:50 +01:00
Baris Soner Usakli
a29ea27596
closes #1106
2014-02-22 22:46:58 -05:00
Baris Soner Usakli
6e5a6b8784
upgraded categories to sorted set, score is the order set from acp, check if category topic exists before posting
2014-02-22 18:56:37 -05:00
Baris Soner Usakli
d6d9776cde
added toPid to posts
2014-02-22 17:56:13 -05:00
Baris Soner Usakli
81555671da
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-22 16:49:07 -05:00
Baris Soner Usakli
60905b2e21
getPidPage fix, pids are strings
2014-02-22 16:48:58 -05:00
Julian Lam
7bd972355e
Merge pull request #1105 from lucianojmf/master
...
Update package.json
2014-02-22 15:09:37 -05:00
Luciano Miranda
d4084b1586
Update package.json
2014-02-22 16:52:13 -03:00
Julian Lam
6bc6c88e89
pruning dependencies, and removed contributors from package.json -- full list can be found at https://github.com/designcreateplay/NodeBB/graphs/contributors
2014-02-22 11:18:16 -05:00
Julian Lam
ca4b9346f3
resolved #1039
2014-02-22 11:08:02 -05:00
Julian Lam
7760a6b207
added restart button to ACP (!!)
2014-02-22 03:11:13 -05:00
Julian Lam
b64e5870b7
loader now handles arguments and ./nodebb watch command updated to not use loader.
2014-02-22 03:01:54 -05:00
Baris Soner Usakli
a8c7b32a04
moved plugin alert to top
2014-02-22 02:44:30 -05:00
Baris Soner Usakli
3f43ca0925
change on click
2014-02-22 02:40:28 -05:00
Julian Lam
d6a1fad527
removing timeout before restarting nodebb, fixing nodebb executable
2014-02-22 02:36:56 -05:00
Baris Soner Usakli
f57e293abb
plugin buttons indicate active state
2014-02-22 02:35:33 -05:00
Julian Lam
64c4dd7e63
communication between loader and child
2014-02-22 02:27:14 -05:00
Baris Soner Usakli
cfe5b6aa4a
check if thumEl exists before trim
2014-02-22 02:01:08 -05:00
Baris Soner Usakli
bae76ebd70
fixed the redis error when going to unread/recent if nextStart is missing
2014-02-22 00:49:32 -05:00
Julian Lam
ef63d816fe
NodeBB will now listen to SIGINT signal
2014-02-21 23:52:23 -05:00
Baris Soner Usakli
f4d23fe5df
return version in config
2014-02-21 23:47:55 -05:00
Baris Soner Usakli
3958ee4120
added close db command
2014-02-21 23:42:16 -05:00
Baris Soner Usakli
dfe25d4bc0
only store thumb if is defined
2014-02-21 23:28:19 -05:00
Baris Soner Usakli
02b602f587
removed double translator
2014-02-21 23:16:21 -05:00
Baris Soner Usakli
63dba688ff
Merge branch 'master' of https://github.com/designcreateplay/NodeBB into akhoury-topics-thumbnails
2014-02-21 23:15:38 -05:00
Baris Soner Usakli
29ba015d69
fixed topic thumbs
2014-02-21 23:15:25 -05:00
psychobunny
acb935bbc5
requiring translator in meta.js
2014-02-21 23:01:15 -05:00
psychobunny
002e149f42
reasons why comma first is better
2014-02-21 23:00:02 -05:00
Baris Soner Usakli
b7ccc12525
bump topic if its marked unread for all, so it shows up in unread
2014-02-21 22:13:13 -05:00
psychobunny
f862d856fc
alright clearly, regex on fridays just don't happen for me. - fixed
2014-02-21 22:04:21 -05:00
psychobunny
027398f5ba
unreverting change
2014-02-21 20:57:42 -05:00
psychobunny
6890d319ec
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-21 20:47:53 -05:00
psychobunny
0c54afe576
reverting previous template fix
2014-02-21 20:47:50 -05:00
Baris Soner Usakli
3a30db59c2
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-21 20:47:04 -05:00
Baris Soner Usakli
dab71d04bd
removed unused var
2014-02-21 20:46:56 -05:00
Julian Lam
a0b6d15b2e
closed #1102
2014-02-21 20:05:44 -05:00
Baris Soner Usakli
9eb4945415
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-21 18:32:06 -05:00
Baris Soner Usakli
de34beaf6d
closes #1087
2014-02-21 18:31:59 -05:00
psychobunny
2ec6dd1d14
added filter:topic.thread_tools for creating custom admin functionality in topics view
2014-02-21 16:47:40 -05:00
psychobunny
6f7243f42f
fixed a bug running multiple blocks in one template on an empty array
2014-02-21 16:46:58 -05:00
psychobunny
32ac3d94d2
moved pin and lock out of .topic-title in popular/recent/unread
2014-02-21 16:15:33 -05:00
psychobunny
e9c7de951b
moved pin and lock out of .topic-title
2014-02-21 16:08:43 -05:00
psychobunny
b63fe44da4
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-21 16:02:51 -05:00
psychobunny
c7fb34c23f
new client-side hooks: filter:categories.new_topic, action:categories.new_topic.loaded
2014-02-21 16:02:48 -05:00
Baris Soner Usakli
eb3b240b04
some cleanup of unread
2014-02-21 15:54:51 -05:00
Baris Soner Usakli
31f877ccee
merged
2014-02-21 14:54:01 -05:00
Baris Soner Usakli
ae93c372ff
fixed mongo setAdd and setRemove to accept arrays like redis, fixed infinite scroll for mongo
2014-02-21 14:53:31 -05:00
Julian Lam
ea826ce487
type checking 'plugin' when loading
2014-02-21 13:55:04 -05:00
Julian Lam
f6ea278b09
closed #1095
2014-02-21 13:27:40 -05:00
Julian Lam
790b0f98d4
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-21 11:16:46 -05:00
Julian Lam
d3ba03ceae
fixed #1089
2014-02-21 11:16:44 -05:00
psychobunny
15f19653c5
action:categories.loading and action.categories.loaded
2014-02-21 01:55:25 -05:00
psychobunny
7e767da73e
closes #1086 and #1085
2014-02-21 01:54:48 -05:00
Julian Lam
a2942e22cc
Revert "removing exported search methods from redis and mongo"
...
This reverts commit bba3b76108
2014-02-21 00:37:03 -05:00
psychobunny
5179fec986
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-20 21:41:59 -05:00
psychobunny
a3191227de
closes #1080
2014-02-20 21:41:56 -05:00
Julian Lam
f10bda49dc
Merge remote-tracking branch 'origin/master' into search_hooks
2014-02-20 21:38:46 -05:00
Julian Lam
bba3b76108
removing exported search methods from redis and mongo
2014-02-20 21:38:31 -05:00
psychobunny
8cfa6e9d83
added panel container without header, closes #1081
2014-02-20 21:35:51 -05:00
psychobunny
ef0b610c3c
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-20 21:32:27 -05:00
psychobunny
86dd01154e
closes #1079
2014-02-20 21:32:24 -05:00
Baris Soner Usakli
5aed1208c0
lol this was saving to 'uploadPath'
2014-02-20 21:26:05 -05:00
Julian Lam
2ba11dce15
hiding search buttons and route when search is not configured
2014-02-20 21:21:41 -05:00
Julian Lam
0e26fdf1da
Merge branch 'master' into search_hooks
2014-02-20 21:08:31 -05:00
psychobunny
f83cd7c133
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-20 20:33:40 -05:00
psychobunny
251fef9c27
run plugins.reload after activating widget-essentials
2014-02-20 20:33:37 -05:00
Baris Soner Usakli
74b0da78f4
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-20 20:26:53 -05:00
Baris Soner Usakli
a92fb07f02
fixes multiple click handlers in admin users
2014-02-20 20:26:46 -05:00
psychobunny
fffbb1db34
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-20 20:23:33 -05:00
psychobunny
8059a83870
activate widget-essentials
2014-02-20 20:23:30 -05:00
Julian Lam
d140fa33dd
fixing tab default + removing two calls to code.jquery.com
2014-02-20 20:06:14 -05:00
psychobunny
5de6ea0d97
updated cerulean dep to 0.0.13
2014-02-20 19:57:25 -05:00
psychobunny
fc866e4746
added notice to admins to check out the widgets panel IF motd is not set. upgraded motd to widget for lavender
2014-02-20 19:48:08 -05:00
psychobunny
9a5be0b334
updated lavender dep to 0.0.21
2014-02-20 19:39:22 -05:00
psychobunny
596a622197
updated vanilla dep to 0.0.14
2014-02-20 19:25:40 -05:00
psychobunny
52781bb539
Merge remote-tracking branch 'origin/master' into Widgets
2014-02-20 19:23:02 -05:00
psychobunny
e28589bea8
added jumbotron, alert widgets + color picker for alert and panel
2014-02-20 19:22:34 -05:00
psychobunny
2131506d59
widgets - user friendly instructions
2014-02-20 18:50:17 -05:00
psychobunny
ccf529ccca
updated upgrade script to add titles and container to category sidebar widgets
2014-02-20 18:45:38 -05:00
psychobunny
8543d2d437
deprecated hard-coded panels in category sidebar, now you can set custom containers in widget ACP
2014-02-20 18:31:16 -05:00
Baris Soner Usakli
7e825c61bd
some login changes
2014-02-20 18:30:15 -05:00
psychobunny
68b9e36218
rendering widget's container
2014-02-20 18:10:06 -05:00
psychobunny
80ce4db764
add container field and title field to all widgets by default
2014-02-20 17:58:12 -05:00
psychobunny
ef65f510a5
fomatting
2014-02-20 17:57:41 -05:00
psychobunny
5acf296ada
added containers; drag on top of widgets to set a custom container
2014-02-20 17:12:56 -05:00
Baris Soner Usakli
b82a5461ce
more cleanup to user routes
2014-02-20 17:03:08 -05:00
psychobunny
1b557d4141
upgrade.js - add forum stats widget to homepage footer
2014-02-20 16:14:24 -05:00
Baris Soner Usakli
905a99e638
user route cleanup
2014-02-20 16:07:22 -05:00
psychobunny
b821dc70cf
moved Forum Stats widget out of core and into widget-essentials
2014-02-20 16:03:25 -05:00
psychobunny
3896cbd732
and fixed it again
2014-02-20 15:39:52 -05:00
psychobunny
c39a951727
fixed widget-essentials dep
2014-02-20 15:33:21 -05:00
psychobunny
068402c8ac
wrong upgrade message
2014-02-20 15:31:42 -05:00
psychobunny
ae009e04bd
added widgets-essentials to deps
2014-02-20 15:30:26 -05:00
psychobunny
0b3fa0c838
upgrade.js - add recentreplies, activeusers, and moderator widgets to the sidebar as default
2014-02-20 15:28:37 -05:00
Baris Soner Usakli
cec718de26
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-20 15:25:46 -05:00
Baris Soner Usakli
020a70ecb6
removed showemail setting from user hash, its in user settings now
2014-02-20 15:25:39 -05:00
Julian Lam
ac116bc9d0
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-20 15:14:27 -05:00
Julian Lam
94f67f518e
fixed issue where a URL as the logo caused apple-touch-icon to explode
2014-02-20 15:13:15 -05:00
Baris Soner Usakli
3be0ad5bce
wait for user object to be saved before returning from User.create
2014-02-20 14:53:35 -05:00
Baris Soner Usakli
93130b27d5
insert loggedIn before hash'
2014-02-20 14:37:10 -05:00
Baris Soner Usakli
34bf839751
closes #1067
2014-02-20 13:23:29 -05:00
psychobunny
b4a46339f3
Merge pull request #1075 from BitBangersCode/widgets-fix
...
Fix crash when there would be no widgets
2014-02-20 13:22:41 -05:00
MrWaffle
502886c3b9
Fix crash when there would be no widgets
2014-02-20 19:18:23 +01:00
Baris Soner Usakli
86556989f4
closes #1068
2014-02-20 12:56:35 -05:00
akhoury
63c9269240
merged composer and some other files with master
2014-02-20 02:25:15 -05:00
akhoury
25207852e8
added topics thumbnails support
2014-02-20 02:05:49 -05:00
Julian Lam
bc10080c49
close #1041
2014-02-19 21:47:26 -05:00
Julian Lam
813ff95146
removing useless jqueryUI CSS
2014-02-19 21:32:05 -05:00
Julian Lam
42d33f8338
first pass #899
2014-02-19 21:06:30 -05:00
Jason Nall
7937ecb6b4
Moved CSS above scripts to ensure CSS files are downloaded in parallel. This can improve page load speed in some browsers.
2014-02-19 20:22:42 -05:00
psychobunny
599027f2d3
send full url to widgets as well so they can parse based on path
2014-02-19 19:28:21 -05:00
psychobunny
18369fae7e
fixed bug with sorting of widgets
2014-02-19 19:19:25 -05:00
psychobunny
fa4555e26e
moved addActiveUser code to widget-essentials
2014-02-19 19:15:04 -05:00
psychobunny
305ec0da28
removed unused language strings from previous sidebar
2014-02-19 19:10:56 -05:00
psychobunny
835b4d61a2
removed active_users + moderator sidebar code from core in favour of widget system
2014-02-19 19:07:56 -05:00
psychobunny
cb986186a1
removing recent replies code + tpls from the core in favour of widget system
2014-02-19 18:53:28 -05:00
Julian Lam
fdd2dc322b
first pass #992
2014-02-19 18:44:31 -05:00
psychobunny
1827c8390b
filter:category.build_sidebars (custom sidebars in category view) is now deprecated
2014-02-19 18:19:25 -05:00
psychobunny
eda7455be2
using motd class instead of a well
2014-02-19 18:16:18 -05:00
Julian Lam
37bd88d1b2
faux masonry lol
2014-02-19 18:15:55 -05:00
psychobunny
aea7329871
animate page load only after widgets load
2014-02-19 18:15:19 -05:00
Julian Lam
f4ad1ac2dc
moving active users list to bottom of admin index
2014-02-19 18:14:15 -05:00
psychobunny
ba657aec4e
110% -> upgrade.js converts existing motd's to html widgets for extra bonus points.
2014-02-19 18:13:56 -05:00
psychobunny
163b0f964e
Merge remote-tracking branch 'origin/master' into Widgets
2014-02-19 17:45:40 -05:00
psychobunny
0963e62acb
completely removing all motd code in favour of using the widget system
2014-02-19 17:31:13 -05:00
Julian Lam
f50d77bca0
resolved #1060
2014-02-19 17:23:25 -05:00
psychobunny
c0df95b2dc
render widgets upon ajaxify - this widget feetorez iz completified!
2014-02-19 17:23:17 -05:00
psychobunny
c4121f6ee6
bugfixes in widgets
2014-02-19 17:22:26 -05:00
psychobunny
79e9819b7f
SocketWidgets file
2014-02-19 17:11:07 -05:00
psychobunny
b3978d53bb
widgets.render
2014-02-19 17:07:47 -05:00
psychobunny
37d673028a
added async to client side
2014-02-19 17:07:19 -05:00
Baris Soner Usakli
ea222c4f8a
crash fix for notifications, removed exec_body_script, closes #1058
2014-02-19 16:44:36 -05:00
psychobunny
4e1b3506e8
allow plugins/widgets to define widgets; moved sample widgets out of core and into nodebb-widget-essentials
2014-02-19 16:11:16 -05:00
psychobunny
f4ad1bdeae
console.log
2014-02-19 15:43:05 -05:00
Baris Soner Usakli
fd3efd59f9
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-19 15:34:06 -05:00
Baris Soner Usakli
495fded6dd
closes #1038
2014-02-19 15:33:59 -05:00
Julian Lam
3107e43b64
cleaned up admin panel index a bit
2014-02-19 15:24:39 -05:00
psychobunny
26b0db3bea
let plugins.js allow widgets to utilize hooks
2014-02-19 15:14:49 -05:00
psychobunny
86a8103c15
saving, updating, deleting widgets; widget dragging improvements
2014-02-19 15:07:38 -05:00
Julian Lam
0d7e47ded7
closed #1057
2014-02-19 14:47:00 -05:00
Julian Lam
7c7f66c08b
bringing language files up to date
2014-02-19 14:34:50 -05:00
Julian Lam
3fdd0c1bff
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-19 14:33:37 -05:00
Julian Lam
031e8128c7
fixed #912 , added new page string for popular topics
2014-02-19 14:33:34 -05:00
Baris Soner Usakli
7e2823bf30
show recent event data first'
2014-02-19 13:57:09 -05:00
Baris Soner Usakli
ab60da30da
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-19 13:30:39 -05:00
Baris Soner Usakli
520b349c17
closes #1044
2014-02-19 13:30:31 -05:00
psychobunny
9f8f78f6d4
client-side saving of widgets
2014-02-19 13:22:02 -05:00
psychobunny
447cff1995
got the basic ui, dragging, sorting etc going for widgets acp
2014-02-19 12:46:55 -05:00
psychobunny
fa5f528fb5
filter:widgets.getAreas - allows plugins to define widget locations in tpls
2014-02-19 11:43:25 -05:00
psychobunny
8f972d8cdc
added widgets tab to themes acp
2014-02-19 11:38:31 -05:00
psychobunny
6496ad95e8
Revert "closes #992 "
...
This reverts commit ed4b0461b9
2014-02-19 02:07:48 -05:00
Baris Soner Usakli
bbe1a00d34
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-18 23:06:26 -05:00
Baris Soner Usakli
f33256d628
fixes error alerts if scroll is triggered during transitions
2014-02-18 23:06:18 -05:00
Julian Lam
b5496b5680
fixed executable help echo
2014-02-18 19:41:50 -05:00
Julian Lam
bc7eb501c8
same for topics (translation + pagination)
2014-02-18 19:41:02 -05:00
Julian Lam
0b0b74a559
properly translating strings in category nojs template, and added pagination (so not all topics are loaded on every request)
2014-02-18 19:23:36 -05:00
psychobunny
b71f1a410e
added reset flag to ./nodebb script
2014-02-18 22:46:44 +00:00
psychobunny
e912ce038b
closes #1035
2014-02-18 17:43:32 -05:00
Baris Soner Usakli
9a02f85620
update motd string
2014-02-18 16:00:59 -05:00
Baris Soner Usakli
8518f26adb
closes #1023
2014-02-18 15:46:03 -05:00
Baris Soner Usakli
6140d76f76
fixed index of newly created posts, matched vanilla search form to lavender
2014-02-18 15:14:33 -05:00
Baris Soner Usakli
17cee2cb99
pagination fix if only 1 topic
2014-02-18 12:40:13 -05:00
Baris Soner Usakli
e1f016c075
closes #1046
2014-02-18 12:16:33 -05:00
Baris Soner Usakli
3993259336
closes #1055
2014-02-18 11:48:28 -05:00
Julian Lam
172b617cbc
using 'trust proxy' on proxied requests
2014-02-18 10:34:56 -05:00
Julian Lam
3b4985efe5
tx translation update
2014-02-18 10:30:11 -05:00
Baris Soner Usakli
1712fcc9fe
dont scroll to 0th post
2014-02-18 01:18:37 -05:00
Baris Soner Usakli
229fe2f80f
seems to work better for long posts
2014-02-18 00:42:14 -05:00
Baris Soner Usakli
7aa38adb52
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-18 00:25:37 -05:00
Baris Soner Usakli
83ad454c3e
better error message if image upload fails, #1052
2014-02-18 00:25:30 -05:00
psychobunny
d69835e115
allow any hash to be pushed to history
2014-02-18 00:00:42 -05:00
psychobunny
1e47953efd
expanding hash regex to alphanumeric
2014-02-17 23:58:47 -05:00
Baris Soner Usakli
9d1a295b85
better topic delete restore
2014-02-17 22:53:01 -05:00
Baris Soner Usakli
9b88dcdc14
removed double if
2014-02-17 21:37:36 -05:00
Baris Soner Usakli
92ebf2975a
possible fix for #1050
2014-02-17 21:32:00 -05:00
Baris Soner Usakli
a620a85d85
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-17 20:57:19 -05:00
Baris Soner Usakli
21367a1847
reverse infinite loading
2014-02-17 20:57:12 -05:00
psychobunny
ed4b0461b9
closes #992
2014-02-17 17:47:03 -05:00
Baris Soner Usakli
7918a23835
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-17 12:57:45 -05:00
Baris Soner Usakli
1da75866f4
added global loggedIn to templates'
2014-02-17 12:57:37 -05:00
Julian Lam
e4812fab87
removing console.log
2014-02-17 12:57:26 -05:00
Baris Soner Usakli
e665b79293
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-16 16:20:50 -05:00
Baris Soner Usakli
93257a8597
check if tids and uids array array before calling async
2014-02-16 16:20:44 -05:00
Julian Lam
560fa6ffe8
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-16 12:21:49 -05:00
Julian Lam
8e4c126e3c
fixing template in favourites.tpl
2014-02-16 12:21:46 -05:00
Baris Soner Usakli
d3f5f9571a
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-16 12:15:27 -05:00
Baris Soner Usakli
0ec9f3835f
fixed js error in composer
2014-02-16 12:15:20 -05:00
Julian Lam
1a962c03f4
Hungarian, Norwegian, and Polish translation strings updated from Tx
2014-02-16 11:40:59 -05:00
Baris Soner Usakli
0756410684
closes #1012
2014-02-16 11:36:11 -05:00
Baris Soner Usakli
d75cdf8b9f
check err firsT
2014-02-16 11:13:37 -05:00
Julian Lam
c6ce42968d
Merge pull request #1042 from miksago/config-file-fix
...
Fix configFile option handling
2014-02-16 00:52:13 -05:00
Micheil Smith
74049dccb1
Added log message about where configuration is being loaded from
2014-02-16 05:36:29 +00:00
Micheil Smith
0672c7276d
Fix nconf.file not really using config file
2014-02-16 05:35:44 +00:00
Baris Soner Usakli
8eeb962ebc
fixed small bug
2014-02-15 17:17:15 -05:00
Baris Soner Usakli
43e8016dd1
fixes admin user picture edit
2014-02-15 17:12:05 -05:00
Baris Soner Usakli
30cc992f5e
closes #1036
2014-02-15 16:12:33 -05:00
Julian Lam
9e64f4e303
passing in a picture into notifications now
2014-02-15 15:43:44 -05:00
Julian Lam
ef45ae9ba3
fixed the rotating bell in notifications loading LOL
2014-02-15 15:14:17 -05:00
Julian Lam
07bd4d68d6
updating mentions minver
2014-02-15 14:54:32 -05:00
Julian Lam
aba1b95cac
updating notifications.create to accept a hash instead of discrete arguments - breaking change
2014-02-15 14:52:59 -05:00
Julian Lam
17ae56e555
fixed #1027
2014-02-15 14:16:15 -05:00
Julian Lam
32b0b1f9fc
#1034
2014-02-15 14:01:20 -05:00
Julian Lam
ce7c8c9495
updating translations
2014-02-15 12:28:46 -05:00
Julian Lam
d230b17517
polish tx format update
2014-02-15 12:27:18 -05:00
Julian Lam
0c3b3c288f
added polish to tx config
2014-02-15 12:25:06 -05:00
unek
bea44ddd18
added polish language
2014-02-15 13:29:02 +01:00
Baris Soner Usakli
8b8fbfa113
added 3 more strings to translations
2014-02-14 22:36:07 -05:00
Baris Soner Usakli
fec1b75030
fixes pagination block on direct page load
2014-02-14 21:41:53 -05:00
Baris Soner Usakli
791a50a01b
closes #1028
2014-02-14 20:46:00 -05:00
Baris Soner Usakli
884d42a363
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-14 19:40:45 -05:00
Baris Soner Usakli
0c093c2aaa
fixes upgrade on a empty database
2014-02-14 19:40:38 -05:00
Julian Lam
01f2e7dccd
0.3.2
2014-02-14 15:25:18 -05:00
Baris Soner Usakli
893efa5f2a
closes #1004
2014-02-14 15:08:56 -05:00
Baris Soner Usakli
8c14a59f93
added new sorted set posts:pid
2014-02-14 14:39:32 -05:00
Baris Soner Usakli
4663e0b8be
paranoid
2014-02-14 14:14:05 -05:00
Baris Soner Usakli
1e44ca3a0f
upgrade topics:tid to sorted set, topics:recent doesnt have deleted topics
2014-02-14 14:03:54 -05:00
Baris Soner Usakli
8506819a7d
added back error check
2014-02-14 13:40:11 -05:00
Baris Soner Usakli
6ddf977166
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-14 13:38:17 -05:00
Baris Soner Usakli
c0e0da0f1d
simplified getAllTopics
2014-02-14 13:38:10 -05:00
Julian Lam
8af5e089ff
slovak translations by @yangwao
2014-02-14 12:16:23 -05:00
Micheil Smith
ee0f9d2bbe
Rename themes_dir to themes_path for consistency with other configuration options
2014-02-14 17:11:25 +00:00
Julian Lam
55aef372e8
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-14 12:00:51 -05:00
Julian Lam
15e1b7e571
updating source string for notif message
2014-02-14 12:00:41 -05:00
Baris Soner Usakli
e5727af959
added missing winston to emailer
2014-02-14 11:58:51 -05:00
Julian Lam
d933e81b37
fixed #1025
2014-02-14 11:49:16 -05:00
Julian Lam
734d8f96e8
fixing symbols in plugin static path filenames -- can I tag people in commit messages? @frissdiegurke
2014-02-14 11:38:16 -05:00
Julian Lam
d0d3160fc7
final pass, #999
2014-02-14 11:04:00 -05:00
Julian Lam
8bd6f85478
first pass, #999
2014-02-14 10:49:43 -05:00
Julian Lam
28731e2dbd
minor typo, and a fix I missed
2014-02-14 01:05:38 -05:00
Julian Lam
f698166395
minor fixes to paths accidentally introduced in #1020
2014-02-14 00:23:54 -05:00
Julian Lam
9d8aff5e63
fixed theme previews
2014-02-14 00:19:36 -05:00
Julian Lam
b6b795dbc6
Merge pull request #1020 from miksago/themes_dir
...
Implemented `themes_dir` configuration option.
2014-02-14 00:11:52 -05:00
Micheil Smith
a857d4cab0
Added logging on start up detailing where themes are being loaded from.
2014-02-14 05:04:08 +00:00
Micheil Smith
8866de8b30
Improved logging at startup
2014-02-14 05:03:38 +00:00
Micheil Smith
ceffd2e1e0
Remove warnings about themes being out of date
2014-02-14 05:02:17 +00:00
Micheil Smith
691fde0a27
Added ability to change where themes are stored via themes_dir configuration option
...
themes_dir is resolved to be relative to the root of the NodeBB install.
2014-02-14 05:01:02 +00:00
Julian Lam
20c95731ae
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-13 22:38:59 -05:00
Julian Lam
bbdcd5d460
resolved #997
2014-02-13 22:38:24 -05:00
Baris Soner Usakli
a909a25393
closes #1016
2014-02-13 21:06:41 -05:00
Baris Soner Usakli
695891ffd7
added missing file
2014-02-13 20:43:19 -05:00
Baris Soner Usakli
bdc93409a7
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-13 19:42:00 -05:00
Baris Soner Usakli
075c6c01f2
upload changes, show progres in composer
2014-02-13 19:41:54 -05:00
psychobunny
fe2e86da81
added optional 'reverse' parameter to Posts.getPostsByTid and Topics.getTopicPosts (incoming signature adjustment for 0.4x)
2014-02-13 15:21:24 -05:00
psychobunny
1f8f65308b
added api/user/uid route
2014-02-13 14:08:16 -05:00
Julian Lam
843cb1b35b
fixed #936
2014-02-13 13:51:00 -05:00
Julian Lam
cb012ffa7a
#936
2014-02-13 13:10:40 -05:00
Julian Lam
750ce1f7f8
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-13 12:26:46 -05:00
Julian Lam
e2c6eca36e
fixed #1006
2014-02-13 12:26:43 -05:00
Baris Soner Usakli
99a212d141
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-13 11:35:34 -05:00
Baris Soner Usakli
ce4896f2c5
fixed read notifications
2014-02-13 11:35:27 -05:00
Julian Lam
3e3250ccde
pull-right first, then pull-left.
2014-02-12 22:50:41 -05:00
Baris Soner Usakli
9f663411db
brand logo fix
2014-02-12 22:31:08 -05:00
Baris Soner Usakli
d4bc6904fb
fixed socket crash
2014-02-12 17:30:49 -05:00
Baris Soner Usakli
53af836bdb
24 users
2014-02-12 17:29:37 -05:00
Baris Soner Usakli
7f4a1cd685
display 4 rows of active users
2014-02-12 17:24:51 -05:00
Baris Soner Usakli
1c14bcd1ed
dont update last online time if status is offline
2014-02-12 17:16:16 -05:00
Baris Soner Usakli
b912dcb2f0
topic title
2014-02-12 16:02:07 -05:00
Baris Soner Usakli
896af72a25
added topic title to header
2014-02-12 15:44:48 -05:00
Baris Soner Usakli
ab9ff94713
fw changes
2014-02-12 14:03:02 -05:00
Baris Soner Usakli
860aabe0d3
oops fixed
2014-02-12 13:15:13 -05:00
Baris Soner Usakli
7b4f098cb4
dont allow negative or zero pagination values for user setting
2014-02-12 13:11:28 -05:00
Baris Soner Usakli
ccfa5bd618
copy pasta is bad for your health
2014-02-12 12:51:07 -05:00
Baris Soner Usakli
a4fd972b2b
fixed again fail
2014-02-12 12:50:09 -05:00
Baris Soner Usakli
c703dba3dd
closes #1009
2014-02-12 12:46:56 -05:00
Baris Soner Usakli
d0100176ef
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-12 12:31:15 -05:00
Baris Soner Usakli
7f298c596f
fixed category save
2014-02-12 12:31:08 -05:00
Julian Lam
a106211956
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-12 12:11:34 -05:00
Julian Lam
bc1df3b10c
sv translations
2014-02-12 12:11:26 -05:00
Baris Soner Usakli
2a41c3a312
crash fix
2014-02-12 11:35:53 -05:00
Baris Soner Usakli
639ebe9b71
added space to fix motd
2014-02-12 11:34:18 -05:00
Baris Soner Usakli
475f9bea04
closes #1011 , last online wont give away your invisible status
2014-02-12 10:53:34 -05:00
Baris Soner Usakli
dcebb0cc4c
removed whitespace
2014-02-12 10:43:32 -05:00
Baris Soner Usakli
4c6fb72db0
move cursor to end in share input
2014-02-12 10:36:17 -05:00
Baris Soner Usakli
b5d31dd889
replace eachSeries with map
2014-02-12 10:03:28 -05:00
Baris Soner Usakli
400af61e12
fixed minor issue, removed unused postPerPage
2014-02-12 09:42:52 -05:00
Baris Soner Usakli
9f1e0187ee
fixed settings
2014-02-12 00:09:02 -05:00
Baris Soner Usakli
a813b3639e
another eachSeries gone horray
2014-02-11 23:44:14 -05:00
Baris Soner Usakli
c560f8fb75
reduced DRY fail
2014-02-11 23:38:25 -05:00
Baris Soner Usakli
8456025f28
2 more maps
2014-02-11 23:14:41 -05:00
Baris Soner Usakli
5e0435677b
function name is good enough :)
2014-02-11 23:00:13 -05:00
Baris Soner Usakli
a8e5c7d149
error checks more err first, replaced a eachSeries with async.map
2014-02-11 22:57:01 -05:00
Baris Soner Usakli
1b5e44a763
fix unreplied on getTopic
2014-02-11 22:27:40 -05:00
Baris Soner Usakli
521b3f02be
removed log, lol
2014-02-11 20:40:06 -05:00
Baris Soner Usakli
bb59158bbc
closes #721 , admins can edit other users from their edit page
2014-02-11 20:39:07 -05:00
Baris Soner Usakli
1861273d45
delegated event for category save
2014-02-11 19:44:11 -05:00
Baris Soner Usakli
a274a8cc12
more unread changes
2014-02-11 18:58:46 -05:00
Baris Soner Usakli
859ca8dd18
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-11 18:22:11 -05:00
Baris Soner Usakli
d27ba5239e
unread changes
2014-02-11 18:22:02 -05:00
psychobunny
ecb1fa928c
console.log
2014-02-11 17:58:27 -05:00
psychobunny
ef9965832a
updating account settings templates + client side to allow for dynamic parsing of user settings
2014-02-11 17:57:30 -05:00
psychobunny
53ef9c1b9f
new hook - filter:user.settings allows plugins to generate custom user settings on account page
2014-02-11 17:57:29 -05:00
psychobunny
ad9209ec38
modifying user.getSettings / user.saveSettings to allow passing in custom data
2014-02-11 17:57:29 -05:00
psychobunny
225e8c012b
SocketUser.getSettings
2014-02-11 17:57:28 -05:00
Baris Soner Usakli
85d4bc7232
fixed event log
2014-02-11 17:44:44 -05:00
Baris Soner Usakli
8ca3b667c7
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-11 17:16:23 -05:00
Baris Soner Usakli
4ff62f4e30
closes #1005
2014-02-11 17:16:17 -05:00
psychobunny
2781153640
removed some unused stuff in account settings
2014-02-11 16:48:34 -05:00
psychobunny
4f1f812062
reorganizing account settings
2014-02-11 16:48:34 -05:00
Baris Soner Usakli
39ec9e9ecb
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-11 16:44:05 -05:00
Baris Soner Usakli
02048e551f
assorted CP changes
2014-02-11 16:43:57 -05:00
psychobunny
8dfd8c3bbb
README - OK I promise I won't touch this again for at least a few months.
2014-02-11 15:42:15 -05:00
psychobunny
804997862b
decided to move screenshots back up one level since we're using thumbnails instead
2014-02-11 15:28:33 -05:00
psychobunny
666cb4c927
README: forgot to credit manchester united forums
2014-02-11 15:26:48 -05:00
psychobunny
2c7ec620d0
README: added a few more screenshots to even things up a bit; emphasis on like/follow/star
2014-02-11 15:25:47 -05:00
Baris Soner Usakli
2f84a0a130
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-11 15:13:09 -05:00
Baris Soner Usakli
daa1154797
added timing to prune
2014-02-11 15:13:02 -05:00
psychobunny
ec21ea5df4
README: using thumbnails instead
2014-02-11 15:11:48 -05:00
psychobunny
a05f17b702
updated README: added links to blog, plugins, themes; added new screenshots (old ones were 0.2x); other minor changes
2014-02-11 15:01:37 -05:00
Baris Soner Usakli
11b0f44ae9
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-11 14:40:50 -05:00
Baris Soner Usakli
20dd194171
show error in composer if upload fails
2014-02-11 14:40:43 -05:00
Julian Lam
01f7caa3af
Proper handling of windows path separators in plugin js gets
2014-02-11 10:57:51 -05:00
Julian Lam
6d1ec8c7fe
hebrew translations by orweinberger
2014-02-11 09:35:41 -05:00
Baris Soner Usakli
d0452dcc80
small pagination fix
2014-02-10 22:45:52 -05:00
Baris Soner Usakli
bc7fd3a724
fix for favicon
2014-02-10 22:24:36 -05:00
Baris Soner Usakli
cacde313cd
closes #995
2014-02-10 19:59:04 -05:00
Baris Soner Usakli
fba16fdfce
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-10 19:14:57 -05:00
Baris Soner Usakli
55951fec6f
removed marked from motd'
2014-02-10 19:14:50 -05:00
psychobunny
e8d30da006
removing qunit from ACP, since we don't actually use it anymore
2014-02-10 17:44:05 -05:00
Julian Lam
4429014d2f
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-10 17:32:04 -05:00
Julian Lam
97e52fd169
adding new client-side hook and post_uuid to composer template
2014-02-10 17:31:51 -05:00
Baris Soner Usakli
84446e255d
added parseInt
2014-02-10 16:32:47 -05:00
Barış Soner Uşaklı
2f764dcbb5
Merge pull request #991 from Maxorq/master
...
No point in having anonymous users as a link.
2014-02-10 14:42:17 -05:00
Maciej Benke
34338c3265
No point in having anonymous users as a link.
2014-02-10 20:35:35 +01:00
Baris Soner Usakli
b75877d61f
some language strings
2014-02-10 14:21:45 -05:00
Baris Soner Usakli
8e756b5b26
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-10 14:15:58 -05:00
Baris Soner Usakli
242927d702
user selectable pagination
2014-02-10 14:15:54 -05:00
psychobunny
8c2611aeb5
potentially fixes #823
2014-02-10 14:05:09 -05:00
psychobunny
83a201acce
closes #918
2014-02-10 13:55:47 -05:00
Julian Lam
e231a52369
new translations, plus fallbacks for new strings to English
2014-02-10 13:31:53 -05:00
Julian Lam
f24e6bdace
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-10 13:30:31 -05:00
Julian Lam
55b39f1eff
second pass, #981
2014-02-10 13:30:26 -05:00
psychobunny
d02a1ef40a
actually fixes #985
2014-02-10 13:29:59 -05:00
Julian Lam
e9852a804c
language updates
2014-02-10 13:00:20 -05:00
Julian Lam
5f8bfaa871
reverting some fixes
2014-02-10 12:51:52 -05:00
Julian Lam
8f369d9dbc
added 'topic' back to string
2014-02-10 12:47:01 -05:00
Julian Lam
37a1fbd9cd
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-10 12:41:34 -05:00
Julian Lam
b6e96541e7
first pass, #981
2014-02-10 12:41:29 -05:00
Baris Soner Usakli
93f5f320fe
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-10 12:27:46 -05:00
Baris Soner Usakli
02483b34bf
closes #987
2014-02-10 12:27:43 -05:00
Julian Lam
3bdbd28532
removing console log in search template
2014-02-10 12:02:28 -05:00
Julian Lam
5b8585fafb
fixed #985
2014-02-10 11:54:47 -05:00
Julian Lam
92d029f072
removed regex removal of @first block on infinite post load in favour of DOM method
2014-02-10 11:41:25 -05:00
psychobunny
ff9d7c6c24
removed unnecessary conditionals from app.updateHeader
2014-02-10 10:45:24 -05:00
Baris Soner Usakli
ca8f86c4ee
fixed minor issue in prev PR
2014-02-09 18:49:34 -05:00
Barış Soner Uşaklı
8fad323d80
Merge pull request #984 from miksago/reorg-feed-routes
...
Move feed routing and logic to src/routes/feeds.js
2014-02-09 18:46:31 -05:00
Baris Soner Usakli
6ab5f42ef0
only update anon count if on online page
2014-02-09 18:45:41 -05:00
Micheil Smith
33607e0cd9
Move feed routing and logic to src/routes/feeds.js
2014-02-09 23:23:17 +00:00
Barış Soner Uşaklı
fdfe796fe3
Merge pull request #983 from miksago/improve-startup
...
Reworked startup sequence to respect server.listen() failures and timings
2014-02-09 18:13:26 -05:00
Micheil Smith
8cd1005a03
Reworked startup sequence to respect server.listen() failures and timings.
2014-02-09 23:07:12 +00:00
Julian Lam
83b22a357c
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-09 17:22:57 -05:00
Julian Lam
03a30c8583
temporarily commenting out apple-touch-icon, since it seems to be duplicating sessions on every reload
2014-02-09 17:22:38 -05:00
Baris Soner Usakli
6d8a1eb1f4
removed console.log
2014-02-09 17:14:56 -05:00
Baris Soner Usakli
49254f268e
added missing next callbacks
2014-02-09 17:14:31 -05:00
Baris Soner Usakli
654f53f142
removed unused uids
2014-02-09 17:03:25 -05:00
Baris Soner Usakli
d063d4eac1
updated upgrade date
2014-02-09 17:00:45 -05:00
Barış Soner Uşaklı
59e56f0e28
Merge pull request #979 from miksago/ondemand-feeds
...
On-demand feeds
2014-02-09 16:55:43 -05:00
Micheil Smith
ffe798b494
Change Feed.forTopic to cap at 25 items, not infinite
2014-02-09 21:33:20 +00:00
Micheil Smith
a3bb9f4e3d
Changed feeds to be generated on-demand
...
No longer are we writing them to disk, instead, we simply generate on demand.
2014-02-09 21:29:21 +00:00
Micheil Smith
12b52e5320
Removed storage of tid:lastFeedUpdate now that feeds are on-demand
2014-02-09 21:26:11 +00:00
Micheil Smith
cfaa0b3754
Added schema upgrade to delete the tid:lastFeedUpdate key
2014-02-09 21:25:28 +00:00
Julian Lam
5b16223923
proper RTL handling f hebrew and arabic
2014-02-09 15:52:02 -05:00
Julian Lam
b0bd015389
dir settings for languages
2014-02-09 15:48:49 -05:00
Julian Lam
88fe989fa2
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-09 15:41:29 -05:00
Julian Lam
e578b76b49
dir string in language
2014-02-09 15:41:23 -05:00
Micheil Smith
c619301735
Remove calls to feed.js
2014-02-09 20:34:11 +00:00
Baris Soner Usakli
e18d9dc1b4
closes #975
2014-02-09 15:11:58 -05:00
Baris Soner Usakli
2c18bbddbe
upload changes, just pass filename to plugin or base64 data
2014-02-09 14:51:18 -05:00
Julian Lam
daa76e821c
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-09 13:24:51 -05:00
Julian Lam
2075049ae0
default en_GB
2014-02-09 13:24:45 -05:00
Baris Soner Usakli
042df13611
merged
2014-02-09 13:09:36 -05:00
Baris Soner Usakli
253c19abeb
removed unused var added error log
2014-02-09 13:08:25 -05:00
Julian Lam
62f1b8b8f4
retrieving only the latest 25 posts in category rss feed now - issue #973
2014-02-09 12:35:26 -05:00
Julian Lam
7d736f9352
fixed hebrew language string and introducing fallback to english if wrong language is set
2014-02-09 12:15:47 -05:00
Julian Lam
90cd46815a
adding Hebrew language
2014-02-09 12:03:25 -05:00
Julian Lam
7644ae1c21
removing npm from apt-get install command
2014-02-09 10:10:30 -05:00
Baris Soner Usakli
194c404857
more fixes to admin users
2014-02-09 01:45:56 -05:00
Baris Soner Usakli
0719baf8b2
fixes error in admin users page
2014-02-09 01:37:27 -05:00
Baris Soner Usakli
cbe13b6069
language fixes
2014-02-09 01:25:19 -05:00
Baris Soner Usakli
1c058658e6
small tweak
2014-02-09 00:47:08 -05:00
Baris Soner Usakli
20ec8ca768
added image file
2014-02-09 00:34:05 -05:00
Baris Soner Usakli
26849ba2b7
added hooks for image uploads into user and admin routes
2014-02-09 00:33:10 -05:00
Baris Soner Usakli
e163282995
added filter:post.uploadFile
2014-02-08 22:34:50 -05:00
Baris Soner Usakli
1fc4568333
changed hook name to filter:post.uploadImage
2014-02-08 22:21:57 -05:00
Baris Soner Usakli
378ccc3cb7
removed imgur from core
2014-02-08 22:09:28 -05:00
Baris Soner Usakli
94588e15f2
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-08 21:02:13 -05:00
Baris Soner Usakli
0f2e7fa8bd
added a hook to post image upload for starters, more coming
2014-02-08 21:02:06 -05:00
Julian Lam
b5e8c6aeae
pushing fr translation updates
2014-02-08 17:08:22 -05:00
Baris Soner Usakli
c78942b7a4
added warnings if no pwd setup for db, #936
2014-02-08 14:05:45 -05:00
Baris Soner Usakli
2630a72f81
closes #965
2014-02-08 13:58:40 -05:00
Baris Soner Usakli
64687fef6a
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-08 13:44:26 -05:00
Baris Soner Usakli
c219935633
cleanup
2014-02-08 13:44:15 -05:00
Julian Lam
5a1046f15f
Adding Русский language
2014-02-08 12:00:23 -05:00
Julian Lam
7ea379d4f1
added client side hooks: "action:topic.loading" and "action:topic.loaded"
2014-02-08 00:53:35 -05:00
Baris Soner Usakli
27381bfc35
misc responsive fixes
2014-02-07 22:18:18 -05:00
Baris Soner Usakli
3b1c26eae6
removed well from search tpl
2014-02-07 21:40:44 -05:00
Baris Soner Usakli
7dd2412655
profile
2014-02-07 21:28:05 -05:00
Baris Soner Usakli
d5938e4024
removed BS class, not needed
2014-02-07 20:44:10 -05:00
Baris Soner Usakli
0c4f0dff6f
closes #962
2014-02-07 20:30:10 -05:00
Baris Soner Usakli
917458d48d
minor cleanup
2014-02-07 20:04:14 -05:00
Baris Soner Usakli
e06a7a343a
userslug for new chat messages
2014-02-07 19:29:54 -05:00
Baris Soner Usakli
7531d9dd2c
fixes username in account page
2014-02-07 16:58:56 -05:00
Baris Soner Usakli
1d5239b9a5
closes #966
2014-02-07 16:24:09 -05:00
Baris Soner Usakli
d4c2a47c8e
allow images in home and category
2014-02-07 15:00:53 -05:00
Baris Soner Usakli
e4c92880ea
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-07 13:25:21 -05:00
Baris Soner Usakli
b2d3578eac
check if callback is function
2014-02-07 13:25:14 -05:00
Julian Lam
0670382992
final pass - resolved #961
2014-02-07 12:47:19 -05:00
Baris Soner Usakli
8da065d8fd
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-07 12:28:01 -05:00
Baris Soner Usakli
9b147edb36
closes #964
2014-02-07 12:27:55 -05:00
Julian Lam
69f90c0766
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-07 12:11:18 -05:00
Julian Lam
f8ea87b003
issue #961 - fixed bug where if a moderators group was not found, it would cause the active users box to derp out. Also renamed the moderators priv group name
2014-02-07 12:10:46 -05:00
Baris Soner Usakli
d6780652ad
closes #960
2014-02-07 12:09:24 -05:00
Baris Soner Usakli
8efea65e87
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-07 11:45:19 -05:00
Baris Soner Usakli
72c35db6fd
cleanup in move rencet replies'
2014-02-07 11:45:13 -05:00
Julian Lam
e176abae50
started #961 , first pass
2014-02-07 11:21:23 -05:00
Baris Soner Usakli
d2bed7791c
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-06 18:40:10 -05:00
Baris Soner Usakli
a142789c25
if status is not set assume online
2014-02-06 18:40:01 -05:00
psychobunny
3c863feac2
fixes translation bug with app.alert
2014-02-06 17:21:58 -05:00
Baris Soner Usakli
a1807f3e12
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-06 17:12:19 -05:00
Baris Soner Usakli
11e8fa31ab
small fix to online user visiblity
2014-02-06 17:12:13 -05:00
Julian Lam
720644b964
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-06 17:09:50 -05:00
Julian Lam
d360a9bcac
resolved #868
2014-02-06 17:09:36 -05:00
Baris Soner Usakli
1bde667245
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-06 16:58:50 -05:00
Baris Soner Usakli
f05dc95aa5
removed console.log
2014-02-06 16:58:43 -05:00
psychobunny
a9fbd5be8a
derp, upgrade was upvoting your own favourited posts as well
2014-02-06 16:55:41 -05:00
psychobunny
d9f61385ca
cleanup
2014-02-06 16:50:39 -05:00
psychobunny
2c81d1f2d9
half hearted deprecation warning (maybe for 0.5x?)
2014-02-06 16:50:39 -05:00
psychobunny
37affe2489
no need to use mget, app.alert already translates
2014-02-06 16:50:38 -05:00
psychobunny
1b1bdd7912
upgrade script upvotes all previously favourited posts
2014-02-06 16:50:37 -05:00
psychobunny
1e955b769b
refactoring favourites
2014-02-06 16:50:37 -05:00
psychobunny
25a6302c01
upvoting / downvoting complete
2014-02-06 16:50:36 -05:00
psychobunny
af805d3ca4
Favourites.hasVoted
2014-02-06 16:50:36 -05:00
psychobunny
d35dc2d89b
favouriting no longer affects reputation
2014-02-06 16:50:35 -05:00
psychobunny
6ffab73784
removing reputation from favourites, adding voting buttons to template
2014-02-06 16:50:34 -05:00
psychobunny
ef1fdbed71
server-side voting logic
2014-02-06 16:50:34 -05:00
psychobunny
cf3f72feb9
client-side voting logic
2014-02-06 16:50:33 -05:00
psychobunny
113e5a381b
voting en_GB lang keys
2014-02-06 16:50:33 -05:00
psychobunny
60ec23b200
upvote/downvote/unvote socket calls
2014-02-06 16:50:32 -05:00
Baris Soner Usakli
71c64de8bb
pass error to next
2014-02-06 16:35:14 -05:00
Baris Soner Usakli
493ea79a0b
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-06 16:32:16 -05:00
Baris Soner Usakli
56cdc86a37
took out userSockets, using io.sockets.clients() now'
2014-02-06 16:32:11 -05:00
Julian Lam
4e776cad96
fixing unintentional bolding in category view in Turkish language
2014-02-06 16:19:50 -05:00
Julian Lam
b7cb0d02f8
resolved #944
2014-02-06 16:02:42 -05:00
Julian Lam
1e7adda054
for #944
2014-02-06 15:58:27 -05:00
Julian Lam
f3b2771802
fixing indentation
2014-02-06 15:50:49 -05:00
Julian Lam
054fd46924
Merge branch 'master' of github.com:greynaert/NodeBB into greynaert-master
2014-02-06 15:49:48 -05:00
Julian Lam
0fd9a88a3e
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-06 15:45:30 -05:00
Julian Lam
f949af70ad
fixed #949
2014-02-06 15:45:21 -05:00
ferncoder
9fede2cb05
(issue #929 ) Admin users can now see offline users
...
Add the check of the req.user to allow anonymous user to watch de /user
pages
2014-02-06 21:12:12 +01:00
Baris Soner Usakli
dc592853fc
closes #942
2014-02-06 14:27:37 -05:00
ferncoder
183f27b167
(issue #929 ) Admin users can now see offline users
...
https://github.com/designcreateplay/NodeBB/issues/929
2014-02-06 19:35:58 +01:00
Baris Soner Usakli
dedf4add53
better incr for mongo
2014-02-06 00:00:21 -05:00
Baris Soner Usakli
a0195ffa32
fixes users online loadmore
2014-02-05 22:49:10 -05:00
Baris Soner Usakli
3e92644104
removed console.log
2014-02-05 21:20:31 -05:00
Baris Soner Usakli
6d866ccc86
chat profile picture will go to users profile
2014-02-05 20:29:13 -05:00
Baris Soner Usakli
8ef9d787f5
human readable profile page numbers
2014-02-05 20:20:04 -05:00
Baris Soner Usakli
01cb67d1f3
closes #945
2014-02-05 18:25:13 -05:00
Baris Soner Usakli
a01008cf7d
only logged in users increase profile view count
2014-02-04 19:19:57 -05:00
Baris Soner Usakli
d83b45a427
changed placed
2014-02-04 18:43:31 -05:00
Baris Soner Usakli
388532eedc
closes #943
2014-02-04 18:16:45 -05:00
Baris Soner Usakli
9823ff0960
more fixes
2014-02-04 18:06:38 -05:00
Baris Soner Usakli
c17b8ae9a1
fixes
2014-02-04 17:46:28 -05:00
Baris Soner Usakli
574e981de9
closes #831 , user profile changes
2014-02-04 17:31:05 -05:00
psychobunny
3c63b135c7
closes #939
2014-02-04 11:50:50 -05:00
psychobunny
cecd3fe969
adding return false to favouriting and following. using jq for follow code
2014-02-04 10:37:33 -05:00
Julian Lam
5c957e8f8b
Merge pull request #940 from pillows/master
...
We must advance!
2014-02-04 04:47:49 -08:00
Hack Pie
c8208f2a3e
We must advance!
2014-02-04 02:18:43 -05:00
Julian Lam
15728e90f6
okay, ACTUALLY adding those language strings.
2014-02-03 22:33:59 -05:00
Julian Lam
2b9106b5ce
properly added Turkish, Norwegian, and Hungarian
2014-02-03 21:54:41 -05:00
Julian Lam
db00b01c4a
updates to pt_BR
2014-02-03 21:41:43 -05:00
Julian Lam
bd4bce0e3f
removing stuff that shouldn't have been committed
2014-02-03 21:40:35 -05:00
Julian Lam
a3cf42c072
Hungarian, Norwegian Bokmål, Turkish :)
2014-02-03 20:51:56 -05:00
Julian Lam
25b48c43eb
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-03 20:41:58 -05:00
Julian Lam
f7d1738a8e
typechecking plugin loading
2014-02-03 20:41:42 -05:00
Baris Soner Usakli
de56107c2b
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-03 19:24:37 -05:00
Baris Soner Usakli
c7195290c8
added infinite load to user favourites page
2014-02-03 19:24:27 -05:00
Julian Lam
8ad8a60987
0.3.1
2014-02-03 18:15:38 -05:00
Baris Soner Usakli
d53480015b
removed dupe route
2014-02-03 16:16:39 -05:00
Baris Soner Usakli
e8dd8db010
helper function to create routes
2014-02-03 15:18:06 -05:00
Baris Soner Usakli
5bed729682
closes #935
2014-02-03 13:23:57 -05:00
Baris Soner Usakli
d0592412e6
added status to template
2014-02-03 12:54:16 -05:00
Baris Soner Usakli
c2652f908a
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-02 15:43:36 -05:00
Baris Soner Usakli
8bba4889d2
moving deleted topics wont cause topic count to go negative
2014-02-02 15:43:33 -05:00
psychobunny
a53c35f071
added back 'body' trigger - to be deprecated in 0.4x
2014-02-02 15:11:33 -05:00
psychobunny
3955ca560f
changed hook triggers to window from body
2014-02-02 15:10:44 -05:00
Baris Soner Usakli
3d61a1b15b
use map instead of eachSeries
2014-02-02 15:02:27 -05:00
Baris Soner Usakli
6bd79a2fa0
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-02 14:51:26 -05:00
psychobunny
4abeed3802
client side hooks - action:connected, action:reconnected, action:disconnected
2014-02-02 14:51:16 -05:00
Baris Soner Usakli
60b13cd2f7
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-02 14:51:10 -05:00
Baris Soner Usakli
d788ad7cdf
return offine status if user isnt online
2014-02-02 14:51:02 -05:00
psychobunny
609821029b
app.isAdmin available client-side
2014-02-02 14:47:49 -05:00
psychobunny
1c1c5da8f2
isAdmin in header
2014-02-02 14:38:09 -05:00
Baris Soner Usakli
214b74abc9
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-02 14:25:38 -05:00
Baris Soner Usakli
148438f7a0
closes #928 , closes #930
2014-02-02 14:25:35 -05:00
psychobunny
3f0f2bc956
console.log
2014-02-02 13:53:50 -05:00
psychobunny
ecc1c315cc
closes #927
2014-02-02 13:53:23 -05:00
Julian Lam
d1eba104d2
minor tweak to var names
2014-02-02 13:36:47 -05:00
Julian Lam
3d40cb095f
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-02 13:03:02 -05:00
Julian Lam
79af442306
resolved #926
2014-02-02 13:02:52 -05:00
Baris Soner Usakli
0afd4ffdda
app.js cleanup
2014-02-02 01:38:46 -05:00
Baris Soner Usakli
94ae80010b
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-01 23:14:50 -05:00
Baris Soner Usakli
ca06a24df2
only logged in users can flag
2014-02-01 23:14:44 -05:00
Julian Lam
a942f4086c
new german translations, yay!
2014-02-01 22:46:28 -05:00
Julian Lam
53285d70a9
just sneaking tabIndent into NodeBB core -- nothing to see here...
2014-02-01 22:38:52 -05:00
Julian Lam
29de88456b
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-02-01 14:59:51 -05:00
Julian Lam
8ac7ccb4f8
calling auth immediately after client connection (apparently, not doing so throws errors on install?)
2014-02-01 14:59:45 -05:00
Baris Soner Usakli
825c568bc1
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-02-01 13:41:39 -05:00
Baris Soner Usakli
15479a31c2
unread fix
2014-02-01 13:41:32 -05:00
Julian Lam
d9feaf6abc
new tx strings with fallback (+ french translations)
2014-02-01 00:16:25 -05:00
Barış Soner Uşaklı
0517a63068
Update README.md
2014-01-31 23:56:18 -05:00
Baris Soner Usakli
5aa80619c8
default image for anon users
2014-01-31 23:27:54 -05:00
Baris Soner Usakli
0a8db4e4a7
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-31 23:04:09 -05:00
Baris Soner Usakli
23f3111173
fixes alert close
2014-01-31 23:04:01 -05:00
Julian Lam
3c55672f62
seconds != milliseconds *facepalm*
2014-01-31 22:59:49 -05:00
Julian Lam
cb5baec4eb
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-31 22:52:17 -05:00
Julian Lam
d7b44789fc
updating stati to use sibling classes
2014-01-31 22:52:11 -05:00
Baris Soner Usakli
cb6116c6cf
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-31 22:26:05 -05:00
Baris Soner Usakli
db309ce8a1
closes #661
2014-01-31 22:25:59 -05:00
Julian Lam
c0ec0b2800
casing
2014-01-31 22:20:38 -05:00
Baris Soner Usakli
2cdddd2637
closes #925
2014-01-31 21:27:11 -05:00
Baris Soner Usakli
9e22b7c8fd
focus composer text area after drag resize
2014-01-31 21:16:51 -05:00
Baris Soner Usakli
63a3bfd51d
after drag focus input in chat, closes #924
2014-01-31 21:13:56 -05:00
Baris Soner Usakli
6c2a74bd38
if user status is offline dont show them in room browsing text
2014-01-31 20:19:59 -05:00
Baris Soner Usakli
27f0c0c910
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-31 18:17:20 -05:00
Baris Soner Usakli
1eb7ff9ff3
closes #923
2014-01-31 18:17:13 -05:00
Julian Lam
2e407b1f78
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-31 16:42:56 -05:00
Julian Lam
30f90fee31
running npm install for all plugins and themes as well, because npm (N)
2014-01-31 16:42:34 -05:00
Baris Soner Usakli
384834328c
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-31 16:21:48 -05:00
Baris Soner Usakli
c2746b3bb1
minor tweaks to status
2014-01-31 16:21:41 -05:00
Julian Lam
252af4e8cc
fixing bug where new installs exposed the administrators group.
2014-01-31 16:04:33 -05:00
Baris Soner Usakli
feaea6dcea
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-31 15:47:42 -05:00
Baris Soner Usakli
52962a7e9b
dont show invisible users in online users page
2014-01-31 15:47:26 -05:00
Julian Lam
b288edfb6b
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-31 15:27:28 -05:00
Julian Lam
9e8addee81
fixed #859
2014-01-31 15:27:13 -05:00
Baris Soner Usakli
700876fe58
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-31 15:13:58 -05:00
Baris Soner Usakli
97e0e48b07
closes #714 , closes #824
2014-01-31 15:13:52 -05:00
Julian Lam
c9bb65133a
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-31 13:17:48 -05:00
Julian Lam
37f7d1d08a
resolved issue #913
2014-01-31 13:17:28 -05:00
Baris Soner Usakli
1fa88b9475
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-31 13:01:06 -05:00
Baris Soner Usakli
22bc3e9571
added statuses into dropdown
2014-01-31 13:00:59 -05:00
Julian Lam
7fe5c33048
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-31 12:27:52 -05:00
Julian Lam
29c6b789a2
tweak to prev commit
2014-01-31 12:25:53 -05:00
Baris Soner Usakli
6fbed193f7
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-31 12:23:05 -05:00
Baris Soner Usakli
aa856e2f5c
closes #847
2014-01-31 12:22:59 -05:00
Julian Lam
77cacda0fa
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-31 12:19:35 -05:00
Julian Lam
748055ac52
hiding development block from ACP if not in dev mode
2014-01-31 12:19:30 -05:00
Baris Soner Usakli
c122492470
added back the template if
2014-01-31 12:11:49 -05:00
Baris Soner Usakli
14b2fd050e
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-31 11:59:42 -05:00
Baris Soner Usakli
bdd4bb0003
closes #920 '
2014-01-31 11:59:35 -05:00
Julian Lam
59d1a90820
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-31 11:48:15 -05:00
Julian Lam
1b794f00bd
slovak updates
2014-01-31 11:48:05 -05:00
psychobunny
5b3862f58e
updated links on ACP home page, part of #461
2014-01-31 11:47:11 -05:00
psychobunny
4647b88071
added optional forum terms of use to ACP, closes #775
2014-01-31 11:38:23 -05:00
Baris Soner Usakli
267e7a3d5b
fixed redirect
2014-01-31 11:37:24 -05:00
Baris Soner Usakli
c042d4253b
added popular rss feed
2014-01-31 11:16:23 -05:00
psychobunny
347d402f48
closes #752
2014-01-31 11:07:47 -05:00
psychobunny
e91ab5c660
closes #917
2014-01-31 10:56:43 -05:00
Julian Lam
4d23b46916
latest transifex changes
2014-01-31 10:17:21 -05:00
Barış Soner Uşaklı
f95725369a
Merge pull request #922 from mattijle/master
...
err.message is undefined use err instead
2014-01-31 06:57:16 -08:00
Julian Lam
c89bc3b9d5
fixing missing template requirement on /reset
2014-01-31 09:03:06 -05:00
Matti Leppänen
b71607ea7d
err.message is undefined use err instead
2014-01-31 15:19:45 +02:00
Julian Lam
bb316bd949
new transifex strings
2014-01-30 21:42:52 -05:00
Julian Lam
eff99ffabe
fixed #915
2014-01-30 21:05:59 -05:00
Julian Lam
63437571b8
fixing header favicon to look for type as well
2014-01-30 20:51:14 -05:00
Julian Lam
ec61d62c63
recommit to Transifex formatting
2014-01-30 20:22:25 -05:00
Julian Lam
3f1582e053
Transifex config file
2014-01-30 20:19:57 -05:00
Julian Lam
a137fb76ed
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-30 20:14:33 -05:00
Julian Lam
a940915e48
re-encoding some pt_BR language files in UTF-8
2014-01-30 20:14:01 -05:00
Baris Soner Usakli
ab2b0e6560
fixed direct loading of popular page
2014-01-30 19:52:32 -05:00
Baris Soner Usakli
817546c6cf
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-30 19:46:32 -05:00
Baris Soner Usakli
a86ddc9934
closes #726
2014-01-30 19:46:25 -05:00
Julian Lam
39842b5ea9
Merge pull request #919 from tedr56/master
...
Fr translation - Flag
2014-01-30 16:16:55 -08:00
TedVJ
18051435e5
Fr translation - Flag
2014-01-31 01:12:36 +01:00
Baris Soner Usakli
45e2f7f7f5
removed console.log
2014-01-30 17:44:47 -05:00
Baris Soner Usakli
36ae568349
#656
2014-01-30 17:41:54 -05:00
Baris Soner Usakli
e48014ba61
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-30 16:44:45 -05:00
Baris Soner Usakli
0f5b3ae859
added img-responsive to images in chat messages
2014-01-30 16:44:36 -05:00
Julian Lam
55b67ed735
Merge branch 'master' of github.com:designcreateplay/NodeBB
...
Conflicts:
src/routes/api.js
2014-01-30 15:40:44 -05:00
Julian Lam
0376e3d574
renamed language directories to ICU standard, upgrade script, no longer promoting english at top of list in languages tab, en now en_GB, encompasses Canadian and English English
2014-01-30 15:39:51 -05:00
Baris Soner Usakli
9fbd5ed596
removed unused function
2014-01-30 15:21:00 -05:00
psychobunny
23c711947b
added support for !array.length
2014-01-30 14:33:03 -05:00
psychobunny
0cca8e0bcf
closes #783 , support for array.length
2014-01-30 14:26:55 -05:00
Baris Soner Usakli
efa45ad907
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-30 14:04:27 -05:00
Baris Soner Usakli
89e554b333
closes #906
2014-01-30 14:04:20 -05:00
psychobunny
112a9cb532
closes #689
2014-01-30 13:51:28 -05:00
psychobunny
68105c6289
send environment state to client
2014-01-30 13:37:30 -05:00
psychobunny
303a32dce6
closes #855 - app.alert strings are now passed through translator so we can finally start getting rid of the remainder of hardcoded strings
2014-01-30 13:31:05 -05:00
Baris Soner Usakli
fa910bac20
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-30 13:16:52 -05:00
Baris Soner Usakli
1291f31f3c
closes #897
2014-01-30 13:16:45 -05:00
psychobunny
c253760737
converted filter:posts.custom_profile_info to accept an array instead of building a string for better themability. closes #886
2014-01-30 13:06:35 -05:00
Baris Soner Usakli
9afef92763
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-30 12:56:02 -05:00
Baris Soner Usakli
8607ea9a84
notifications fix
2014-01-30 12:55:55 -05:00
psychobunny
c673cf84c2
themes able to call upon hooks as well. closes #830
2014-01-30 11:57:55 -05:00
psychobunny
92725ee3df
Merge pull request #874 from BitBangersCode/templates-fix
...
Add custom templates to /api/get_templates_listing
2014-01-30 08:38:16 -08:00
Baris Soner Usakli
a7d9944cc1
icons on register login in mobile menu
2014-01-30 11:33:58 -05:00
psychobunny
24d2ac270c
changed notifications code to jq - prevents crashes if notification element does not exist
2014-01-30 11:06:29 -05:00
Julian Lam
d8eec5dd2e
fixed missing og:title on category view
2014-01-30 10:12:45 -05:00
Julian Lam
b954668636
browser title, #911
2014-01-30 10:02:19 -05:00
Julian Lam
de751ed623
fixed #900 - api calls hopefully no longer cached
2014-01-30 09:31:53 -05:00
Julian Lam
fb2b54b314
refactored meta and link tag generation to template (yay frontend processing!)
...
cache busters now always added in template, instead of throughout code
2014-01-30 09:20:43 -05:00
Baris Soner Usakli
1a55f9217d
turn off click events to prevent multiple calls'
2014-01-29 20:51:59 -05:00
Baris Soner Usakli
06ca569554
closes #909
2014-01-29 15:49:36 -05:00
Baris Soner Usakli
d0702f663b
disable scroll events on ajaxify'
2014-01-29 15:19:54 -05:00
Baris Soner Usakli
3c273f4a66
error checks for missing after
2014-01-29 15:08:14 -05:00
Baris Soner Usakli
6a78221261
closes #903
2014-01-29 15:02:34 -05:00
Julian Lam
fe8156793a
Merge branch 'master' of github.com:henrock/NodeBB into henrock-master
2014-01-29 14:41:20 -05:00
Julian Lam
3f876fec80
added ajaxify.start and ajaxify.end client-side hooks
2014-01-29 14:29:45 -05:00
Julian Lam
024cfc17c5
tweak
2014-01-29 12:58:52 -05:00
Julian Lam
95d671281a
moved port 80 and 443 warnings to its own conditional
2014-01-29 12:42:33 -05:00
Julian Lam
38ee3fd5a3
don't bother firing hooks received by js unless a listener exists
2014-01-29 12:28:21 -05:00
Henrik Jerlenius
52ee5096af
fixed translation on recent replies feed
2014-01-29 12:48:50 +01:00
Henrik Jerlenius
4f4fef3832
fixed another 'Fork' ;)
2014-01-29 12:34:47 +01:00
Henrik Jerlenius
ec72818988
updated all swedish translations
2014-01-29 12:25:54 +01:00
Henrik Jerlenius
8fad39725b
updated all swedish translations
2014-01-29 12:23:10 +01:00
Henrik Jerlenius
b3718a1605
changed language info
2014-01-29 08:43:59 +01:00
Henrik Jerlenius
8784961e1e
First commit on swedish translation
2014-01-29 08:34:23 +01:00
Julian Lam
133188f14c
introducing cache buster to plugin CSS and loaded scripts
2014-01-28 22:06:27 -05:00
Baris Soner Usakli
cccaf642a6
closes #898
2014-01-28 20:10:53 -05:00
Baris Soner Usakli
38886f6b58
making a socket call will set lastonline
2014-01-28 16:14:56 -05:00
Baris Soner Usakli
ed401de169
closes #896
2014-01-27 20:21:14 -05:00
Baris Soner Usakli
5759b1b1a2
closes #857
2014-01-27 19:58:03 -05:00
Baris Soner Usakli
f68b692ce4
closes #863
2014-01-27 17:15:17 -05:00
Baris Soner Usakli
c06320e28b
closes #870
2014-01-27 15:41:08 -05:00
Baris Soner Usakli
c0184ba350
blocked
2014-01-27 14:57:25 -05:00
Julian Lam
4e659cfeee
Merge pull request #892 from tedr56/master
...
Fr translation update
2014-01-27 11:07:01 -08:00
Julian Lam
50c4a707e5
removing empty login.js
2014-01-27 13:40:35 -05:00
TedVJ
1cef31e47b
Fr translation update
2014-01-27 19:38:43 +01:00
Julian Lam
744b6517bf
issue #891
2014-01-27 13:37:31 -05:00
Julian Lam
4ae8824faf
tweaks and formatting
2014-01-27 13:04:03 -05:00
Julian Lam
7edf041747
Merge branch 'master' of github.com:mattijle/NodeBB into mattijle-master
2014-01-27 12:52:52 -05:00
Julian Lam
db62e10673
upgrade scripts for sso plugins
2014-01-27 12:50:50 -05:00
Julian Lam
f51d525d9c
errant semicolon
2014-01-27 12:29:48 -05:00
Julian Lam
d924d01677
timeago fix for brasilian portugueso
2014-01-27 12:28:36 -05:00
Julian Lam
aa81b25fe6
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-27 12:20:24 -05:00
Julian Lam
2d72956591
updated language files to match english pages.json
2014-01-27 12:20:11 -05:00
Julian Lam
fac55160fa
new translation strings for pages, proper unicode handling in parseFragment
2014-01-27 12:19:25 -05:00
Julian Lam
e69f5fff3b
added "pages" translation file to languages
2014-01-27 11:39:00 -05:00
Julian Lam
5482146bc4
simplified a conditional
2014-01-27 11:12:54 -05:00
Julian Lam
208fe454bb
Merge pull request #890 from tedr56/master
...
Fr Translation Update
2014-01-27 08:05:42 -08:00
TedVJ
9a876f7003
Fr Translation Update
2014-01-27 16:21:54 +01:00
Julian Lam
6514504ddd
fixed #889
2014-01-27 09:09:55 -05:00
Matti Leppänen
98c4b08f15
Merge remote-tracking branch 'upstream/master'
2014-01-27 16:07:08 +02:00
Leonardo Galani
90352cd858
adding brazilian portuguese language translations
2014-01-27 07:53:04 -05:00
Baris Soner Usakli
71ccd0854d
fixes notification header icon
2014-01-27 01:58:16 -05:00
Baris Soner Usakli
f874059fe9
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-27 01:48:50 -05:00
Baris Soner Usakli
9cb232c198
added header tooltips
2014-01-27 01:48:43 -05:00
Julian Lam
8e1137b5dd
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-26 23:35:11 -05:00
Julian Lam
ef39c128c2
Removing Google Plus integration from core - adios!
2014-01-26 23:34:54 -05:00
Baris Soner Usakli
c18788fbc9
crash fix if topic has no posts, and check confirm obj
2014-01-26 23:20:37 -05:00
Baris Soner Usakli
31a57cf0dd
closes #885
2014-01-26 22:36:06 -05:00
Baris Soner Usakli
8e4236a3a9
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-26 22:23:15 -05:00
Baris Soner Usakli
e4d60b7a55
Merge branch 'master' of https://github.com/richiepreece/NodeBB into richiepreece-master
2014-01-26 22:14:04 -05:00
psychobunny
f8be072b99
chats - isNew flag, and sending in userData.uid now
2014-01-26 22:10:12 -05:00
Baris Soner Usakli
d54e2fba9e
closes #810
2014-01-26 21:32:53 -05:00
Matti Leppänen
4f495e2b46
quote gets added to the active composer instead of starting a new one.
2014-01-27 02:51:49 +02:00
Baris Soner Usakli
fb8fbb2372
removed console.log
2014-01-26 18:40:28 -05:00
Baris Soner Usakli
c0e818afc6
closes #854
2014-01-26 18:36:07 -05:00
Baris Soner Usakli
26673d3ada
delegated events in admin categories
2014-01-26 17:55:51 -05:00
Julian Lam
7e3c46db61
Removing Twitter SSO - toodles!
2014-01-26 17:42:48 -05:00
Julian Lam
e7eab83d8f
removing facebook SSO from core
2014-01-26 17:26:56 -05:00
Baris Soner Usakli
25c4648e2e
load 20 in recent
2014-01-26 17:25:18 -05:00
Baris Soner Usakli
8770284661
removed console.log
2014-01-26 17:23:28 -05:00
Baris Soner Usakli
8d0b880e5a
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-26 17:17:49 -05:00
Baris Soner Usakli
25442a89ca
closes #878
2014-01-26 17:17:34 -05:00
psychobunny
6ab08e91a2
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-26 16:52:07 -05:00
psychobunny
45a5b88824
added filter:messaging.parse hook
2014-01-26 16:50:59 -05:00
Baris Soner Usakli
fac2cd9464
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-26 16:23:39 -05:00
Baris Soner Usakli
da626a4035
more fixes
2014-01-26 16:23:37 -05:00
Julian Lam
0c71707fb5
fixed #877
2014-01-26 16:22:50 -05:00
Julian Lam
0869765e2b
Merge remote-tracking branch 'origin/master'
2014-01-26 16:01:36 -05:00
Julian Lam
22354227be
hiding "Forgot Password" link using Plugins.hasListeners, instead of derpy config settings bool
2014-01-26 15:59:22 -05:00
Baris Soner Usakli
2560704839
recent unread cleanup
2014-01-26 14:56:16 -05:00
Baris Soner Usakli
c6d48f477c
fixes recent topic post notification
2014-01-26 14:03:33 -05:00
Julian Lam
96b2a15290
user registration now no longer sends a welcome email if no emailers are present
2014-01-26 13:21:23 -05:00
Julian Lam
d7d4290099
resolved #879
2014-01-26 13:10:39 -05:00
Baris Soner Usakli
14e68bc9e2
dropup for bottom post bar
2014-01-26 01:34:40 -05:00
Baris Soner Usakli
bd0b5f4cdb
more error checks in thread move
2014-01-25 22:43:49 -05:00
Baris Soner Usakli
810095d287
fixed infinite loading on categories
2014-01-25 22:30:48 -05:00
Baris Soner Usakli
2988230b07
some more fixes, cant quote and see deleted messages
2014-01-25 22:19:51 -05:00
Julian Lam
5fde1eb3e7
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-25 22:00:13 -05:00
Julian Lam
d42beda3da
added page selection if you click on the pipe
2014-01-25 21:44:47 -05:00
Baris Soner Usakli
bf81159558
fixes a pagination bug
2014-01-25 21:35:09 -05:00
Baris Soner Usakli
dcefad1427
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-25 21:26:03 -05:00
Baris Soner Usakli
1afd7ae332
trim pagination numberS
2014-01-25 21:25:56 -05:00
Julian Lam
197b7f2a6c
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-25 20:42:37 -05:00
Julian Lam
a240fc81ce
fixed #869
2014-01-25 20:42:29 -05:00
Baris Soner Usakli
6628db89af
added saerch array
2014-01-25 20:36:55 -05:00
Baris Soner Usakli
b4ea8e58fa
removed check for no topics in category, you should be able to go into empty categories
2014-01-25 20:08:02 -05:00
Baris Soner Usakli
6ff11c5243
check for number
2014-01-25 19:57:25 -05:00
Baris Soner Usakli
75f178636b
more fixes
2014-01-25 19:50:50 -05:00
Baris Soner Usakli
1084523c92
lots of pagination work, query params, ajaxify to pids
2014-01-25 19:19:25 -05:00
MrWaffle
869f9e0d86
Add custom templates to /api/get_templates_listing
2014-01-25 23:13:51 +01:00
Baris Soner Usakli
8744013013
Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
2014-01-25 16:42:06 -05:00
Baris Soner Usakli
2e786cc4d1
closes #873 , removed global translator, templates and server objects
2014-01-25 16:39:27 -05:00
Baris Soner Usakli
393bb7245c
closes #866
2014-01-25 12:05:48 -05:00
Baris Soner Usakli
d718eca935
fixes global meta leak, and categories meta require, #873
2014-01-25 01:34:56 -05:00
psychobunny
46e29dfb2b
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-25 00:05:45 -05:00
psychobunny
d67ae5c2be
changing undetected minified JS file warning to info message instead
2014-01-25 00:05:41 -05:00
Baris Soner Usakli
b23960e8d7
fixes to category pagination
2014-01-24 23:05:59 -05:00
Baris Soner Usakli
ef6fd35e85
lots of cleanup, moved pagination to requirejs module
2014-01-24 22:26:11 -05:00
Baris Soner Usakli
aa73a10fc4
added pagination to vanilla topic template
2014-01-24 21:01:28 -05:00
Baris Soner Usakli
0580d0c8a3
Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
2014-01-24 20:51:02 -05:00
Baris Soner Usakli
5f0c6e508d
some cleanup
2014-01-24 20:50:55 -05:00
Baris Soner Usakli
606367701f
pagination on posts
2014-01-24 20:00:56 -05:00
Julian Lam
1cce38cae6
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-24 19:55:34 -05:00
Julian Lam
d5534cf545
fixing upgrade script on edge builds
2014-01-24 19:55:19 -05:00
psychobunny
0a749023cb
fixing if statements inside a @first / @last block
2014-01-24 14:19:24 -05:00
Baris Soner Usakli
8d007e7029
Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
2014-01-24 13:27:45 -05:00
Baris Soner Usakli
cf39c66017
some pagination work
2014-01-24 13:27:36 -05:00
Julian Lam
e09132350d
re-adding conditional to hide quote/reply block if no write perm
2014-01-24 13:26:50 -05:00
psychobunny
503e59b12b
clean up conditionals only at the very end of parsing
2014-01-24 13:25:33 -05:00
Julian Lam
26848641cd
restoring post/quote buttons pending template system fix for IFs
2014-01-24 13:11:30 -05:00
Julian Lam
a3fe390810
reverting change to User.search that added "timing" to the return of User.search. Such a change can only be made for 0.4.0, sorry!
2014-01-24 13:09:44 -05:00
Julian Lam
be86f84ef8
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-24 12:29:28 -05:00
Julian Lam
ab85ef6b7b
fixed issue where back button stopped ajaxifying internally.
2014-01-24 12:29:11 -05:00
Baris Soner Usakli
620ff65cbe
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-24 12:11:29 -05:00
Baris Soner Usakli
7f23f848fe
fix for mismatch between favourite count and number of people in favourited seT
2014-01-24 12:11:22 -05:00
Julian Lam
459d5ddccd
fixed #867 - added proper detection so that onpopstate would not react if it was a proper page load
2014-01-24 10:09:28 -05:00
Julian Lam
43808c01ec
reduced the number of 'ajaxify.go' calls to one, in /src
2014-01-24 10:00:57 -05:00
Julian Lam
b587d7b5ad
fixed issue where calls to ajaxify.go were sending in a "template" argument that had since been removed, navigating back to NodeBB from an external link now no longer clobbers the History stack.
2014-01-24 09:48:41 -05:00
Julian Lam
ef450edfea
Revert "possible fix to #840 ", please see #867
...
This reverts commit 1d666bf7f0
2014-01-24 08:48:40 -05:00
Julian Lam
dc7cd95f6d
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-24 08:18:02 -05:00
Barış Soner Uşaklı
c91ae0c4c4
Update categories.js
2014-01-24 00:42:34 -05:00
Baris Soner Usakli
f3bdc55348
little tweak to user search show timing and 10 users, sort after slicing
2014-01-23 23:31:10 -05:00
Baris Soner Usakli
1d666bf7f0
possible fix to #840
2014-01-23 22:45:11 -05:00
Baris Soner Usakli
3ea7d4d217
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-23 21:35:33 -05:00
Baris Soner Usakli
3793ddc2e8
fixes user tooltips on infinit load
2014-01-23 21:35:25 -05:00
Julian Lam
3fa9e3f31b
Merge pull request #862 from akhoury/master
...
removed use_proxy config, cleaned-up some comments
2014-01-23 18:23:33 -08:00
akhoury
dcc6ec797e
removed use_proxy config, cleaned-up some comments and sneaked in a time log print on initialization, also, related to pull#820
2014-01-23 20:35:53 -05:00
Baris Soner Usakli
b0ef974590
lots of cleanup and refactor
2014-01-23 19:01:30 -05:00
Baris Soner Usakli
f62c82c797
send app to action:app.load
2014-01-23 17:08:33 -05:00
Baris Soner Usakli
6da12d1a39
and for andrew
2014-01-23 16:37:11 -05:00
Baris Soner Usakli
bc1cde38da
added getObjectKeys for julian :)
2014-01-23 16:34:54 -05:00
Julian Lam
2af14e47b1
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-23 16:20:46 -05:00
Julian Lam
d380f69310
support for "registered users" and "administrators" in access control (categories). Renamed "Administrators" group to "administrators", and made hidden
2014-01-23 16:19:10 -05:00
Baris Soner Usakli
824c5072e8
topics should be marked read correctly if you are already in it
2014-01-23 15:46:39 -05:00
Julian Lam
a0e9e52e70
adding xregexp to ACP header
2014-01-23 15:16:30 -05:00
Baris Soner Usakli
47c32738a6
removed tests from acp
2014-01-23 12:51:54 -05:00
Julian Lam
f02cd9df82
Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
...
Conflicts:
src/user.js
2014-01-23 08:15:16 -05:00
Matti Leppänen
4cfd970d5f
Added Finnish language translation
2014-01-23 13:10:07 +02:00
Aziz Khoury
659817b4f1
Update comment
2014-01-23 01:07:10 -05:00
Aziz Khoury
7e3d8d65f5
Update login.js
2014-01-23 01:04:01 -05:00
Baris Soner Usakli
b717c74a81
closes #856
2014-01-22 23:58:21 -05:00
Baris Soner Usakli
042174290f
removed console.log
2014-01-22 20:35:57 -05:00
Baris Soner Usakli
8aebb7f84d
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-22 19:48:01 -05:00
Baris Soner Usakli
b325212182
crash fix for admin verify email, temp fix
2014-01-22 19:47:55 -05:00
Julian Lam
1e99945515
Merge branch 'yangwao-master'
2014-01-22 19:37:06 -05:00
Julian Lam
f0e47e43bc
fb and tw strings for traditional chinese
2014-01-22 19:34:06 -05:00
wao
7b150ab407
added Slovak language translation
2014-01-23 00:45:47 +01:00
Baris Soner Usakli
044382047d
removed commented out section
2014-01-22 17:29:23 -05:00
Baris Soner Usakli
46fb6377ee
fixed topic reply if title was 255, better notif text in unread and recent,removed console.log
2014-01-22 17:23:20 -05:00
Baris Soner Usakli
79803d2b3d
Merge branch 'favourite-spy' of https://github.com/BitBangersCode/NodeBB into BitBangersCode-favourite-spy
2014-01-22 15:28:09 -05:00
MrWaffle
d63ced8a5c
Move to client side
2014-01-22 21:08:43 +01:00
MrWaffle
03d92eb5cd
Thought I'd refactor this for you guys
2014-01-22 20:29:37 +01:00
MrWaffle
da317b5a85
async wooo
2014-01-22 20:27:42 +01:00
MrWaffle
c0e2e9d011
Remove log
2014-01-22 20:21:56 +01:00
MrWaffle
69b54337bb
Limit to 5 users
2014-01-22 20:21:12 +01:00
Baris Soner Usakli
b945dfc71d
closes #843
2014-01-22 14:04:04 -05:00
MrWaffle
b887b76c29
Implement favourite tooltip to show who favourited a post
2014-01-22 19:46:34 +01:00
Baris Soner Usakli
45d2affdfb
closes #833
2014-01-22 12:46:37 -05:00
Baris Soner Usakli
baa74958c5
can set image class for categories
2014-01-22 11:46:50 -05:00
Baris Soner Usakli
eac6b23811
closes #841
2014-01-22 11:08:52 -05:00
Barış Soner Uşaklı
c709fae251
Merge pull request #828 from BitBangersCode/admin-group-fix
...
Admin group fix
2014-01-22 08:03:01 -08:00
Richie Preece
d959aad41f
Changed to bcrypt.js
2014-01-21 20:56:12 -07:00
Julian Lam
4c01fc4c0e
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-21 22:30:25 -05:00
Julian Lam
7db231ca54
traditional chinese language pack - 很好?
2014-01-21 22:30:03 -05:00
Baris Soner Usakli
18075b85c7
winston.error
2014-01-21 20:57:02 -05:00
Baris Soner Usakli
e997c63480
return error
2014-01-21 20:47:03 -05:00
Baris Soner Usakli
9393a39452
fixes translation in recent
2014-01-21 19:07:03 -05:00
Julian Lam
74786a32ac
0.3.0
2014-01-21 16:58:06 -05:00
Julian Lam
308110db49
adding lavender to dependencies
2014-01-21 16:57:28 -05:00
psychobunny
3b4f0a8f4e
updating motd for incoming theme
2014-01-21 16:51:04 -05:00
Josh
4c211b7110
Fixed tabbing/spacing
2014-01-21 21:15:34 +00:00
Josh Rickers
21f6b10023
fixed indenting
2014-01-21 20:44:41 +00:00
Josh Rickers
f9e6fab3ea
Fixed line spacing/tabbing
2014-01-21 20:40:55 +00:00
Julian Lam
53a1474785
second pass for #773 , blocked for now
2014-01-21 15:29:34 -05:00
Julian Lam
bafc8caaf5
first pass at #773
2014-01-21 15:17:41 -05:00
Josh Rickers
55b0270b34
Merge branch 'master' into admin-group-fix
2014-01-21 19:59:21 +00:00
Josh Rickers
4c36083354
Added yourid so it can be used in groups.js
2014-01-21 19:39:06 +00:00
Josh Rickers
a91e464787
updated groups to stop you from removing yourself from the admin group
2014-01-21 19:37:41 +00:00
Josh Rickers
bac1a5ec3e
updated groups to stop you from removing yourself from the admin group
2014-01-21 19:37:01 +00:00
Julian Lam
397861c3cc
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-21 14:01:38 -05:00
Julian Lam
0020f278a5
stopped using unnecessary regex in user search
2014-01-21 13:59:03 -05:00
Baris Soner Usakli
56c789ed61
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-21 12:35:41 -05:00
Baris Soner Usakli
aa2978976c
notif fix
2014-01-21 12:35:34 -05:00
Julian Lam
73d9d6e1d3
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-21 12:33:22 -05:00
Julian Lam
92706a6550
fixed #826
2014-01-21 12:33:11 -05:00
Baris Soner Usakli
74ccfd1e4d
moved islatin out too
2014-01-21 12:02:46 -05:00
Baris Soner Usakli
8f8ea4de92
slug fix
2014-01-21 12:01:09 -05:00
Baris Soner Usakli
104ec7de6e
last poster is visible, slugify check for latin #777
2014-01-21 11:48:56 -05:00
Baris Soner Usakli
a1149b8f8d
notif unread class
2014-01-21 10:38:20 -05:00
Baris Soner Usakli
f107803550
fix
2014-01-21 10:07:24 -05:00
Baris Soner Usakli
039f02456d
if user is in the topic when a new post comes in mark the topic read
2014-01-21 10:06:13 -05:00
Baris Soner Usakli
9400e5bcc9
motd
2014-01-21 01:27:39 -05:00
Baris Soner Usakli
4cae491438
last one for the night
2014-01-21 00:47:33 -05:00
Baris Soner Usakli
93534832b9
small
2014-01-21 00:21:59 -05:00
Baris Soner Usakli
9cd2b36c97
minor fix to topic.tpl
2014-01-21 00:16:35 -05:00
Baris Soner Usakli
a0b80e4061
shouldnt be in template
2014-01-20 23:25:27 -05:00
Baris Soner Usakli
ccc62a202b
dont go to top on search icon click
2014-01-20 21:41:04 -05:00
Baris Soner Usakli
0a1d45b0b9
default panle
2014-01-20 21:33:13 -05:00
Baris Soner Usakli
56fcae1cb2
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-20 21:29:22 -05:00
Baris Soner Usakli
7c16a8be31
recent reply fix
2014-01-20 21:29:14 -05:00
Julian Lam
cc236c1f72
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-20 21:15:55 -05:00
Julian Lam
39d9dd76dc
removed preview button from ACP/themes
2014-01-20 21:15:52 -05:00
Baris Soner Usakli
f282dcd677
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-20 21:00:21 -05:00
Baris Soner Usakli
55d4a5fe3a
template fixes closes #825
2014-01-20 21:00:10 -05:00
Julian Lam
affa51856b
closed #801 pending explanation
2014-01-20 19:05:19 -05:00
Baris Soner Usakli
12a5b6b4c6
body margin for composer
2014-01-20 16:50:39 -05:00
Aziz Khoury
da647d105b
removing couple of console.log
2014-01-20 16:34:12 -05:00
Aziz Khoury
74f23497dc
password should be passed to action hook, and it was being ovewritten
2014-01-20 16:29:46 -05:00
Aziz Khoury
4fad334e18
Merge remote-tracking branch 'upstream/master'
2014-01-20 16:21:57 -05:00
Barış Soner Uşaklı
94f38d0622
Merge pull request #822 from BitBangersCode/admin-fix
...
Confirmation when removing user from a group
2014-01-20 13:18:52 -08:00
Josh
f7a290d0b3
removed function
...
removed function that did not work
2014-01-20 20:55:53 +00:00
Josh
a86ff15f7b
Removed code for yourid
...
removed code that will give the current user id in a var called yourid
2014-01-20 20:54:19 +00:00
Baris Soner Usakli
030cfbffa4
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-20 15:35:17 -05:00
Baris Soner Usakli
ed1c276739
only drag chat modal from header
2014-01-20 15:35:10 -05:00
Josh
f14ad11dd0
add remove user from group confirmation
...
Added confirmation request when removing user from a group.
2014-01-20 20:28:46 +00:00
Julian Lam
9c9fadb5a1
upping mentions minver
2014-01-20 14:53:09 -05:00
Julian Lam
663aff4b24
fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL
2014-01-20 13:41:46 -05:00
Aziz Khoury
a13c321de8
added "trust proxy" config option with default to true
2014-01-20 13:23:40 -05:00
Aziz Khoury
ba85ffb292
Merge remote-tracking branch 'upstream/master'
2014-01-20 13:22:16 -05:00
Julian Lam
2654a8e86a
added cache buster to ACP theme
2014-01-20 13:22:03 -05:00
Julian Lam
cef54fbf6d
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-20 13:17:17 -05:00
Julian Lam
f9e8178d25
fixed timeagago for zh_cn
2014-01-20 13:16:23 -05:00
Baris Soner Usakli
71888adb09
closes #815 , closes #816
2014-01-20 12:56:09 -05:00
Aziz Khoury
f74f01ca77
Changed User.create signature to accept a hash, added a couple of utility functions as well
2014-01-20 12:41:35 -05:00
Julian Lam
e2960e3ed6
Merge pull request #819 from BitBangersCode/mongo-fix
...
Add callback to mongo.searchRemove, fixes infinite schema update
2014-01-20 08:28:23 -08:00
MrWaffle
e4d8ddcf1b
Add callback to mongo.removeSearch, fixes infinite schema update
2014-01-20 17:21:45 +01:00
Julian Lam
d6ae91312e
Merge branch 'master' of github.com:TheRealDrZ/NodeBB into TheRealDrZ-master
...
Conflicts:
public/templates/composer.tpl
2014-01-20 11:15:16 -05:00
Julian Lam
e1a9fe9691
Merge branch 'WindowsFix' of github.com:BitBangersCode/NodeBB into BitBangersCode-WindowsFix
...
Conflicts:
src/webserver.js
2014-01-20 11:08:41 -05:00
Julian Lam
33c84d4684
Merge branch 'akhoury-master'
2014-01-20 11:04:10 -05:00
Julian Lam
95355f9036
added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary
2014-01-20 11:04:06 -05:00
Julian Lam
938b78786e
closed #818 - case insensitive user search
2014-01-20 10:55:29 -05:00
Julian Lam
895bff9b62
Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
2014-01-20 10:48:06 -05:00
Julian Lam
cf69b9fcb3
fixed #817 - issue where the bootswatch theme was loaded before vanilla, causing default bootstrap to override the bootswatch loaded bootstrap
2014-01-20 10:46:49 -05:00
akhoury
58525bd09c
f'in arabs
2014-01-20 01:39:11 -05:00
Baris Soner Usakli
5a069f1076
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-19 22:44:16 -05:00
Baris Soner Usakli
84aa1ab527
motd string and class
2014-01-19 22:44:13 -05:00
Julian Lam
2cfe59f124
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-19 22:29:36 -05:00
Julian Lam
ee6ac77f8b
new upgrade directive
2014-01-19 22:29:28 -05:00
Julian Lam
b6aa31b245
removed references to Reds user search
2014-01-19 22:11:34 -05:00
Julian Lam
e542da1f52
added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins
2014-01-19 22:07:29 -05:00
Baris Soner Usakli
f7aa808fa7
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-19 22:06:33 -05:00
Baris Soner Usakli
050ab738e4
fixed drop area top
2014-01-19 22:06:25 -05:00
Julian Lam
483ad87c1d
first pass
2014-01-19 21:46:39 -05:00
Julian Lam
cfe46f38ee
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-19 18:35:23 -05:00
Baris Soner Usakli
d1ccc692ae
pull right dropdowns
2014-01-19 18:35:18 -05:00
Julian Lam
0c0ae6560a
re: #808 -- removed upgrade directives for v0.2.x branch, and added minSchemaDate check so that if you try to upgrade without doing all upgrades in a previous branch, it will abort.
2014-01-19 18:34:11 -05:00
Baris Soner Usakli
c9f43a60b9
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-19 18:18:55 -05:00
Baris Soner Usakli
3d30c0bd87
tmp fix for nested if
2014-01-19 18:18:47 -05:00
Julian Lam
3624717d84
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-19 18:02:07 -05:00
Julian Lam
07b286650c
adding cache buster to ACP, removing bootstrap css in ACP
2014-01-19 18:02:03 -05:00
Baris Soner Usakli
4273fc4d23
added check for valid field
2014-01-19 18:02:01 -05:00
Baris Soner Usakli
32adbc8c77
close modal on error
2014-01-19 17:49:16 -05:00
Baris Soner Usakli
7310fe82d3
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-19 17:28:15 -05:00
Baris Soner Usakli
189e69284e
fixes for post privileges
2014-01-19 17:28:08 -05:00
Julian Lam
0ccb8a77ba
Merge pull request #811 from BitBangersCode/alternate_title_fix
...
Only alternate title when not focused
2014-01-19 14:25:15 -08:00
Julian Lam
e8d6df22cb
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-19 17:18:18 -05:00
Julian Lam
5861630dec
- removed autocomplete in composer core (now entirely in mentions)
...
- upped jQuery UI to 1.10.4
2014-01-19 17:17:40 -05:00
MrWaffle
c1fea52a93
Only alternate title when not focused
2014-01-19 22:38:44 +01:00
Baris Soner Usakli
1980e945da
fixed admin page active sockets
2014-01-19 14:42:47 -05:00
Baris Soner Usakli
16a42619b5
closes #809
2014-01-19 14:27:07 -05:00
Baris Soner Usakli
54c05f9027
title is no longer centered in composer
2014-01-19 12:59:45 -05:00
Baris Soner Usakli
9879f645f6
added check for undefined, null empty string
2014-01-18 23:28:13 -05:00
Baris Soner Usakli
bbac361670
fixed crash if empty topic was loaded without ajaxify
2014-01-18 23:18:58 -05:00
Baris Soner Usakli
84cbcc5a97
closes #798
2014-01-18 22:23:25 -05:00
Baris Soner Usakli
8c1c844007
closes #806
2014-01-18 21:57:06 -05:00
Baris Soner Usakli
1dddd77ae1
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-18 19:15:17 -05:00
Baris Soner Usakli
72447c9b9c
grouped post buttons in dropdowns
2014-01-18 19:15:07 -05:00
psychobunny
025e1293fa
removed deprecated cssSrc, replaced with optional bootswatchCSS
2014-01-18 16:13:01 -05:00
psychobunny
df53d836e5
fixed dependency check for cerulean
2014-01-18 16:01:14 -05:00
Baris Soner Usakli
e83e7870ce
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-18 16:00:12 -05:00
Baris Soner Usakli
d8e14acbbf
closes #799
2014-01-18 16:00:05 -05:00
psychobunny
4ef5ffe7fd
upped minver of cerulean to 0.0.12 - please upgrade
2014-01-18 15:59:39 -05:00
Baris Soner Usakli
5072b9c8a5
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-18 15:35:58 -05:00
Baris Soner Usakli
959e6e83ea
closes #796
2014-01-18 15:35:51 -05:00
psychobunny
1528c70a30
deleted BS css files from core - please update vanilla
2014-01-18 15:12:49 -05:00
psychobunny
6af143900a
upped minver of vanilla to 0.0.13 - please update
2014-01-18 15:12:35 -05:00
Dr.Z
43cc975ff7
Add Simplized Chinese.
...
Just modified the .json in language folder and some .tpl in the
templates folder(except the admin folder). Noted there are a lot of
front-end related code in the .js files, I’ll move on to them.
2014-01-19 01:04:12 +08:00
Julian Lam
0397773b22
Merge pull request #802 from tedr56/master
...
Fr translation Updates
2014-01-18 06:30:26 -08:00
MrWaffle
5ed77b032e
Fix plugin CSS files on Windows
2014-01-18 14:58:20 +01:00
TedVJ
b5ed7b8b72
Fr translation fixes
2014-01-18 14:47:41 +01:00
TedVJ
a2165403a7
Fr translation for fd92d7b02a
2014-01-18 14:33:25 +01:00
Baris Soner Usakli
324bec41c4
chain
2014-01-17 20:10:09 -05:00
Baris Soner Usakli
0db6423c26
closes #792 , fixes multiple composers
2014-01-17 19:42:20 -05:00
Baris Soner Usakli
dc27638ca8
sitemap fix
2014-01-17 18:58:38 -05:00
Baris Soner Usakli
c00bd0b8d0
oops fixed
2014-01-17 18:14:00 -05:00
Baris Soner Usakli
22e1b0f22e
check result for null
2014-01-17 18:12:56 -05:00
Baris Soner Usakli
e6a9f5a704
error check
2014-01-17 18:11:36 -05:00
Baris Soner Usakli
fd92d7b02a
can mark topic unread for all
2014-01-17 17:26:07 -05:00
Baris Soner Usakli
25b50323fa
markdown text in composer
2014-01-17 17:07:09 -05:00
Baris Soner Usakli
7752d24b21
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-17 16:30:12 -05:00
Baris Soner Usakli
00c6fc17ac
removed console.log
2014-01-17 16:27:17 -05:00
psychobunny
4e5dfbc1c9
find .post-row instead of any li
2014-01-17 16:26:32 -05:00
Baris Soner Usakli
24ceb0f083
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-17 16:16:07 -05:00
Baris Soner Usakli
48eb6a3f22
composer changeS
2014-01-17 16:16:00 -05:00
Julian Lam
123f92ca1e
fixed #711
2014-01-17 15:36:10 -05:00
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
2014-01-17 14:52:43 -05:00
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%.
2014-01-17 14:47:18 -05:00
Julian Lam
962955f06a
fixed bug with search (getTopicsByTids became error-first)
2014-01-17 14:29:46 -05:00
Julian Lam
51abf60b3a
Merge branch 'socketAL-fix'
2014-01-17 14:15:56 -05:00
Julian Lam
48c22567c2
fixed #791
2014-01-17 14:13:23 -05:00
Julian Lam
17f98804c6
commented out "remember me" checkbox because it actually does nothing... :x
2014-01-17 14:08:12 -05:00
Baris Soner Usakli
e884ff1f59
modules fixes
2014-01-17 12:55:38 -05:00
Baris Soner Usakli
a34775a6c2
meta fixes
2014-01-17 12:52:04 -05:00
Baris Soner Usakli
c0712583f2
fixed category sockets
2014-01-17 12:49:21 -05:00
Baris Soner Usakli
d72926a5bb
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
2014-01-17 12:42:26 -05:00
Baris Soner Usakli
a802dc4b68
admin.js socket fixes
2014-01-17 12:42:19 -05:00
Julian Lam
af6eb5359e
Merge branch 'master' into socketAL-fix
...
Conflicts:
public/language/cs/global.json
public/language/fr/global.json
src/routes/api.js
2014-01-17 12:10:49 -05:00
Julian Lam
727ad4b651
added cache buster to nodebb.min.js even if it has not changed
2014-01-17 12:07:33 -05:00
Julian Lam
5e695d3222
fixed incorrect language string used in fb button in default motd
2014-01-17 12:02:12 -05:00
Julian Lam
55c296a229
Merge pull request #790 from tedr56/master
...
Fr Translation Update
2014-01-17 08:33:15 -08:00
TedVJ
27762c2ab9
Fr Translation update #3
2014-01-17 16:41:04 +01:00
TedVJ
f63ab0faeb
Fr Translation update #2
2014-01-17 16:35:32 +01:00
TedVJ
cfbbc238f6
Fr Translation Update
2014-01-17 16:16:51 +01:00
Julian Lam
2b32ede4d8
fixed czech welcome message
2014-01-17 09:09:43 -05:00
Julian Lam
04da0447b5
fixed global:motd.get in es
2014-01-17 08:58:53 -05:00
Julian Lam
45ce0566e7
added translation to default MOTD
2014-01-17 08:58:46 -05:00
Julian Lam
14b31cf4c8
hiding fork button on xs/sm devices (default motd)
2014-01-17 08:58:40 -05:00
Julian Lam
c1c9438220
patching translator to ignore non-js files
2014-01-17 08:58:33 -05:00
Julian Lam
13ae2e9401
fixed global:motd.get in es
2014-01-17 08:54:34 -05:00
Julian Lam
beec96416f
added translation to default MOTD
2014-01-17 08:53:23 -05:00
Julian Lam
253913f8d9
hiding fork button on xs/sm devices (default motd)
2014-01-17 08:12:30 -05:00
Julian Lam
7e9d344487
patching translator to ignore non-js files
2014-01-17 08:04:23 -05:00
Baris Soner Usakli
cfaa6556d6
pass err
2014-01-17 00:07:02 -05:00
Baris Soner Usakli
b062af2c4b
fixed user pwd reset
2014-01-16 23:46:08 -05:00
Baris Soner Usakli
b7f0c90bf7
more fixes
2014-01-16 22:44:34 -05:00
Baris Soner Usakli
b3816b98a1
more post fixes
2014-01-16 22:06:23 -05:00
Baris Soner Usakli
9e6f7fa960
reset
2014-01-16 21:19:57 -05:00
Baris Soner Usakli
31d353ab0e
more fixes
2014-01-16 21:19:29 -05:00
Barış Soner Uşaklı
3a57c3b6d8
removed disabled attrib from reset button
2014-01-16 20:59:01 -05:00
Baris Soner Usakli
8740cc0fc7
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
2014-01-16 20:53:42 -05:00
Baris Soner Usakli
ae76bb3928
lots of err first fixeS
2014-01-16 20:53:32 -05:00
Julian Lam
111776d878
notifications socket callbacks
2014-01-16 20:29:11 -05:00
Julian Lam
e95da77fe8
Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
2014-01-16 20:14:19 -05:00
Julian Lam
bc48ba874d
fixed module.js callback format
2014-01-16 20:14:09 -05:00
Baris Soner Usakli
ced37044ca
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
2014-01-16 19:59:03 -05:00
Baris Soner Usakli
426d3e871f
more fixes
2014-01-16 19:58:57 -05:00
Julian Lam
cbb630fd6b
fixed categories.js socket callbacks
2014-01-16 19:57:28 -05:00
Julian Lam
8041bee9fd
Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
2014-01-16 19:10:30 -05:00
Baris Soner Usakli
6da6baa213
more crash fixes to socketS
2014-01-16 18:50:45 -05:00
Baris Soner Usakli
ba8e98520c
added data checks to user calls
2014-01-16 18:18:42 -05:00
Baris Soner Usakli
ddb9a4a60e
fixed user load more
2014-01-16 18:12:31 -05:00
Baris Soner Usakli
4366c11ec0
users.js fix
2014-01-16 18:10:38 -05:00
Baris Soner Usakli
39b631a3a8
more fixes
2014-01-16 18:06:19 -05:00
Baris Soner Usakli
e061978bd5
more fixes
2014-01-16 17:52:46 -05:00
Baris Soner Usakli
2515ba9455
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
2014-01-16 17:32:45 -05:00
Baris Soner Usakli
afe97233aa
more fixes
2014-01-16 17:32:33 -05:00
Julian Lam
8b1ed1297b
linting
2014-01-16 17:25:14 -05:00
Julian Lam
765402a2a0
fixed ACP online count
2014-01-16 17:22:11 -05:00
Baris Soner Usakli
e5c8caf5ff
more fixes
2014-01-16 17:15:00 -05:00
Baris Soner Usakli
1ec21c2bfd
metatitle
2014-01-16 17:11:27 -05:00
Baris Soner Usakli
7470c1bbd9
more fixes
2014-01-16 17:07:34 -05:00
Baris Soner Usakli
2893693d17
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
2014-01-16 16:50:48 -05:00
Baris Soner Usakli
0b132cadcf
user fixes
2014-01-16 16:50:41 -05:00
Julian Lam
3177fdfa74
partially fixed acp active users
2014-01-16 16:26:47 -05:00
Julian Lam
08f97efcd4
Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
2014-01-16 16:11:30 -05:00
Julian Lam
71f1f7137a
fixes
2014-01-16 16:11:23 -05:00
Baris Soner Usakli
220b40ff9c
topics.js
2014-01-16 16:10:23 -05:00
Julian Lam
97eff9c8a1
fixing index call and meta.js
2014-01-16 15:57:13 -05:00
Baris Soner Usakli
adf4a5c407
user.js changes
2014-01-16 15:46:37 -05:00
Julian Lam
42d6880ac4
migrating posts to new socketAL format
2014-01-16 15:34:43 -05:00
Julian Lam
35aa06c230
migrating notifications to new socketAL format
2014-01-16 15:31:57 -05:00
Julian Lam
be3284e05e
migrating modules.js to new socketAL style
2014-01-16 15:28:21 -05:00
Baris Soner Usakli
8bb24fa034
fixed update header
2014-01-16 15:25:04 -05:00
Julian Lam
2235dbd2a0
migrating meta.js to new socketAL format
2014-01-16 15:19:07 -05:00
Baris Soner Usakli
f6bd52014e
fixed conflict
2014-01-16 15:18:13 -05:00
Baris Soner Usakli
accde93fff
removed api: from server
2014-01-16 15:17:25 -05:00
Julian Lam
69a9570186
migrated catefories.js to new socketAL format
2014-01-16 15:16:12 -05:00
Julian Lam
c215e61541
fixed up admin.js
2014-01-16 15:13:22 -05:00
Baris Soner Usakli
67799eac95
removed api: from client side socket calls
2014-01-16 15:10:37 -05:00
Julian Lam
4184574164
WIP admin.js socket underping
2014-01-16 15:00:49 -05:00
Baris Soner Usakli
d234dbdca2
first set of changes
2014-01-16 14:57:03 -05:00
Julian Lam
dfd2df99e6
removed "mark all as read" language strings and removed button from notifications page -- fixes #785
2014-01-16 14:25:46 -05:00
Julian Lam
b32887f2ce
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-16 12:35:18 -05:00
Julian Lam
a48a7acd51
fixing issue where after a user changed their username, the new name was not reindexed by Reds
2014-01-16 12:34:48 -05:00
Baris Soner Usakli
8f9f5b2849
added user images to profile button in mobile view
2014-01-16 02:37:55 -05:00
Baris Soner Usakli
72fd78ac26
fixed indent in chat.tpl
2014-01-15 19:22:11 -05:00
Baris Soner Usakli
16aeb2d09d
added fb to motd default
2014-01-15 18:58:31 -05:00
Baris Soner Usakli
2d87ba534c
can paste images directly from clipboard
2014-01-15 18:44:09 -05:00
Baris Soner Usakli
e671f0343e
closes #782
2014-01-15 17:36:06 -05:00
Baris Soner Usakli
e16c3f3f80
added try catch to socket calls
2014-01-15 13:23:53 -05:00
Baris Soner Usakli
b303fdcfd7
removed inline css
2014-01-15 12:58:43 -05:00
MrWaffle
b78dc3eca8
Chat now supports markdown
2014-01-15 18:20:05 +01:00
Baris Soner Usakli
1bf3d33765
prevent clicks on autocomplete to scroll window to the top
2014-01-15 03:22:49 -05:00
Baris Soner Usakli
cd4cb240c8
upload file icon in composer was visible even when uploads were disabled
2014-01-15 02:33:20 -05:00
Baris Soner Usakli
82bc0aec6b
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-14 19:23:33 -05:00
Baris Soner Usakli
c94da47ae8
added profile func, shorter getRecentReplies
2014-01-14 19:23:27 -05:00
Julian Lam
7de540dc74
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-14 19:01:53 -05:00
Julian Lam
b3f23d41d3
fixed #744
2014-01-14 19:01:12 -05:00
Baris Soner Usakli
466c02a886
removed teaser_text
2014-01-14 19:00:18 -05:00
Baris Soner Usakli
265d1f6331
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-14 18:05:02 -05:00
Baris Soner Usakli
dcf47f558e
limit search in db
2014-01-14 18:04:54 -05:00
Julian Lam
facacc65aa
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-14 17:03:13 -05:00
Julian Lam
442c543d27
fixed #776
2014-01-14 17:02:54 -05:00
psychobunny
8c5a458798
fixed 403 redirect from logged out /admin
2014-01-14 14:33:43 -05:00
psychobunny
98d42b0ade
moving social sharing parsing code from server side to client side & cleaned up templates
2014-01-14 14:30:14 -05:00
Baris Soner Usakli
75850bd315
closes #772
2014-01-14 13:10:31 -05:00
Julian Lam
5efc1e5de8
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-14 12:34:54 -05:00
Julian Lam
d48e749d54
removed confirmation prompt in upgrade option in nodebb executable
2014-01-14 12:34:29 -05:00
psychobunny
6f129d9c68
allow password fields to be saved in ACP
2014-01-14 12:25:27 -05:00
Julian Lam
acc390f6ef
added timeago locales, fixed timeago template error in ACP.
2014-01-14 11:13:58 -05:00
Julian Lam
c8a514aa37
updated new timeago path
2014-01-14 11:03:49 -05:00
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
2014-01-14 10:31:21 -05:00
Julian Lam
3837841882
removed automatic "visible-xs-inline" on links added by static-page or -42
2014-01-14 10:13:12 -05:00
Julian Lam
a05d2d44e9
fixed cerulean version
2014-01-14 09:31:24 -05:00
Julian Lam
ebcf8eb03b
upping cerulean minver
2014-01-14 09:28:44 -05:00
Julian Lam
bc407ee59c
fixing topic moving
2014-01-14 09:19:33 -05:00
Julian Lam
a32aee60c2
reversing accidentally committed code to socket.io/index
2014-01-14 08:54:42 -05:00
Julian Lam
0266c5516c
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-14 08:53:25 -05:00
Julian Lam
32470efb22
fixing upgrade script console.log and missing sessionData for topic moving
2014-01-14 08:53:10 -05:00
Baris Soner Usakli
bbcc2312db
better redis info parser from node-redis
2014-01-14 08:20:41 -05:00
Baris Soner Usakli
07085f1ff2
fixed sockettopics.post
2014-01-14 07:39:01 -05:00
Baris Soner Usakli
0198024db0
parseInt uid
2014-01-14 07:36:01 -05:00
Baris Soner Usakli
bc835f59d4
mongo getListRange fix
2014-01-13 20:46:43 -05:00
Baris Soner Usakli
a97ee201d8
makes recent unread and category pages a lot faster, added logging when a user changes their username
2014-01-13 18:02:06 -05:00
Baris Soner Usakli
c07bf466b2
added back search limiting
2014-01-13 15:45:50 -05:00
Baris Soner Usakli
3475ed59c8
removed reds from install.js
2014-01-13 15:38:27 -05:00
Baris Soner Usakli
93292e701d
added error check to setOnEmpty
2014-01-13 14:28:05 -05:00
Baris Soner Usakli
243cb5af61
fixed mobile search link
2014-01-13 14:19:08 -05:00
Baris Soner Usakli
26274bd75a
closes #767
2014-01-13 13:50:33 -05:00
Julian Lam
97cc6cde67
closed #733 - after upgrade script, all users will be in a system "registered users" group
2014-01-13 13:32:49 -05:00
Julian Lam
619fe74fc0
moved groups admin socket calls into admin file instead of standalone groups file
2014-01-13 12:09:13 -05:00
Julian Lam
4453d055ea
linted socket/admin.js
2014-01-13 12:05:13 -05:00
Julian Lam
aa689a7a29
fixed active users socket calls in ACP
2014-01-13 12:01:42 -05:00
Julian Lam
3fb44d7693
who needs recursion, bitch?
...
- enhanced socket abs layer so that a method call of infinite depth is supported (theoretically).
2014-01-13 11:40:08 -05:00
Julian Lam
5db9ff11d5
linting and adding missing require'd dep
2014-01-13 11:23:21 -05:00
Julian Lam
5e538ef051
fixed #710 - added labels to the top bar (update vanilla!)
...
merged "loading" and "more_posts" in topic i18n data, changed behaviour so that on mobile, only the spinner shows.
2014-01-13 10:47:48 -05:00
Julian Lam
2078fa25f8
added classname to chat dropdown if there are no chats
2014-01-13 10:11:23 -05:00
Julian Lam
b86ae3f7f0
fixed #756 - sequestering Notifications and Chat DOM functions in their module, and not in footer
2014-01-13 10:06:00 -05:00
Julian Lam
e36f92b18e
closed #764
2014-01-13 09:50:29 -05:00
Barış Soner Uşaklı
dea43ee008
Merge pull request #763 from bdharrington7/master
...
added login register selectors to close the nav when clicked
2014-01-12 15:22:07 -08:00
Baris Soner Usakli
6053a8caa5
search icon should be hidden-xs
2014-01-12 18:21:00 -05:00
bdharrington7
bf96903d6e
removed submenu for login / register in guest menu options
2014-01-12 15:10:10 -08:00
bdharrington7
e8c7860f12
Merge branch 'master' of https://github.com/bdharrington7/NodeBB
2014-01-12 14:15:14 -08:00
bdharrington7
2b63b2c52a
fixed bug that hid the login menu option
2014-01-12 13:45:27 -08:00
bdharrington7
0ad1f1576b
Fix: login / register collapses on click, Search unavailable if not allowed
2014-01-12 13:45:27 -08:00
Baris Soner Usakli
5febb3dc23
clicking the pagination block no longer sends page to top
2014-01-12 13:45:27 -08:00
Baris Soner Usakli
a885444740
fixes toggle_mod_tools undefined error
2014-01-12 13:45:27 -08:00
bdharrington7
d60151a6cc
excluding .DS_Store
2014-01-12 13:45:26 -08:00
bdharrington7
3ccc11d53c
fixed bug that hid the login menu option
2014-01-12 13:36:15 -08:00
bdharrington7
cfda0a93c4
Fix: login / register collapses on click, Search unavailable if not allowed
2014-01-12 13:12:13 -08:00
Baris Soner Usakli
92894277a9
clicking the pagination block no longer sends page to top
2014-01-12 15:52:44 -05:00
Baris Soner Usakli
1580226757
fixes toggle_mod_tools undefined error
2014-01-12 15:37:33 -05:00
bdharrington7
ffa1f1703d
Merge branch 'master' of https://github.com/bdharrington7/NodeBB
2014-01-12 12:32:48 -08:00
bdharrington7
99dc989c39
excluding .DS_Store
2014-01-12 12:32:18 -08:00
Julian Lam
8d71098a0f
fixed detection for admin client-side scripts
2014-01-12 14:38:54 -05:00
Lumir Mrkva
bd0d09584b
added czech translation
2014-01-12 19:24:02 +01:00
Baris Soner Usakli
1e59147d64
closes #760
2014-01-12 00:04:02 -05:00
Julian Lam
3da96faa12
fixed email exists error... weird.
2014-01-11 22:14:20 -05:00
Julian Lam
98e4257939
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-11 22:09:30 -05:00
Julian Lam
eb974ec1d8
fixing user register socket calls
2014-01-11 22:09:23 -05:00
Baris Soner Usakli
30ad852492
closes #758
2014-01-11 17:48:24 -05:00
Baris Soner Usakli
8bc0096b00
dont closed composer if callback isn't called
2014-01-11 16:15:50 -05:00
Baris Soner Usakli
f73c81d6c3
closes #755
2014-01-11 15:33:58 -05:00
Julian Lam
ee963e0c2a
moved reconnected socket call to SocketsMeta
2014-01-11 14:03:50 -05:00
Julian Lam
99af660e48
adding missing modules.json files in languages
2014-01-11 14:03:28 -05:00
Julian Lam
6d300e1110
updated chat i18n strings to use new modules.json file, added said files to language dirs
2014-01-11 12:12:04 -05:00
Julian Lam
b61614f87b
fixed htmlentities in italian translation
2014-01-11 11:52:43 -05:00
Francesco
fd83769bde
added italian language files
2014-01-11 11:44:08 -05:00
Julian Lam
eabe3ada6f
upped mentions minver to 0.2
2014-01-11 11:29:05 -05:00
Julian Lam
3264658269
Merge remote-tracking branch 'origin/master' into socketAL
2014-01-11 11:26:52 -05:00
Julian Lam
73cbde4098
removed websockets.js wooo
2014-01-11 11:26:44 -05:00
bdharrington7
e5fc0819b4
excluding .DS_Store
2014-01-10 20:22:17 -08:00
psychobunny
97ec312c72
console.log
2014-01-10 17:08:01 -05:00
psychobunny
05edfdc9c1
templates.js - if custom theme is missing a template, render default template
2014-01-10 17:06:56 -05:00
Julian Lam
067a7a544b
Merge remote-tracking branch 'origin/master' into socketAL
2014-01-10 16:09:04 -05:00
Julian Lam
a150691b5e
that's the last of it!! :D
2014-01-10 16:00:03 -05:00
Baris Soner Usakli
b8d858ccca
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-10 14:12:04 -05:00
Baris Soner Usakli
ee1ac1b2c3
fixes post move
2014-01-10 14:11:55 -05:00
Julian Lam
a2329980c8
Merge remote-tracking branch 'origin/master' into socketAL
2014-01-10 13:28:11 -05:00
Julian Lam
ea8aa3fff2
admin stuff, removed deprecated install templates, blah blah
2014-01-10 13:27:50 -05:00
Julian Lam
c5d8a5a6b2
thread tools (phew!) -- sessionData is getting larger :P
2014-01-10 10:50:05 -05:00
psychobunny
ef01717562
allow themes to set path to a frameworkCSS so you can include a customized BS or another framework altogether
2014-01-10 03:08:46 -05:00
Julian Lam
8dd8412ae3
so far so good... user, meta, notifications, categories
2014-01-09 22:47:07 -05:00
Julian Lam
5a589c885a
Merge remote-tracking branch 'origin/master' into socketAL
2014-01-09 21:27:57 -05:00
Julian Lam
dfa9f203e6
crashing a lot less now, heh
2014-01-09 21:27:50 -05:00
Julian Lam
adb8f80b86
interim commit - removed calls to websockets.js, beginning porting to namespaced files
2014-01-09 20:13:17 -05:00
Baris Soner Usakli
92ca739002
center on load
2014-01-09 20:04:50 -05:00
Baris Soner Usakli
c19d3e8063
closes #738
2014-01-09 19:34:51 -05:00
Baris Soner Usakli
30624d4ad8
tabbified the admin settings page
2014-01-09 17:51:26 -05:00
Baris Soner Usakli
9c60182da4
closes #749
2014-01-09 15:58:31 -05:00
psychobunny
1caaa8c20a
re-initialize translator when language is changed in ACP
2014-01-09 14:21:58 -05:00
Julian Lam
c2a1cd94d0
addressing issue for #728 where existing NodeBBs don't have a defaultLang set
2014-01-09 13:42:35 -05:00
Julian Lam
df4c6ca1c8
integrating client side translator into new languages tab in ACP
2014-01-09 13:37:25 -05:00
Julian Lam
cd6af45afb
added icons to all h1s in admin panel
...
languages tab in ACP
each language now also has a "language.json"
2014-01-09 13:29:41 -05:00
Julian Lam
119079ace5
added missing link, numRecentReplies, and class values to category.create... fixed #754 , fixed #751
2014-01-09 11:50:24 -05:00
Baris Soner Usakli
dff10045da
removed my console.logs as usual
2014-01-08 22:55:33 -05:00
Baris Soner Usakli
dda4586a2f
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-08 22:54:03 -05:00
Baris Soner Usakli
dabd2f29af
closes #747
2014-01-08 22:53:55 -05:00
Julian Lam
029b91a323
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-08 21:50:26 -05:00
Julian Lam
ac04e04016
fixed #719
2014-01-08 21:50:19 -05:00
Baris Soner Usakli
3a6db04be5
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-08 21:47:16 -05:00
Baris Soner Usakli
eb65c5ad1b
reindex user name after change, #745
2014-01-08 21:47:09 -05:00
Julian Lam
c2c1632c0e
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-08 21:25:11 -05:00
Julian Lam
2495b5b89b
refactored group category permissions, removed getCategoryAccess method call
2014-01-08 21:25:01 -05:00
Baris Soner Usakli
176ac54cdf
closes #745
2014-01-08 21:19:32 -05:00
Baris Soner Usakli
e07c848da7
closes #737
2014-01-08 16:30:27 -05:00
Baris Soner Usakli
6b8f7dba4f
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-08 16:11:59 -05:00
Baris Soner Usakli
825e4cca5a
closes #744
2014-01-08 16:11:47 -05:00
Julian Lam
ab16b1184d
fixing issue where nojs mode of a private category would show the category topics, even if the requesting user was not allowed inside
2014-01-08 15:09:24 -05:00
Julian Lam
127261100e
fixed #698 - ajaxify.go will now cancel any active API requests when it is called
2014-01-08 14:53:32 -05:00
Baris Soner Usakli
67f8af7e3e
#744
2014-01-08 06:19:22 -05:00
Baris Soner Usakli
d2c0aa9949
fixed auto complete for insertion in the middle, 6am commits FTW
2014-01-08 06:15:48 -05:00
Baris Soner Usakli
0d26b21a2c
prevent double res.send/json if error occurs in profile image upload
2014-01-08 02:59:14 -05:00
Baris Soner Usakli
2d384a68d2
oops extra $
2014-01-08 02:39:50 -05:00
Baris Soner Usakli
414eaea413
username mention auto completes
2014-01-08 02:39:06 -05:00
Baris Soner Usakli
a4ae9c70df
closes #742 , closes #741
2014-01-07 17:30:29 -05:00
Baris Soner Usakli
6f94acd0f2
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-07 15:00:12 -05:00
Baris Soner Usakli
8e6606fb5a
move post
2014-01-07 15:00:05 -05:00
psychobunny
cfa4256df5
admin - download emails.csv, thanks to @akhoury for the gist
2014-01-07 14:01:32 -05:00
Baris Soner Usakli
4912b8a893
fixed language regex
2014-01-07 00:14:20 -05:00
Baris Soner Usakli
f75e55aa11
fixed path
2014-01-06 23:45:31 -05:00
Baris Soner Usakli
88305b3350
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-06 23:44:39 -05:00
Baris Soner Usakli
d6333a3969
fixed plugin css files for relative path
2014-01-06 23:44:32 -05:00
Julian Lam
538bb3e871
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-06 19:24:24 -05:00
Julian Lam
649d8af36b
updated help doc for executable
2014-01-06 19:24:09 -05:00
Baris Soner Usakli
faf5ea2122
check if we have edit permission on the pids that we want to move
2014-01-06 19:20:01 -05:00
Baris Soner Usakli
291aa872c4
cant fork if not logged in
2014-01-06 19:12:34 -05:00
Baris Soner Usakli
2e575bb2d8
closes #524
2014-01-06 17:37:42 -05:00
psychobunny
7c8c735e05
i8n - if translation not present, use a readable key
2014-01-06 02:49:41 -05:00
psychobunny
b21a202142
my data went on a date and found out we have out of date data
2014-01-06 00:14:33 -05:00
psychobunny
032d46465d
closes #551
2014-01-05 23:57:43 -05:00
psychobunny
6f120ff34a
closes #732 , custom robots.txt
2014-01-05 23:19:52 -05:00
psychobunny
0e5358a701
closes #698
2014-01-05 23:09:28 -05:00
psychobunny
7be16eab06
closes #722
2014-01-05 23:02:19 -05:00
Baris Soner Usakli
58580bd866
closes #716 , also moved chat to its own template
2014-01-05 22:09:13 -05:00
Baris Soner Usakli
be316ff602
fixed mongo listRemoveAll
2014-01-05 20:44:06 -05:00
Baris Soner Usakli
dfc8aacbae
closes #735 , removed create collection calls
2014-01-05 19:08:36 -05:00
Baris Soner Usakli
8c04e8e56c
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-05 18:30:21 -05:00
Baris Soner Usakli
cd6750a38d
minor fix
2014-01-05 18:30:14 -05:00
Julian Lam
71681b936f
fixed #731
2014-01-05 18:27:13 -05:00
Julian Lam
4923c79496
tweaking upgrade script
2014-01-05 14:17:37 -05:00
Julian Lam
3f0f5a09a0
new upgrade directive to re-slugify usernames again
2014-01-05 14:07:26 -05:00
Julian Lam
f7b7af3004
so xregexp uses double backslashes...
2014-01-05 13:59:02 -05:00
Julian Lam
5a88a5ca60
allow underscores in slugs
2014-01-05 12:55:39 -05:00
Julian Lam
6567819294
commented out "language" directive in executable (didn't do anything anyway), and added "upgrade" directive
2014-01-05 12:15:23 -05:00
Baris Soner Usakli
e69611fa22
if email didnt change dont update and dont log
2014-01-05 01:53:01 -05:00
Baris Soner Usakli
48074ea93b
redirect if category is accessed directly
2014-01-05 01:39:33 -05:00
Baris Soner Usakli
4dc8f2c2e1
closes #665
2014-01-05 01:26:23 -05:00
psychobunny
b131dacf39
set external link for categories
2014-01-05 01:16:39 -05:00
Baris Soner Usakli
32f17d5e13
closes #729
2014-01-05 00:39:15 -05:00
Julian Lam
bee3c06a07
clicking 'quote' now shows the quoted username before said quote
2014-01-04 21:41:22 -05:00
Julian Lam
8aa227b052
added note re: third-party emailer pluginses
2014-01-04 21:09:21 -05:00
Julian Lam
eaf25c4a5f
removing SMTP settings fields in email settings portion of settings tab in ACP
2014-01-04 21:07:10 -05:00
Julian Lam
f90beca449
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-04 20:09:03 -05:00
Julian Lam
724dcb88c0
added translator integration to emailer
2014-01-04 20:08:59 -05:00
Baris Soner Usakli
e5ec5242c6
added relative_path
2014-01-04 19:35:02 -05:00
Baris Soner Usakli
c3f7faffd3
added relative_path in admin site templaets
2014-01-04 19:30:09 -05:00
Baris Soner Usakli
43a1ce66a1
added relative_path to recent_replies and browsing users
2014-01-04 19:20:59 -05:00
Baris Soner Usakli
9da165c1a7
added relative_path to templates
2014-01-04 19:08:09 -05:00
Baris Soner Usakli
02e550d3ad
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-04 18:28:01 -05:00
Baris Soner Usakli
680fac0674
added relative_path to header.tpl
2014-01-04 18:27:54 -05:00
psychobunny
ea49295774
some translator methods useful for plugins that wish to support i8n
2014-01-04 18:15:10 -05:00
Baris Soner Usakli
0edb895c2c
indent
2014-01-04 18:09:43 -05:00
Baris Soner Usakli
981719dee1
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-04 18:05:22 -05:00
Baris Soner Usakli
1466e68aa1
ssl support 101
2014-01-04 18:05:15 -05:00
Julian Lam
f1412193ef
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-04 18:04:12 -05:00
Julian Lam
b6fdc5595d
removed handlebars dependency for emailer, using ANDREWBARS now
2014-01-04 18:03:54 -05:00
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
2014-01-04 17:44:13 -05:00
Baris Soner Usakli
487281cc7a
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-04 17:11:04 -05:00
Baris Soner Usakli
751dc73ebe
fixes login/register and auth routes in relative path install
2014-01-04 17:10:56 -05:00
psychobunny
7f8836daa4
simplified filter:server.create_routes - routes no longer require you to pass in req, res, name, route (the latter two was a mistake)
...
tl;dr - just content is all that is required. see
http://www.github.com/psychobunny/nodebb-plugin-static-page for more
info
2014-01-04 17:01:01 -05:00
Julian Lam
5c048ac20a
closed #727
2014-01-04 14:24:50 -05:00
Julian Lam
11ed9e8c85
tweaks to emailer, implemented emailer hook for password reset
2014-01-04 11:55:41 -05:00
Julian Lam
0ac9ec6001
Merge remote-tracking branch 'origin/master' into email-revamp
2014-01-04 11:19:23 -05:00
Baris Soner Usakli
ecb64a0aa2
removed extra ,
2014-01-04 02:10:37 -05:00
Baris Soner Usakli
8626122679
category active users are stored in a sorted set now
2014-01-04 01:15:41 -05:00
Julian Lam
cdb0b4b49e
Merge branch 'master' into email-revamp
2014-01-02 18:14:07 -05:00
Julian Lam
24944762d7
fixing 'back to nodebb' ext, and revamping email confirm logic
2014-01-02 16:26:56 -05:00
Julian Lam
d6e0625fc8
Merge remote-tracking branch 'origin/master' into email-revamp
2014-01-02 15:21:59 -05:00
Julian Lam
339ed4e47b
implemented emailer for welcome email (though the email confirmation system is horribly broken)
2013-12-31 18:00:10 -05:00
Julian Lam
5a527de287
fixed debug output when plugin method is not found
2013-12-31 17:19:37 -05:00
Julian Lam
3ff550914f
Merge remote-tracking branch 'origin/master' into email-revamp
...
Conflicts:
package.json
2013-12-31 17:15:38 -05:00
Julian Lam
dd72e73284
emailer invocation for new users
2013-12-31 09:33:25 -05:00
Julian Lam
e4e57ce31f
initial commit to emailer system overhaul
2013-12-30 14:02:43 -05:00
