Commit Graph

  • c62faac801 Add coverage for admin/settings typecasting open_registrations setting Matt Jankowski 2017-04-20 09:44:03 -0400
  • 27d41c4490 Add coverage for admin/settings#update Matt Jankowski 2017-04-20 09:41:32 -0400
  • af81c547cb Add render_views for admin/settings spec Matt Jankowski 2017-04-20 09:36:03 -0400
  • 1127eb8af0
    Addresses feedback from #2181. Ash Furrow 2017-04-20 09:02:18 -0400
  • fdfd6a1f35 Display remaining characters when editing display name and bio Sebastian Morr 2017-04-20 13:37:21 +0200
  • 6ffbb57fa2 Merge branch 'master' into unicode-spaces ばん 2017-04-20 20:55:29 +0900
  • cfa2dffc5f Merge 0259eeec0f into 556f68ab15 StefOfficiel 2017-04-20 11:40:22 +0000
  • 556f68ab15 Make Docker image buildable on ARM (#2065) Christoph Witzany 2017-04-20 13:29:38 +0200
  • ad33da5de4 Test subdomain blacklist on domain whitelist Fiaxhs 2017-04-20 13:28:25 +0200
  • fdb2689a14 Fix PropTypes warning in OnboardingModal (#2191) Yamagishi Kazutoshi 2017-04-20 20:22:54 +0900
  • 88d83bbe6a Fix grammar Paulo Matos 2017-04-20 13:16:58 +0200
  • 992c54d4a7 Added spec for blacklisting Fiaxhs 2017-04-20 13:16:07 +0200
  • 0a4e53c3ce Merge branch 'master' into patch-1 Paulo Matos 2017-04-20 13:15:37 +0200
  • 598d3defd5 Use default locale for html lang in layouts (#2212) Matt Jankowski 2017-04-20 07:09:31 -0400
  • 93065d6c0b Adjustment of oc.jsx Quent-in 2017-04-20 13:04:43 +0200
  • 56de310d41 Linting Fiaxhs 2017-04-20 12:47:50 +0200
  • 38a03131cb Use default locale for html lang in layouts Matt Jankowski 2017-04-20 06:09:54 -0400
  • eded4d61fa Stricter whitelist rules Fiaxhs 2017-04-20 12:32:47 +0200
  • 43a70a0fa0 Update hr.yml May Kittens Devour Your Soul 2017-04-20 12:07:38 +0200
  • 4446292362 Fix english sentence grammar Paulo Matos 2017-04-20 12:01:00 +0200
  • e1851f319f Update hr.yml May Kittens Devour Your Soul 2017-04-20 11:38:51 +0200
  • cc16862cb4 Update and rename simple.form.hr.yml to simple_form.hr.yml May Kittens Devour Your Soul 2017-04-20 11:29:19 +0200
  • 73712e8c17 Update hr.jsx May Kittens Devour Your Soul 2017-04-20 11:26:20 +0200
  • 21ceba91cc 返信->おしゃべり maa123 2017-04-20 18:21:36 +0900
  • 03c0c7fd11 Fix mastodon.jsx for io reference Koala Yeung 2017-04-20 17:07:47 +0800
  • 23f3fa46f3 Add Ido (io) translation Gilles-Philippe Morin 2017-04-19 16:46:36 -0400
  • 0fd48dff7c Merge remote-tracking branch 'refs/remotes/origin/master' into tootsuite/master maa123 2017-04-20 17:49:55 +0900
  • 0452a57626 Removed obsoleted translation (id) Koala Yeung 2017-04-20 15:47:31 +0800
  • eed6e9f7d6 Add simple_format to simplified_format 178inaba 2017-04-20 16:37:33 +0900
  • f7a0dddd46 Fix language keys in Indonesian ruby locale (id) Koala Yeung 2017-04-20 15:34:15 +0800
  • d0c654c9f2 Fix code style deviations and use localized instead of hardcoded English text. Evan Minto 2017-04-20 00:23:27 -0700
  • 79494ae01c Revert yarn.lock changes. Evan Minto 2017-04-19 23:38:04 -0700
  • 2e7cf61aaf Merge remote-tracking branch 'origin/master' into activitypub-outbox Evan Minto 2017-04-19 23:36:55 -0700
  • 6941902d9b Add Forbidden error template. Evan Minto 2017-04-20 06:34:51 +0000
  • 60c1839958 Add tests. Evan Minto 2017-04-20 06:16:11 +0000
  • a048eedcb6 fix InvalidLocaleData on a string virtualpain 2017-04-20 02:45:48 +0700
  • 9990a88876 fix InvalidLocaleData on a string virtualpain 2017-04-20 02:31:02 +0700
  • 97a6625a46 add Indonesian (Bahasa Indonesia) translation virtualpain 2017-04-19 21:37:14 +0700
  • a4aa8884b6 add Indonesian (Bahasa Indonesia) translation virtualpain 2017-04-19 21:37:14 +0700
  • 53ae3b7dfa Fixed up coding style issues from rubocop (and in the process discovering intricacies of Ruby syntax I didn't know) Matthew Walsh 2017-04-19 20:48:44 -0700
  • 39cd9d2ea8 Merge 77a9711524 into 7f8044d913 Ben Hamill 2017-04-20 03:19:21 +0000
  • 672ce1634b Fix PropTypes warning in OnboardingModal Yamagishi Kazutoshi 2017-04-20 12:06:58 +0900
  • 5ca76e7420 follow up 59a77923b3 Yamagishi Kazutoshi 2017-04-20 11:16:38 +0900
  • 7f8044d913 Link to profile/feed/salmon from admin/accounts show page (#2186) Matt Jankowski 2017-04-19 22:00:02 -0400
  • 66b39ccaed Removes timestamp from URLs. (#2185) Ash Furrow 2017-04-19 21:54:24 -0400
  • 49e61af25b Link to profile/feed/salmon from admin/accounts show page Matt Jankowski 2017-04-19 21:54:03 -0400
  • cae2a26ee3 Fix #2120 - Use Status#as_tag_timeline on public hashtag page (#2182) Eugen 2017-04-20 03:54:02 +0200
  • 48117b68a5
    Removes standalone endpoint and adds version to instance endpoint. Ash Furrow 2017-04-19 21:49:37 -0400
  • 7a7dbda8b1
    Removes timestamp from URLs. Ash Furrow 2017-04-19 21:45:25 -0400
  • 66b8e90b0b Fix syntax error from resolve conflicts Yamagishi Kazutoshi 2017-04-20 10:25:19 +0900
  • 74927c4850 Update tags_controller.rb Eugen 2017-04-20 03:24:39 +0200
  • bdf85abfaf Fix #2120 - Use Status#as_tag_timeline on public hashtag page Eugen 2017-04-20 03:22:38 +0200
  • b79ba3db8a Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180) Miguel Jacq 2017-04-20 11:12:14 +1000
  • f6ab4fb88b Merge branch 'master' into rm-deprecated-features Eugen 2017-04-20 02:46:15 +0200
  • bb92819b48
    Cleans up code. Ash Furrow 2017-04-19 20:30:58 -0400
  • 711f02068e
    Adds version. Ash Furrow 2017-04-19 20:22:32 -0400
  • 44038a207f Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none Miguel Jacq 2017-04-20 10:13:14 +1000
  • c0a9c21ab1 db version set to wrong value in merge (oops) Matthew Walsh 2017-04-19 15:48:18 -0700
  • fc75fecf0e Button disabling won't apply to Monologue mode Matthew Walsh 2017-04-19 15:03:55 -0700
  • f3b290bf45 Merge branch 'master' of https://github.com/STJrInuyasha/mastodon into monologuing Matthew Walsh 2017-04-19 15:00:00 -0700
  • 59a77923b3 Add static gif for upload testing (#2168) Marcin Cieślak 2017-04-19 23:47:50 +0200
  • 4c9d967e5a
    Hides superluous details on small screans. Ash Furrow 2017-04-19 17:43:42 -0400
  • 3d7976d0e7 Add static gif for upload testing Marcin Cieślak 2017-04-19 19:41:59 +0000
  • 2e4afccd9d Fix #2108 - Fix gif uploads (#2171) v1.2.2 Eugen 2017-04-19 23:21:00 +0200
  • 0876a06e45 Updated note about 'none' SMTP authentication method in .env.production.sample (#2167) evilny0 2017-04-19 23:16:43 +0200
  • 7fce0e815f Switch travis to trusty Eugen Rochko 2017-04-19 22:55:41 +0200
  • e83e48f037 Merge https://github.com/maliktunga/mastodon Gilles-Philippe Morin 2017-04-19 16:49:14 -0400
  • c8baa6e6d6 Make travis install ffmpeg, not libav Eugen Rochko 2017-04-19 22:46:57 +0200
  • 22da75252c Ido translation Gilles-Philippe Morin 2017-04-19 16:46:36 -0400
  • e1bd71e068 Add ffmpeg to travis Eugen Rochko 2017-04-19 22:28:17 +0200
  • 43caf1fa5f Add some Spanish translatoins (#2170) Darshak Parikh 2017-04-20 01:49:41 +0530
  • 2c0d756ad9 Extract error messages to locale file (#2162) alpaca-tc 2017-04-20 05:19:32 +0900
  • f06cba3f60 Dutch language strings: a few important fixes (#2163) jeroenpraat 2017-04-19 22:19:19 +0200
  • c0dfa6b93c Fix #2108 - Fix gif uploads Add specs for media attachment gifv conversion Eugen Rochko 2017-04-19 22:13:27 +0200
  • d8b37f5dfa Add some Spanish translatoins Darshak Parikh 2017-04-20 01:29:23 +0530
  • 2f5481bd94 Adds git to dependencies Ash Furrow 2017-04-19 15:55:38 -0400
  • 04271000a4 Merge branch 'local-id' of github.com:virtualpain/mastodon into local-id virtualpain 2017-04-20 02:46:10 +0700
  • 6f16d016c8 fix InvalidLocaleData on a string virtualpain 2017-04-20 02:45:48 +0700
  • f2efac9209 Moved .bg-profile to a better place (covers following/followers page) MKody 2017-04-19 21:33:46 +0200
  • 477b5ba2ad Updated note about 'none' SMTP authentication method in .env.production.sample evilny0 2017-04-19 21:33:04 +0200
  • 6e4ff6ccd9 Merge remote-tracking branch 'origin/master' into background-profiles MKody 2017-04-19 21:32:08 +0200
  • 774ce77eb2 fix InvalidLocaleData on a string virtualpain 2017-04-20 02:31:02 +0700
  • 428b388a83 center app on larger window sizes Hugo Gameiro 2017-04-19 20:01:46 +0100
  • c88e5c5b3c move center app to components.scss Hugo Gameiro 2017-04-19 19:59:29 +0100
  • 084da71fc2 Merge pull request #1 from jeroenpraat/jeroenpraat-patch-1 jeroenpraat 2017-04-19 19:48:41 +0200
  • d888697331 Dutch language strings: a few important fixes jeroenpraat 2017-04-19 19:46:43 +0200
  • 26669ee9d0 Extract error messages to locale file alpaca-tc 2017-04-20 02:45:08 +0900
  • 09dad88853 Fixed hungarian translation (#2158) v1.2.1 György Nádudvari 2017-04-19 19:21:44 +0200
  • 7832425fdd Fix css for toot button when uploading images (#2161) Tomohiro Suwa 2017-04-20 02:21:23 +0900
  • abe16a7026 fix broken style when follower has long description (#2159) fsubal 2017-04-20 02:20:51 +0900
  • 8fb27f7427 Fix css for toot button when uploading images Tomohiro Suwa 2017-04-20 02:14:33 +0900
  • cae7cbd3ca Fixed hungarian translation György Nádudvari 2017-04-19 18:36:44 +0200
  • c270f58784 fix broken style when follower has long description subal f 2017-04-20 01:29:35 +0900
  • edc7dffdfe Merge pull request #14 from alarky/osaka-benize alarky 2017-04-20 00:53:18 +0900
  • 32815fe3d5 Merge pull request #13 from acid-chicken/osaka-master alarky 2017-04-20 00:52:38 +0900
  • 74e682c989 sainara alarky 2017-04-20 00:52:14 +0900
  • 9bdad70a51 tsurumi alarky 2017-04-20 00:51:43 +0900
  • baabbce672 Fix double-escaping of display names in <title> (#2155) Eugen 2017-04-19 17:46:24 +0200
  • cea4ee2ea9 Fix double-escaping of display names in <title> Eugen Rochko 2017-04-19 17:45:38 +0200
  • 1d47910d3b Fix possibility of unrightful webfinger redirect (#2147) Eugen 2017-04-19 17:28:35 +0200