Jenkins
|
c2e1bfd9ae
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2018-01-07 15:17:13 +00:00 |
|
Yamagishi Kazutoshi
|
1d92b90be9
|
Fix force_ssl conditional (#6201)
|
2018-01-07 15:19:23 +01:00 |
|
Yamagishi Kazutoshi
|
da809f9eec
|
Fix unintended cache (#6214)
|
2018-01-07 15:12:59 +01:00 |
|
SerCom_KC
|
c4d36d024c
|
Update Simplified Chinese translations (#6215)
* i18n: (zh-CN) Add translations of #6125
* i18n: (zh-CN) Add translations of #6132
* i18n: (zh-CN) Add translations of #6099
* i18n: (zh-CN) Add translations of #6071
* i18n: (zh-CN) Improve translations
|
2018-01-07 17:32:50 +09:00 |
|
David Yip
|
5083311d64
|
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
|
2018-01-07 00:32:24 -06:00 |
|
Yamagishi Kazutoshi
|
2af307bce4
|
Fix unintended cache
|
2018-01-07 14:59:12 +09:00 |
|
Andrew
|
56312df73b
|
Z indexes and colors
|
2018-01-06 18:38:19 -08:00 |
|
Andrew
|
7a93acd803
|
To 2.1.2
|
2018-01-06 18:25:19 -08:00 |
|
Jenkins
|
bcbdd4f88d
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2018-01-07 02:17:10 +00:00 |
|
Jeong Arm
|
9e97fbf0af
|
Translate Korean (#6212)
|
2018-01-07 11:13:42 +09:00 |
|
kibigo!
|
b5874c1428
|
Fixes to search dropdown
|
2018-01-06 15:34:01 -08:00 |
|
beatrix
|
61ef8d643e
|
fix typo in vanilla names.yml
|
2018-01-06 16:49:53 -05:00 |
|
Ondřej Hruška
|
9f29fd31ba
|
fixed ctrl enter
|
2018-01-06 19:58:04 +01:00 |
|
Ondřej Hruška
|
53caab0c0b
|
Fix the always-threaded bug
|
2018-01-06 19:55:53 +01:00 |
|
beatrix-bitrot
|
b75a1ce326
|
tighten csp
|
2018-01-06 18:49:03 +00:00 |
|
beatrix
|
d442cfa65c
|
Merge pull request #303 from KnzkDev/ja-for-thread-mode
Update ja.js for #296
|
2018-01-06 12:06:17 -05:00 |
|
ncls7615
|
f5a4201ad8
|
Update ja.js
|
2018-01-07 01:51:49 +09:00 |
|
beatrix
|
a251c42192
|
Merge pull request #296 from glitch-soc/thread-mode
Threaded mode~
|
2018-01-06 11:28:36 -05:00 |
|
beatrix
|
2ec9a75a1d
|
Merge pull request #302 from KnzkDev/fix/search-popout
Fix search popout
|
2018-01-06 11:25:59 -05:00 |
|
beatrix
|
fa92e88fb2
|
appease eslint
|
2018-01-06 10:30:49 -05:00 |
|
ncls7615
|
da98c33161
|
Fix search popout
|
2018-01-06 21:50:11 +09:00 |
|
David Yip
|
2eed4ace11
|
Read max_toot_chars from root object. Fixes #297.
max_toot_chars is present in the root of the initial state object.
(Previously, we were trying to read it from the meta child object.)
|
2018-01-06 03:01:11 -06:00 |
|
kibigo!
|
c71d848855
|
my global .gitignore excluded this file ;_;
|
2018-01-05 21:40:02 -08:00 |
|
kibigo!
|
e4bc013d6f
|
Threaded mode~
|
2018-01-05 21:16:43 -08:00 |
|
kibigo!
|
6932b464e6
|
Fixed improper dropdown func binding for #293 + toot button spacing
|
2018-01-05 21:02:53 -08:00 |
|
kibigo!
|
ad10a80a99
|
Styling and autosuggest fixes for #293
|
2018-01-05 20:43:16 -08:00 |
|
kibigo!
|
8bf9d9362a
|
Fixes composer mounting issue with #293
|
2018-01-05 18:30:06 -08:00 |
|
Andrew
|
077f2e600c
|
Win95 to 2.1
|
2018-01-05 16:22:58 -08:00 |
|
Andrew
|
39c0b6ceb3
|
Updates and fixes to win95 theme
|
2018-01-05 16:22:58 -08:00 |
|
Andrew
|
ed574fbc09
|
Theme: Windows 95
|
2018-01-05 16:22:58 -08:00 |
|
David Yip
|
03aeab857f
|
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
|
2018-01-05 17:31:56 -06:00 |
|
beatrix
|
f441770e50
|
Merge pull request #290 from chriswmartin/web-push-updates
Web push updates
|
2018-01-05 18:29:57 -05:00 |
|
beatrix
|
b4e667f86b
|
Merge pull request #295 from chriswmartin/getting-started-key-fix
unique ColumnLink keys in getting_started
|
2018-01-05 18:29:40 -05:00 |
|
beatrix
|
faf20eeaa4
|
Merge pull request #293 from glitch-soc/compose-refactor
Compose refactor
|
2018-01-05 18:29:08 -05:00 |
|
Jenkins
|
f6adb409fd
|
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
|
2018-01-05 22:17:12 +00:00 |
|
ThibG
|
10f6793fd0
|
Fix PuSH workers (#6200)
|
2018-01-05 23:04:35 +01:00 |
|
ThibG
|
a594139115
|
When fetching an ActivityPub-enabled status, do not re-request it as text/html (#6196)
|
2018-01-05 22:42:50 +01:00 |
|
TheKinrar
|
95bd85d9e8
|
Represent numbers by strings in instance activity API (#6198)
Fixes #6197.
|
2018-01-05 22:38:33 +01:00 |
|
kibigo!
|
ac686d5a5d
|
Fixed overflow issue
|
2018-01-05 13:34:21 -08:00 |
|
kibigo!
|
ec620ae486
|
Styling fixes
|
2018-01-05 12:41:15 -08:00 |
|
Naoki Kosaka
|
8d51ce4290
|
Fix enforce HTTPS in production. (#6180)
|
2018-01-05 20:04:22 +01:00 |
|
beatrix
|
f41b33eb01
|
Merge pull request #243 from m4sk1n/glitch-pl
i18n: 🇵🇱
|
2018-01-05 12:36:53 -05:00 |
|
cwm
|
9fc08e4861
|
add key to lists div
|
2018-01-05 09:00:48 -06:00 |
|
cwm
|
6236577734
|
change how list ColumnLink keys are determined
|
2018-01-05 08:12:34 -06:00 |
|
Quenty31
|
06636c6eca
|
l10n Occitan language: mailer update (#6193)
* Create email_changed.oc.html.erb
* Create email_changed.oc.text.erb
* Update email_changed.oc.html.erb
* Update email_changed.oc.html.erb
* Create reconfirmation_instructions.oc.html.erb
* Create reconfirmation_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update reconfirmation_instructions.oc.html.erb
* Update reconfirmation_instructions.oc.text.erb
* Update reconfirmation_instructions.oc.html.erb
|
2018-01-05 18:59:43 +09:00 |
|
kibigo!
|
d7ce339c2e
|
WIP <Compose> Refactor; Fin~
|
2018-01-04 21:17:30 -08:00 |
|
Eugen Rochko
|
e9822a4e4e
|
Bump version to 2.1.2
|
2018-01-05 04:52:06 +01:00 |
|
Yamagishi Kazutoshi
|
9a61b0ef22
|
Fix RFC 5646 Regular Expression (#6190)
|
2018-01-05 04:43:50 +01:00 |
|
kibigo!
|
42f50049ff
|
WIP <Compose> Refactor; 1000 tiny edits
|
2018-01-04 18:33:13 -08:00 |
|
kibigo!
|
b4a3792201
|
WIP <Compose> Refactor; <ActionsModal>; dropdowns
|
2018-01-04 18:31:00 -08:00 |