me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5457 commits 2 branches 0 tags 429 MiB
Commit graph

5457 commits

This branch
This branch
All branches
Author SHA1 Message Date
kibigo!
25da6ed5c1 my global .gitignore excluded this file ;_; 2018-01-05 21:40:02 -08:00
kibigo!
e5a10a1fd3 Threaded mode~ 2018-01-05 21:16:43 -08:00
kibigo!
85ffb07656 Fixed improper dropdown func binding for #293 + toot button spacing 2018-01-05 21:02:53 -08:00
kibigo!
77cb2d04f9 Styling and autosuggest fixes for #293 2018-01-05 20:43:16 -08:00
kibigo!
0e418264fb Fixes composer mounting issue with #293 2018-01-05 18:30:06 -08:00
David Yip
64fee6ca73 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-01-05 17:31:56 -06:00
beatrix
5500346b79 Merge pull request #290 from chriswmartin/web-push-updates 
Web push updates
 2018-01-05 18:29:57 -05:00
beatrix
3671d07f37 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
f6ed878ee9 Merge pull request #293 from glitch-soc/compose-refactor 
Compose refactor
 2018-01-05 18:29:08 -05:00
Jenkins
86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-05 22:17:12 +00:00
ThibG
0a8dd8fdd3 Fix PuSH workers (#6200) 2018-01-05 23:04:35 +01:00
ThibG
090bd4d505 When fetching an ActivityPub-enabled status, do not re-request it as text/html (#6196) 2018-01-05 22:42:50 +01:00
TheKinrar
3491c5e145 Represent numbers by strings in instance activity API (#6198) 
Fixes #6197.
 2018-01-05 22:38:33 +01:00
Naoki Kosaka
3bc13de62f Fix enforce HTTPS in production. (#6180) 2018-01-05 20:04:22 +01:00
beatrix
06a32b2621 Merge pull request #243 from m4sk1n/glitch-pl 
i18n: 🇵🇱
 2018-01-05 12:36:53 -05:00
cwm
17034d36cf add key to lists div 2018-01-05 09:00:48 -06:00
cwm
56429e7ca9 change how list ColumnLink keys are determined 2018-01-05 08:12:34 -06:00
Quenty31
cf9323449e 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!
55ead6a4b2 WIP <Compose> Refactor; Fin~ 2018-01-04 21:17:30 -08:00
Eugen Rochko
76268627c2 Bump version to 2.1.2 2018-01-05 04:52:06 +01:00
Yamagishi Kazutoshi
0fa691d2a9 Fix RFC 5646 Regular Expression (#6190) 2018-01-05 04:43:50 +01:00
kibigo!
7a9aaf28c4 WIP <Compose> Refactor; 1000 tiny edits 2018-01-04 18:33:13 -08:00
kibigo!
0cb97608c7 WIP <Compose> Refactor; <ActionsModal>; dropdowns 2018-01-04 18:31:00 -08:00
kibigo!
c560373d5e WIP <Compose> Refactor; SCSS ed. 2018-01-04 18:23:46 -08:00
kibigo!
c20717bd9f WIP <Compose> Refactor; <OnboardingModal> ed. 2018-01-04 18:21:59 -08:00
kibigo!
49d8d72192 WIP <Compose> Refactor; <Drawer> ed. 2018-01-04 18:21:59 -08:00
kibigo!
f87cce9e28 WIPgit status <Compose> Refactor; <Composer> ed. 2018-01-04 18:21:59 -08:00
Jenkins
796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-04 23:17:11 +00:00
Branko Kokanovic
fb3a2ddd24 Small translation fixes for Serbian (and sr@Latn too) (#6188) 2018-01-05 00:16:06 +01:00
Patrick Figel
bc5487a1c2 Fix email confirmation link not updating email (#6187) 
A change introduced in #6125 prevents
`Devise::Models::Confirmable#confirm` from being called for existing
users, which in turn leads to `email` not being set to
`unconfirmed_email`, breaking email updates. This also adds a test
that would've caught this issue.
 2018-01-05 00:15:35 +01:00
Lynx Kotoura
9bef64b3d3 Fix overflowing audit logs (#6184) 2018-01-04 19:38:46 +01:00
unarist
d2fcd64c31 Use disable_ddl_transaction! to prevent warnings on migration (#6183) 
Migration is wrapped by transaction, so manual `commit_db_transaction` without transaction restarting causes "there is no transaction in progress" warnings. We should use `disable_ddl_transaction!` instead, if we can omit transaction completely.
 2018-01-04 19:38:29 +01:00
Eugen Rochko
a0273c2c5e Bump version to 2.1.1 (#6164) 2018-01-04 16:40:26 +01:00
Yamagishi Kazutoshi
f92399cfe7 Fallback default thumbnail in instance status API (#6177) 2018-01-04 15:36:55 +01:00
Marcin Mikołajczak
1f2034932b i18n: Update Polish translation (#6176) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-04 23:15:29 +09:00
Marcin Mikołajczak
1ba0732b82 i18n: Update Polish translation 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-04 14:42:58 +01:00
Eugen Rochko
c647ce902b Send one Delete of Actor in ActivityPub when account is suspended (#6172) 2018-01-04 14:40:49 +01:00
ThibG
662fa866ee Make sure private toots remain private and do not end up in HTTP caches (#6175) 2018-01-04 14:39:38 +01:00
muan
22e3acfd56 Improve Traditional Chinese translation (#6166) 
* Improve Traditional Chinese translations

* Sort alphabetically
 2018-01-04 05:00:50 +01:00
Eugen Rochko
289355749f Fix FetchAtomService not finding alternatives if there's a Link header (#6170) 
without them, such as is the case with GNU social

Fixes the ability to find GNU social accounts via URL in search and
when using remote follow function
 2018-01-04 04:56:04 +01:00
Akihiko Odaki
b080a07550 Rearrange items in Getting Started navigation (#6126) 
Though the subsections are representing features such as navigation and
settings, they are categorized by the ways how they are implemented
(internal navigation or external links.) They are irrelevant and some
arrangements were confusing because of that. (It is nonsense that instance
information is in settings subsection, for example.)

This fixes the issue by rearranging.
 2018-01-04 10:56:54 +09:00
Eugen Rochko
73e1c12daa Fix nil error in log_target_from_history helper (#6173) 2018-01-04 10:56:23 +09:00
Eugen Rochko
321be04a5f Fix OpenSSL dependency in ostatus2 (#6174) 2018-01-04 10:56:00 +09:00
Eugen Rochko
f2d71eae4b Cache JSON of immutable ActivityPub representations (#6171) 2018-01-04 01:21:38 +01:00
Jenkins
a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-03 20:17:13 +00:00
Quenty31
bd82de325e l10n OC language (#6169) 
* new strings: hashtag+unlisted, mute, block

* Add confirmation step for email changes

* Add more instance stats APIs
 2018-01-03 21:05:54 +01:00
ThibG
5ee5272b69 Don't normalize URLs in toots (#6134) 
* Don't normalize URLs in toots

URL normalization is ill-defined and may cause certain links to break.

* Change specs since we are not normalizing user-provided URLs
 2018-01-03 20:51:33 +01:00
Akihiko Odaki
7a0479c830 Allow to dereference Follow object for ActivityPub (#5772) 
* Allow to dereference Follow object for ActivityPub

* Accept IRI as object representation for Accept activity
 2018-01-03 18:08:57 +01:00
Marcin Mikołajczak
b83fb8b107 i18n: Update Polish translation (#6168) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-03 22:45:24 +09:00
Yamagishi Kazutoshi
d50d61a90c Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167) 
* yarn manage:translations

* Add Japanese translation for #5997

* Add Japanese translation for #6003

* Add Japanese translation for #6004

* Add Japanese translation for #6071

* Add Japanese translation for #6099

* Add Japanese translation for #6125

* Add Japanese translation for #6132
 2018-01-03 21:00:39 +09:00