Commit Graph

15412 Commits

Author SHA1 Message Date
Julian Lam
51349bb71f more email templates updated 2017-07-14 12:55:34 -04:00
Julian Lam
7c6c1adb04 test email done 2017-07-13 12:54:54 -04:00
Julian Lam
0d0e0d7311 removed prerender text and used partials for header and footer 2017-07-13 12:50:09 -04:00
Julian Lam
6c768030cc using variable for urls again, welcome.tpl done I think 2017-07-13 12:39:58 -04:00
Julian Lam
10d23f5447 resized logo again 2017-07-13 12:21:24 -04:00
Julian Lam
2eecf43eae updated logo image 2017-07-13 11:51:48 -04:00
Julian Lam
a2627d2066 added default payload to emails, and adding nodebb logo for email header 2017-07-13 11:30:44 -04:00
Julian Lam
b54a311a0d Merge branch 'develop' into revamped-email-templates 2017-07-13 10:45:56 -04:00
Baris Usakli
50e37713bf composer-default 2017-07-13 10:45:39 -04:00
Julian Lam
15d368c6b9 more changes to welcome.tpl 2017-07-13 10:43:27 -04:00
Julian Lam
9b813af56d png instead of svg 2017-07-12 15:58:52 -04:00
Julian Lam
020d3acfe9 WIP welcome email 2017-07-12 15:36:15 -04:00
Julian Lam
9c71da1577 sending callback with welcome email test 2017-07-12 15:20:30 -04:00
Baris Usakli
30199f921e Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-07-11 15:47:54 -04:00
Julian Lam
701ba73883 updated homepage route logic so that it is all contained in the local function (and plugin hook receives all entries, including custom) @barisusakli 2017-07-11 15:40:47 -04:00
Baris Usakli
593ea572c9 up markdown 2017-07-11 14:32:57 -04:00
Baris Usakli
12d53c95ca up composer 2017-07-11 14:14:55 -04:00
Baris Usakli
2d875a99cb fix data 2017-07-11 13:59:29 -04:00
Baris Usakli
dc110e2e3f closes #5818 2017-07-11 13:44:51 -04:00
Julian Lam
c2f1d254cc Merge branch 'master' into develop 2017-07-10 16:36:09 -04:00
Julian Lam
45d940ad2b added one more client-side hook for search @barisusakli 2017-07-10 16:34:18 -04:00
Baris Usakli
59aeee6516 remove addExpiresHeaders 2017-07-10 15:26:58 -04:00
Baris Usakli
e036e26238 closes #5813 2017-07-10 14:55:57 -04:00
Baris Usakli
4e7447c9d6 remove ajaxify.widgets.reposition 2017-07-10 14:05:48 -04:00
Baris Usakli
bece6808a2 up themes for widgets refactor 2017-07-10 13:04:01 -04:00
Barış Soner Uşaklı
923bd86662 Widgets refactor (#5817)
* widgets refactor

render widgets server side
widgets can use all the data the template can use

* fix tests
2017-07-10 12:54:45 -04:00
Julian Lam
65329b9bd7 closes nodebb-plugin-markdown#85 2017-07-10 12:21:23 -04:00
Barış Soner Uşaklı
80ea9e9797 fix lint 2017-07-10 00:37:48 -04:00
Barış Soner Uşaklı
6485108dfd faster getReplies 2017-07-10 00:28:15 -04:00
Barış Soner Uşaklı
feecf0b61c dont make db call if guest 2017-07-09 21:08:03 -04:00
Barış Soner Uşaklı
e9360347ea less padding, closes #5811 2017-07-09 16:08:06 -04:00
Misty (Bot)
2b3a88365c Latest translations and fallbacks 2017-07-09 09:23:16 +00:00
Misty (Bot)
b117f1169e Latest translations and fallbacks 2017-07-08 09:23:18 +00:00
Barış Soner Uşaklı
34d9b57b26 fix wrong function name, change dom to data @julianlam 2017-07-07 18:12:42 -04:00
Julian Lam
3ddf332e0c added two new client-side hooks for search to allow plugins to add fields 2017-07-07 15:48:35 -04:00
Julian Lam
77ec169591 added two new client-side hooks for search to allow plugins to add fields 2017-07-07 15:48:01 -04:00
Baris Usakli
e0de922ede Revert "widgets refactor"
This reverts commit 9e94edb5aa.
2017-07-07 15:35:06 -04:00
Baris Usakli
9e94edb5aa widgets refactor
render widgets server side
widgets can use all the data the template can use
2017-07-07 15:33:16 -04:00
Julian Lam
121a629de6 linting 2017-07-07 12:10:42 -04:00
Julian Lam
09621a3a3d fixes #5776 2017-07-07 11:56:28 -04:00
Misty (Bot)
3e453fd1a6 Latest translations and fallbacks 2017-07-07 09:23:23 +00:00
Baris Usakli
fbddb665b0 make tests pass 2017-07-06 16:07:58 -04:00
Baris Usakli
5f6b964097 up lavender 2017-07-06 16:02:31 -04:00
Baris Usakli
67c007cf6b up lavender 2017-07-06 15:50:32 -04:00
Julian Lam
e309ac5040 fixes #5790 2017-07-06 15:42:40 -04:00
Julian Lam
77d6181bd1 missing translations for ja and pt-BR 2017-07-06 14:15:57 -04:00
Baris Usakli
7538210b07 #5772
load correct timeago settings on cold load instead of after page load
2017-07-06 14:09:59 -04:00
Baris Usakli
1837ac2015 closes #5788 2017-07-06 13:07:16 -04:00
Baris Usakli
d469f53eba using async in batch
removed unused code in debug
2017-07-06 12:08:01 -04:00
Julian Lam
922790cc40 up mentions for japanese localization 2017-07-06 11:32:01 -04:00