Commit Graph

644 Commits

Author SHA1 Message Date
Julian Lam
432c3d777d Merge branch 'master' into fix-vendors 2016-02-26 12:38:23 -05:00
Julian Lam
7bc9e4439a removed .gitignore from list of sound files 2016-02-26 12:37:55 -05:00
Julian Lam
3f2872979f added buzz 2016-02-26 12:34:48 -05:00
Julian Lam
44aae7daa5 removed hammer, updated semver, added mousetrap 2016-02-26 12:12:12 -05:00
Julian Lam
e1323c0295 Updated js code so vendors can be added to the modules folder, so
they can be required properly and we can finally get rid of that
really annoying "mismatched anonymous" error in Require.js.

First module to make the transition: Chart.js
2016-02-26 11:29:17 -05:00
psychobunny
e069150625 closes #2165 2016-02-23 16:06:02 -05:00
psychobunny
933115a853 almost had a heartattack when I saw 121 changed files in this conflict
# Conflicts:
#	src/meta/templates.js
2016-02-22 14:41:03 -05:00
psychobunny
914fc1543e meta/templates.js refactor 2016-02-22 14:25:04 -05:00
psychobunny
da5494fdf1 allow recursive base templates
ex. custom theme based off lavender which is based off vanilla
2016-02-22 14:20:50 -05:00
Julian Lam
dd050c8177 added new hook that is called before templates are compiled 2016-02-18 20:43:06 -05:00
Julian Lam
eb8b6af7fb Fix global mod priv check and styling for flags page 2016-02-04 14:36:22 -05:00
barisusakli
3336365e53 closes #4024 2016-02-01 20:58:16 +02:00
barisusakli
c2e1426e57 fix syntax error, and actually show error if minification fails 2016-01-27 20:48:10 +02:00
Julian Lam
baaad13286 reverted latest change to translator match regex
- Fixes issue with parentheses in translations (closes #4107)
- No longer marking translation keys invalid if they contain HTML,
  as that was probably not performant. Instead, parameters will
  simply be escaped via the StringJS library.
2016-01-27 09:15:26 -05:00
Julian Lam
afbbb33878 fixed #4093 2016-01-22 11:12:21 -05:00
psychobunny
e017ad432f closes #3810 2016-01-18 15:41:30 -05:00
psychobunny
1853cc3cc1 better messaging for each minification process 2016-01-18 15:35:02 -05:00
psychobunny
f94cd21f83 #3875 filter:scripts.get now acts like filter:admin.scripts.get; does not get minified 2016-01-18 15:32:49 -05:00
psychobunny
42c0b973f1 closes #3134 2016-01-18 15:17:38 -05:00
psychobunny
5e4ef52911 some more cleanup 2016-01-18 15:17:36 -05:00
psychobunny
3cc5e1473f cleanup / lint before diving in 2016-01-18 15:17:35 -05:00
psychobunny
f17fa3ca11 minify flag not actually being used 2016-01-18 15:17:32 -05:00
Julian Lam
96fe6d288f Allowing theme to be re-ordered like plugins. 2016-01-11 16:23:59 -05:00
Barış Soner Uşaklı
ab4d4478e3 added rewards essentials 2016-01-11 22:38:47 +02:00
Julian Lam
4147e0cb94 closes #3719 2015-12-31 12:15:31 -05:00
Aziz Khoury
b4c8301596 [minor] meta tag, content-type shouldnt be escaped
so `text/html; charset=UTF-8` and not `text/html; charset=UTF-8`
2015-12-12 13:07:51 -05:00
Schamper
6b21e34c76 Also clean the minifier process options if the --debug option is used 2015-11-25 21:19:31 +01:00
Julian Lam
34725ec3e5 Fixes #3852
Added meta data to user profile pages, and also added noEscape
option to meta tag input. If set, validator escaping won't be
run on that value.
2015-11-11 14:20:43 -05:00
Julian Lam
8304740bd5 fixing crash on settings save 2015-11-08 11:57:23 -05:00
Julian Lam
3a34901cdb on settingsv2 save, reload should be required 2015-11-07 11:12:06 -05:00
barisusakli
46c2563164 removed rooms.js removed browsing users, removed chat syncing across sockets
use lastonline for online detection
2015-11-05 12:34:39 -05:00
Julian Lam
ceaa3a334d Squashed commit of the following:
commit 3a39e5e6bd3c357d78d8ec1dad6e3a64c18ee3ab
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Nov 3 20:15:10 2015 -0500

    minor tweak

commit ed3c25ba8b431a2b730aae78a43cfa934521a5d4
Merge: d9cde96 d7a0adc
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Nov 3 20:12:32 2015 -0500

    Merge branch 'master' of https://github.com/acardinale/NodeBB into acardinale-master

commit d7a0adc5c8
Author: Andrea Cardinale <a.cardinale@webandtech.it>
Date:   Wed Sep 30 10:32:25 2015 +0200

    Get registry (if it's set) from config.json in suggest method (client-side)
2015-11-03 20:15:30 -05:00
barisusakli
9040a1a063 concat minimize most common routes 2015-10-20 22:54:32 -04:00
barisusakli
edf545cd2c dont load sound data on cold load 2015-10-20 18:47:34 -04:00
barisusakli
7f72d80292 fix require 2015-10-19 11:32:46 -04:00
barisusakli
c3b8d0b328 check err first 2015-10-15 00:43:02 -04:00
barisusakli
ca294fc6ec closes #3663 2015-09-29 18:22:47 -04:00
Julian Lam
839edc80b1 updated action:settings.set hook 2015-09-26 10:46:17 -04:00
Julian Lam
ebed9d641c Add new ACP option to upload Touch Icon, #3668
Also added a number of fixes for mobile enhancements, such
as serving a manifest.json file for Android devices, and
serving proper link tags for all uploaded touch icons.

This commit also creates a new template helper for link tags.
2015-09-24 12:05:45 -04:00
barisusakli
fbfb39f967 moved socket connection out of app.js 2015-09-18 10:58:32 -04:00
barisusakli
a64cbbc6df #3573 2015-09-11 16:18:37 -04:00
Julian Lam
4f766ac7b5 Updated cache buster logic
Removed css and script busters in favour of a uuid/guid cache
buster that is generated when the app starts.

This change means that in the event your NodeBB crashes often,
users will not be able to rely on their browser cache to serve
an unchanged style/js file, but if that's the case, you've
got bigger problems anyway.

re: #3573
2015-09-11 16:04:31 -04:00
psychobunny
265a16af1a some old left over branding code 2015-09-10 14:56:08 -04:00
barisusakli
b4d465223a if there is no description tag add one, fix missing winston 2015-09-09 12:25:00 -04:00
psychobunny
54ec105986 random attempt to fix bad dep check 2015-08-27 16:09:35 -04:00
psychobunny
25a419e458 Merge branch 'master' into v0.8.x 2015-08-27 13:59:12 -04:00
barisusakli
eaefd9d24c remove meta/title.js and meta.title.build #3481 2015-08-26 15:55:00 -04:00
psychobunny
a217b42cb1 bonus two for #3481 - chats/username route 2015-08-26 14:09:22 -04:00
psychobunny
22fc257e36 bonus for #3481 - groups/group route 2015-08-26 14:06:53 -04:00
psychobunny
89b8622cfa other routes done, closes #3481 2015-08-26 13:56:28 -04:00