Commit Graph

14184 Commits

Author SHA1 Message Date
Julian Lam
dbb71423a8 executing core middlewares first before secondary or plugin middlewares 2017-01-23 15:17:53 -05:00
Julian Lam
72092f7109 bump mentions again 2017-01-23 14:53:11 -05:00
Julian Lam
2a9d9204c0 Merge branch 'master' into develop 2017-01-23 14:48:54 -05:00
Julian Lam
a41bd73b30 bump mentions 2017-01-23 14:48:46 -05:00
Julian Lam
4e9d5bbd8a Up composer version 2017-01-23 12:38:21 -05:00
Julian Lam
8dc5e20f37 Up composer version 2017-01-23 12:38:05 -05:00
Julian Lam
ea7d61e2e4 handling err in src/meta/languages.js 2017-01-23 11:40:51 -05:00
Julian Lam
445eff9c1a Merge branch 'master' into develop 2017-01-23 11:28:08 -05:00
Julian Lam
372138c789 Revert "fixing bug that caused plugin language files to not be parsed"
This reverts commit b2bb1a7c24.
2017-01-23 11:27:35 -05:00
Julian Lam
b2bb1a7c24 fixing bug that caused plugin language files to not be parsed 2017-01-23 11:25:19 -05:00
Julian Lam
a7aaf8ea96 fixing bug that caused plugin language files to not be parsed 2017-01-23 11:25:05 -05:00
Julian Lam
fcec6fd41d Merge remote-tracking branch 'origin/master' into develop 2017-01-23 11:18:10 -05:00
barisusakli
33e452cc8e fix lint 2017-01-23 13:09:51 +03:00
barisusakli
0b95eab71e use roomName if availabe in taskbar
if room is renamed update title on taskbar
2017-01-23 13:02:40 +03:00
Misty (Bot)
390c0ba788 Latest translations and fallbacks 2017-01-23 09:24:30 +00:00
Misty (Bot)
da33f065cf Latest translations and fallbacks 2017-01-22 09:24:29 +00:00
Barış Soner Uşaklı
a63ec0a265 up dbsearch 2017-01-21 14:23:36 +02:00
Misty (Bot)
fccd43e532 Latest translations and fallbacks 2017-01-21 09:24:28 +00:00
Misty (Bot)
604206843e Latest translations and fallbacks 2017-01-20 19:29:25 +00:00
Julian Lam
a86eefc5e3 Merge pull request #5383 from pitaj/master
Fix empty lines in language selectors
2017-01-20 13:17:38 -05:00
Peter Jaszkowiak
df77890c2a Plugin defaultLang defaults to en-GB 2017-01-20 11:15:06 -07:00
Julian Lam
73879b824c Merge branch 'master' into develop 2017-01-20 12:33:17 -05:00
Julian Lam
694f2382bf fix issue where navigating back to a topic listing (category.tpl) would not scroll down to the topic you had clicked on, and in some cases would exclude topics that were beyond that particular 'page' 2017-01-20 12:11:12 -05:00
Peter Jaszkowiak
7c88a55153 Fix empty lines in language selectors 2017-01-19 19:07:53 -07:00
Julian Lam
339845ff6b Merge pull request #5366 from pitaj/build-translations
Compile translations in the build step
2017-01-19 15:25:28 -05:00
Julian Lam
76376f52c3 Merge remote-tracking branch 'origin/master' into develop 2017-01-19 14:29:12 -05:00
Julian Lam
3d25c3e1c6 Merge pull request #5380 from pitaj/master
Fix wrapper breaking when no attrs need replaced
2017-01-19 14:17:39 -05:00
Peter Jaszkowiak
97fe86c916 Fix wrapper breaking when no attrs need replaced 2017-01-19 12:13:23 -07:00
Peter Jaszkowiak
80b4c6fa68 Exclude config files 2017-01-19 10:53:25 -07:00
psychobunny
19c3f54a30 Merge pull request #5379 from pichalite/issue-5344
Fixes #5344
2017-01-18 16:38:48 -05:00
pichalite
7b234c666f Fixes #5344 2017-01-18 20:32:19 +00:00
barisusakli
ef72762ba7 use groups.isMemberOfGroups 2017-01-18 20:24:48 +03:00
Peter Jaszkowiak
7f2ded17ab Comments, misc 2017-01-17 20:41:04 -07:00
Peter Jaszkowiak
e94d47976d Build language files on change 2017-01-17 20:22:38 -07:00
Barış Soner Uşaklı
bcd2b5cc50 Merge pull request #5376 from pichalite/post_create
Send isMain to post.save filters
2017-01-17 21:55:29 +02:00
Julian Lam
08af924873 closes #5189 2017-01-17 14:05:33 -05:00
Julian Lam
82e9e1a05d closes #5189 2017-01-17 14:05:19 -05:00
pichalite
9176f7e037 Only send isMain to hook instead of saving to post hash 2017-01-17 18:24:16 +00:00
Julian Lam
48909e753c Merge branch 'master' into develop 2017-01-17 10:46:14 -05:00
Julian Lam
06a77143bd additional logging and removing interstitial session data if plugins don't return interstitials 2017-01-17 10:46:04 -05:00
Peter Jaszkowiak
65b866192e Fix failing tests 2017-01-16 16:48:56 -07:00
pichalite
a3c05b2ea4 Send isMain to post.save filters 2017-01-16 23:40:25 +00:00
Peter Jaszkowiak
aff53cccc5 Plugin language fallback support 2017-01-16 16:31:16 -07:00
Julian Lam
762d660447 Merge pull request #5373 from pitaj/master
Fixes #5369, bootbox wrapper translates attributes
2017-01-16 14:41:07 -05:00
Julian Lam
183fdf06cb Merge pull request #5356 from DomLennonZA/master
Adding more specific timings for session timeout
2017-01-16 14:38:52 -05:00
Dominic Lennon
3f116e7636 Fixing null ttl issue for MongoSession 2017-01-16 14:58:27 +00:00
Dominic Lennon
b1f0f8fa8b Adding ttl value to the MongoStore options 2017-01-16 14:52:25 +00:00
Dominic Lennon
691b46d38b Fixing lint issues 2017-01-16 14:43:34 +00:00
Dominic Lennon
f0add97cf9 Fixing tests 2017-01-16 14:37:14 +00:00
Dominic Lennon
3507e4ce0e Adding closing <p> 2017-01-16 09:33:33 +00:00