Commit Graph

8032 Commits

Author SHA1 Message Date
barisusakli
b37d52c089 closes #5407 2017-01-31 18:38:06 +03:00
Peter Jaszkowiak
c14a31644b Merge branch 'master' into 'develop' 2017-01-30 15:41:14 -07:00
Peter Jaszkowiak
54ac23cc7a Revert "No 404 responses for missing language files"
This reverts commit f0c941e5ae.
2017-01-30 15:22:20 -07:00
Stephan
0c6679ca9c Update dashboard.js 2017-01-30 17:45:48 +01:00
Julian Lam
debffe385f closes #5316 2017-01-27 16:29:42 -05:00
barisusakli
366ab103a4 closes #5405 2017-01-27 20:38:01 +03:00
Julian Lam
3ab631c82e Merge pull request #5391 from Pappmann/patch-4
added missing translation in dashboard
2017-01-27 11:32:02 -05:00
Julian Lam
7c7517d72b Merge pull request #5392 from Pappmann/patch-5
fixed missing translation string
2017-01-27 11:31:46 -05:00
Julian Lam
7414482753 Merge branch 'master' into develop 2017-01-27 11:27:21 -05:00
Julian Lam
05c724de30 added new hook for messaging teaser retrieval, and casting input as String before execuring stripTags templates helper 2017-01-27 11:26:08 -05:00
psychobunny
e2b30d6329 improve regex for unwanted whitespace in cover:url 2017-01-26 18:04:51 -05:00
barisusakli
3fb7f9fce5 closes #5398 2017-01-26 22:18:16 +03:00
barisusakli
a143a15f5d closes #5397 2017-01-26 20:44:26 +03:00
Julian Lam
4df8832c8d adding conditional to upgrade script to handle cases where an upgrade is performed on a flag that is already in database 2017-01-25 11:02:46 -05:00
barisusakli
2a33991f0d read usercount from global object 2017-01-25 01:32:29 +03:00
Julian Lam
ae279fe57f casting some values as int, in ensureSelfOrPrivileged middleware 2017-01-24 12:33:27 -05:00
Peter Jaszkowiak
f0c941e5ae No 404 responses for missing language files 2017-01-23 17:09:32 -07:00
Julian Lam
dbb71423a8 executing core middlewares first before secondary or plugin middlewares 2017-01-23 15:17:53 -05:00
Julian Lam
ea7d61e2e4 handling err in src/meta/languages.js 2017-01-23 11:40:51 -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
0b95eab71e use roomName if availabe in taskbar
if room is renamed update title on taskbar
2017-01-23 13:02:40 +03:00
Stephan
374bc04cdb fixed missing translation string 2017-01-23 04:06:01 +01:00
Stephan
af4df8e197 added missing translation
added missing language string in dashboard.js
2017-01-23 02:38:33 +01: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
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
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
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
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
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
3507e4ce0e Adding closing <p> 2017-01-16 09:33:33 +00:00
Dominic Lennon
a06e39528f Code review change 2017-01-16 08:48:53 +00:00
Peter Jaszkowiak
e1a29f4aa8 Switch to assets route 2017-01-14 17:12:16 -07:00
Peter Jaszkowiak
b4b3be3d97 Cache bust translations, query param name 2017-01-14 14:09:46 -07:00
Peter Jaszkowiak
c97764ee6f Fix incomplete "group" search results 2017-01-14 14:09:46 -07:00
Peter Jaszkowiak
2f07c18c5a All hail the glorious translation prebuilding 2017-01-14 14:08:52 -07:00
Julian Lam
9dcbe875a0 Merge branch 'master' into develop 2017-01-13 15:01:34 -05:00