Commit Graph

8214 Commits

Author SHA1 Message Date
Misty (Bot)
e3205cf950 Latest translations and fallbacks 2017-01-26 09:22:10 +00:00
Misty (Bot)
49735c67e3 Latest translations and fallbacks 2017-01-25 09:21:56 +00:00
Misty (Bot)
44f83825f8 Latest translations and fallbacks 2017-01-24 09:24:12 +00: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
Stephan
56f045e6b0 Update dashboard.json 2017-01-23 02:41:24 +01:00
Misty (Bot)
da33f065cf Latest translations and fallbacks 2017-01-22 09:24:29 +00: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
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
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
Peter Jaszkowiak
97fe86c916 Fix wrapper breaking when no attrs need replaced 2017-01-19 12:13:23 -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
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
Julian Lam
48909e753c Merge branch 'master' into develop 2017-01-17 10:46:14 -05:00
Jan
7fb7a64c8d Fix fa-font-path 2017-01-16 16:00:54 +01:00
Peter Jaszkowiak
c41a2f4b98 Fixes #5369, bootbox wrapper translates attributes 2017-01-15 13:58:56 -07:00
kingjan1999
8ac40eb44c Update FontAwesome to 4.7.0 2017-01-15 17:51:28 +01:00
Peter Jaszkowiak
05b68391dd Use /assets for client assets
- Route `/assets` -> `build/public`, falling back on `public`
- Moved destinations for `nodebb.min.js`, `acp.min.js`, `admin.css`, `stylesheet.css`, `templates`, and `sounds` to `build/public`
- r.js modules previously routed through express are now symlinked into `public/build/src/modules`
- minfiles no longer served from a memory cache
- use config `views_dir` setting everywhere template directory is used
- fix cache buster `v=v=`
2017-01-14 22:38:40 -07: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
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
Julian Lam
c99321a518 always setting app.previousUrl now, and passing cid into filter:category.topics.get hook 2017-01-13 15:01:14 -05:00
psychobunny
65cf2dbe55 move updateRoomUsage to after graph setup #5346 2017-01-12 14:26:03 -05:00
psychobunny
7f9381b087 closes #5346 2017-01-12 14:22:30 -05:00
psychobunny
9797f69324 action:chat.sent 2017-01-12 11:48:41 -05:00
Julian Lam
f58107e40a Merge remote-tracking branch 'origin/master' into develop 2017-01-12 11:29:34 -05:00
Misty (Bot)
759f1e2085 Latest translations and fallbacks 2017-01-12 09:21:45 +00:00
Julian Lam
20d035bdac hotfix to utils.isRelativeUrl to handle null or undefined first argument 2017-01-11 14:33:51 -05:00
Julian Lam
7bbb05637c flag translations and fallbacks 2017-01-11 13:20:26 -05:00
Misty (Bot)
4ec7200260 Latest translations and fallbacks 2017-01-11 09:21:36 +00:00
Misty (Bot)
ac03c2b270 Latest translations and fallbacks 2017-01-10 09:21:46 +00:00
Julian Lam
1a0e4db466 removing duplicate strings from flags language file 2017-01-09 16:22:55 -05:00
Julian Lam
9987d52855 Merge remote-tracking branch 'origin/master' into develop 2017-01-09 16:18:15 -05:00
Julian Lam
2ab2486d3b if require call on page script fails, remove from scripts array 2017-01-09 15:02:32 -05:00
Julian Lam
6a591069c5 fixes issue with ajaxify.end not firing 2017-01-09 14:51:05 -05:00
Misty (Bot)
5522d0908e Latest translations and fallbacks 2017-01-09 09:21:45 +00:00
Julian Lam
43056a4bfa Merge branch 'master' into develop 2017-01-08 16:26:00 -05:00
Julian Lam
64e4ef042b allowing plugins to subscribe to action:script.load and pass in function references 2017-01-08 15:58:25 -05:00
Julian Lam
50bd198ed9 Merge pull request #5349 from pitaj/master
Fix reverse proxies breaking admin translations
2017-01-08 13:06:08 -05:00
Misty (Bot)
f51b16d0de Latest translations and fallbacks 2017-01-08 09:21:34 +00:00
Peter Jaszkowiak
ffa2bd14f8 Fix reverse proxies breaking admin translations 2017-01-07 22:48:57 -07:00
Misty (Bot)
1dd8ed8c93 Latest translations and fallbacks 2017-01-07 09:21:35 +00:00