3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,430 Commits
8 Branches
0 Tags
183 MiB
Commit Graph

3430 Commits (4c37f629bce6fede13b6105749a10e585fb9c3b0)

Author SHA1 Message Date
kibigo! 4c37f629bc Don't change layout of static pages 2017-06-24 18:30:59 -07:00
kibigo! ddba5d3b8c Use Redux store to keep track of layout 2017-06-24 18:30:30 -07:00
Surinna Curtis ceb545c080 Pass in correct "singleColumn" prop value when auto-columns is not used. 2017-06-24 15:29:46 -05:00
Surinna Curtis a70468aa56 Support overriding media queries for deciding between single-column/multi-column layouts with a class 2017-06-24 15:29:46 -05:00
beatrix-bitrot 8b23bf7cbd clean up old avatar class 2017-06-24 03:51:01 +00:00
Matthew Walsh f1a60d4b81 Unified avatar styling 
Avatars now have consistent styling across all pages; border radius can be adjusted with a SASS variable ($ui-avatar-border-size)
 2017-06-24 03:03:27 +00:00
kibigo! 2513d92c54 Un-hide dropdown menu ;P 2017-06-23 19:39:44 -07:00
kibigo! 414dfb3955 ESLint improvements for Profile Metadata 2017-06-23 18:43:30 -07:00
Gô Shoemake 67adbcc60c Reblog support for collapsed toots 2017-06-23 18:23:26 -07:00
beatrix-bitrot 453b9c6e7e missing punctuation 2017-06-23 22:01:04 +00:00
beatrix d9b9bb8c5e glitch the getting started image 2017-06-23 21:50:45 +00:00
kibigo! 40ecbfd4a9 Very minor styling improvements to toot-collapsing 2017-06-23 21:50:45 +00:00
kibigo! 4fe45dda9a Updates height upon collapsing 2017-06-23 21:50:45 +00:00
kibigo! 4bd7482a7a Minor collapsing button improvements~ 2017-06-23 21:50:45 +00:00
kibigo! 93c52301ad Collapsable toots [1/??] ☕️ 2017-06-23 21:50:45 +00:00
kibigo! 0d3ec19e89 ✨ Profile Metadata HACK 😈 2017-06-23 21:45:14 +00:00
Go Shoemake 62a75891ab Fixes drawer so stuff doesn't overflow 2017-06-23 21:45:14 +00:00
Charlotte Fields b27842dc70 cybre cleanup 2017-06-23 21:45:14 +00:00
Chronister 39b6b37b74 cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
Chronister 65528fc54e All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
Charlotte Fields 382572c213 adding cybre changes 2017-06-23 21:45:14 +00:00
beatrix-bitrot 9bc593d675 update local modifications for cors and cp 2017-06-23 21:45:14 +00:00
beatrix-bitrot 09f7ad3614 silly readme update to test automated deploys 2017-06-23 21:45:14 +00:00
beatrix-bitrot 7c2ea42cd5 update README.md 2017-06-23 21:45:14 +00:00
beatrix ea785d0baf Update README.md 2017-06-23 21:45:14 +00:00
Beatrix Bitrot a337c5dbe5 CORS tweaks 2017-06-23 21:45:14 +00:00
Daniel Hunsaker c0979381a4 Fix a typo and give CW'd statuses the right cursor (#3918) 2017-06-23 23:13:27 +02:00
Eugen Rochko 676f577e7e Fix webpack-dev-server until it's fixed upstream (#3916) 2017-06-23 19:40:51 +02:00
Yamagishi Kazutoshi c1a8e3d1eb Use Class and Property Decorators (#3730) 
ref https://tc39.github.io/proposal-decorators/
 2017-06-23 19:36:54 +02:00
Takuya Yoshida 0c44316b22 Fix errorMiddleware to prevent "TypeError: res.writeHead is not a function" (#3913) 
* Fix errorMiddleware

* Add "eslint-disable-line no-unused-vars"
 2017-06-23 19:22:02 +02:00
Sorin Davidoi 2211e8d1cd Revocable sessions (#3616) 
* feat: Revocable sessions

* fix: Tests using sign_in

* feat: Configuration entry for the maximum number of session activations
 2017-06-23 18:50:53 +02:00
Nolan Lawson 3783cadf2d Apply babel to react-intl to remove prop-types (#3914) 2017-06-23 18:21:33 +02:00
Eugen Rochko a071047c13 Merge branch 'sorin-davidoi-swipe-gestures' 2017-06-23 17:52:56 +02:00
Eugen Rochko 281f07244b Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon into sorin-davidoi-swipe-gestures 2017-06-23 17:52:39 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) 6f34a6a77f Add index statuses on account_id and id (#3895) 2017-06-23 17:46:00 +02:00
Nolan Lawson e078919f07 Upgrade to Webpack 3 with module concatenation (#3912) 2017-06-23 17:44:55 +02:00
Eugen Rochko 7b13e6efc2 Bump version to 1.4.6 2017-06-23 17:02:14 +02:00
Eugen Rochko 3f59238207 Add important test for full-width hashtags (#3911) 2017-06-23 17:01:53 +02:00
Yamagishi Kazutoshi eff9416469 Remove unused variables (#3906) 2017-06-23 16:05:04 +02:00
Yamagishi Kazutoshi 6fbb3841a6 Add prefix to setting toggle ID (#3907) 2017-06-23 13:55:05 +02:00
Sorin Davidoi d8c4781377 fix: Apply :hover, :focus and :active only when multiple columns 2017-06-23 13:48:46 +02:00
Sorin Davidoi bc6e958229 feat: Swipeable media 2017-06-23 13:48:46 +02:00
Sorin Davidoi a6d8d1036a feat: Swipeable columns 2017-06-23 13:48:46 +02:00
Sorin Davidoi 3d403a013d chore(yarn): Install react-swipeable 2017-06-23 13:40:58 +02:00
Ratmir Karabut 9ca02a00a6 Update Russian translation (#3902) 
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error

* Update Russian translation

* Fix formatting error

* Update Russian translation

* Update Russian translation

* Update ru.jsx

* Fix syntax error

* Remove two_factor_auth.warning (appears obsolete)

* Add missing strings in ru.yml

A lot of new strings translated, especially for the newly added admin section

* Fix translation consistency

* Update Russian translation

* Update Russian translation (pluralizations)

* Update Russian translation

* Update Russian translation

* Update Russian translation (pin)

* Update Russian translation (account deletion)

* Fix extra line
 2017-06-22 23:28:58 +02:00
nightpool 3e8e9c8ae4 Use the stable RVM installer (#3901) 
as mentioned by ElvenSpellmaker here: https://github.com/rvm/rvm/issues/4068

Adds a workaround for the issue mentioned by @abcang here: https://github.com/tootsuite/mastodon/pull/3897#issuecomment-310436668 and makes sure that we're using the stable installer to install the stable version.
 2017-06-22 23:28:52 +02:00
Charlotte Fields 7bc1805827 fixed vagrantfile (#3897) 2017-06-22 18:35:27 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) e27f792c24 Some minor change and spec for Account (#3813) 
* Introduce domains method to Account relation

Account had followers_domains method, which was excessively specific.
Let relation of Account have domains method instead.

* Move follow_mapping in Account to AccountInteractions

* Introduce shared examples for AccountAvatar inclusion

* Cover Account more
 2017-06-22 18:34:27 +02:00
Quent-in 98fab24bea Update of doorkeeper.oc.yml (#3896) 
Just some adjustements
 2017-06-22 13:39:13 +02:00
Eugen Rochko f566c47dda Fix travis builds 
https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310320597
 2017-06-22 13:24:00 +02:00