Commit Graph

  • c9ef3bc350 Merge pull request #4 from tomoasleep/use-v1.3.2 Tomoya Chiba 2017-05-01 18:30:30 +0900
  • d4c216d73c Complete and up-to-date Norwegian translations. Thor H. Johansen 2017-05-01 11:21:18 +0200
  • d5baa690cd Fixed mistake with main Norwegian YAML file Thor H. Johansen 2017-05-01 11:14:11 +0200
  • cb69349a79 New main Norwegian YAML file. Thor H. Johansen 2017-05-01 11:09:39 +0200
  • d90f6c4a21 Merge da429b821c into 5259319cf5 Yann GUERN 2017-05-01 09:05:39 +0000
  • 3b834c3cc4 Update mastodon.jsx May Kittens Devour Your Soul 2017-05-01 09:49:55 +0200
  • ca960224fa Fixes typo in translation Audun Larsen 2017-05-01 09:40:08 +0200
  • c29c040811 Fixes typo in translation Audun Larsen 2017-05-01 09:39:41 +0200
  • a6a030dbab Translates reset password email Audun Larsen 2017-05-01 09:34:30 +0200
  • d636612728 Translates html reset password email Audun Larsen 2017-05-01 09:33:09 +0200
  • ba9dc242fe Translates password changed email Audun Larsen 2017-05-01 09:30:19 +0200
  • 40ea948712 Translates html password changed email Audun Larsen 2017-05-01 09:29:26 +0200
  • 870f27e427 Translates welcome email Audun Larsen 2017-05-01 09:27:42 +0200
  • fe67459a4a Translates html welcome email Audun Larsen 2017-05-01 09:25:17 +0200
  • fda84f7f36 Create reset_password_instructions.no.text.erb Audun Larsen 2017-05-01 09:21:58 +0200
  • da134e82c8 Create reset_password_instructions.no.html.erb Audun Larsen 2017-05-01 09:21:45 +0200
  • cc7edecd3f Create password_change.no.text.erb Audun Larsen 2017-05-01 09:21:17 +0200
  • 0f99e47be8 Create password_change.no.html.erb Audun Larsen 2017-05-01 09:21:04 +0200
  • 8378c4f082 Create confirmation_instructions.no.text.erb Audun Larsen 2017-05-01 09:20:36 +0200
  • 377f6b055b Create confirmation_instructions.no.html.erb Audun Larsen 2017-05-01 09:20:11 +0200
  • a7c4bdc94c Replace the new line code to the br tag in live preview and emojify 北䑓如法 2017-05-01 14:56:34 +0900
  • 4dddf84c2e Merge branch 'increments' into use-v1.3.2 Tomoya Chiba 2017-05-01 13:32:25 +0900
  • 4b278efd11 Merge remote-tracking branch 'upstream/master' dasoran 2017-05-01 11:32:25 +0900
  • d1dfa14d90 views: link hashtags from spoiler_texts Rey Tucker 2017-04-30 21:10:17 -0400
  • ee29d291d9 services: scan spoiler_text for hashtags (#699) Rey Tucker 2017-04-30 20:58:32 -0400
  • d86a6c4049 Add live preview during composing your toots 北䑓如法 2017-05-01 09:11:03 +0900
  • c9601d15fb atom_serializer: tag CW'd media as nsfw even if not sensitive Rey Tucker 2017-04-30 20:05:02 -0400
  • f450375dd5 app: fix a few more places where sensitive media was not being inferred Rey Tucker 2017-04-30 19:59:52 -0400
  • d8114e8c10 Merge remote-tracking branch 'upstream/master' Thor H. Johansen 2017-04-30 23:58:19 +0200
  • 3cb3a4240c status: if spoiler_text is present, treat media as sensitive (#1010) Rey Tucker 2017-04-30 17:44:30 -0400
  • d6dbd20655 Update mastodon.jsx May Kittens Devour Your Soul 2017-04-30 23:30:51 +0200
  • 56ece9165a Remove offline-plugin and babili Eugen Rochko 2017-04-30 22:23:58 +0200
  • 1aa7c105b5 Add back support for custom.scss as before Eugen Rochko 2017-04-30 20:09:30 +0200
  • d20bacf88c Re-run travis Eugen Rochko 2017-04-30 19:41:27 +0200
  • b531fd0510 Improve travis cache for npm stuff Eugen Rochko 2017-04-30 19:31:05 +0200
  • fffcf44c87 Merge pull request #27 from alarky/src/v132_for_merge_to_osaka alarky 2017-05-01 02:28:49 +0900
  • 4e1e2ab4b0 More optimizations Eugen Rochko 2017-04-30 19:24:57 +0200
  • 8177c26e7c fix css alarky 2017-05-01 02:24:42 +0900
  • 7003937efc Merge remote-tracking branch 'origin/osaka-master' into src/v132_for_merge_to_osaka alarky 2017-05-01 02:03:55 +0900
  • ea7681b16c Fix tests Eugen Rochko 2017-04-30 18:59:06 +0200
  • 13a644f3f5 Merge branch 'master' into feature-webpack Eugen Rochko 2017-04-30 18:31:21 +0200
  • 5259319cf5 Reports spec for media attachments, clean up method (#2660) Matt Jankowski 2017-04-30 12:15:49 -0400
  • b83bc0ae64 Add postgres/redis folder to .dockerignore (#2659) mecab 2017-05-01 01:15:27 +0900
  • 6309b92f2a Direct query on media attachment Matt Jankowski 2017-04-30 11:58:51 -0400
  • 42740a9ffb Add coverage for Report#media_attachments Matt Jankowski 2017-04-30 11:43:13 -0400
  • 282427cdd9 Updating Indonesian locale (#2644) Alvina Putri 2017-04-30 22:35:15 +0700
  • 2bf2a3ac90 Add postgres/redis folder to .dockerignore mecab 2017-05-01 00:24:22 +0900
  • 6e8dac857f fix main key virtualpain 2017-04-30 22:16:28 +0700
  • 04487bdd97 fix another ooc string virtualpain 2017-04-30 22:14:44 +0700
  • 37d0b2b67d Add a hint to explain language filtering preference Matt Jankowski 2017-04-28 11:15:56 -0400
  • d6c8bdb75d Style list items as two columns Matt Jankowski 2017-04-28 11:15:39 -0400
  • bcde4090b3 Allow users to choose languages to see statuses in Matt Jankowski 2017-04-22 21:22:15 -0400
  • 2f6cc6051e Convert allowed_languages into a db column Matt Jankowski 2017-04-22 21:21:56 -0400
  • 7790bdd972 Naive approached to timeline filtering Matt Jankowski 2017-04-22 20:41:13 -0400
  • b381d4cba6 Merge 097d0fcefb into c67d3c990b Pomo Rosso 2017-04-30 13:35:22 +0000
  • d4a420e802 Merge 524fe0b6d6 into c67d3c990b Keiji, Yoshimi 2017-04-30 13:34:59 +0000
  • 6eab296bec update yarn.lock Nolan Lawson 2017-04-30 06:14:47 -0700
  • c67d3c990b Additional key checks for browser compatibility (#2539) Noëlle Anthony 2017-04-30 09:12:14 -0400
  • 2e47fe3e1a Center web app on larger windows sizes (#2021) Hugo Gameiro 2017-04-30 14:01:09 +0100
  • e12bb39c20 Fix character_counter.jsx (#2653) AA4ch1 2017-04-30 21:58:33 +0900
  • 5caa727e7e Norwegian locale: Translates missing 2FA strings (#2655) Audun Larsen 2017-04-30 14:56:07 +0200
  • 0a46201a66 Minor fixes in the French translation (#2607) Sylvhem 2017-04-30 14:51:32 +0200
  • 3f248dcaae Update ar.jsx (#2647) ButterflyOfFire 2017-04-30 14:51:12 +0200
  • baa43e40a0 Minor changes to Norwegian locale (#2652) Audun Larsen 2017-04-30 14:50:49 +0200
  • a6788662b0 Revert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634) Akihiko Odaki 2017-04-30 21:49:24 +0900
  • e0d4d7eb59 Changes "tofaktorautentisering" to "to-faktor autentisering" Audun Larsen 2017-04-30 14:43:44 +0200
  • 09f56e1169 Translates missing strings. Audun Larsen 2017-04-30 14:39:55 +0200
  • 3bb540b3ee Adds missing strings to Norwegian locale Audun Larsen 2017-04-30 14:31:48 +0200
  • 5c04bf2272 Added italian translation Changes to be committed: new file: config/locales/activerecord.it.yml Giuseppe Pignataro 2017-04-30 14:27:48 +0200
  • b27255e70a Added Italian Translation of the following files: Changes to be committed: new file: app/views/user_mailer/confirmation_instructions.it.html.erb new file: app/views/user_mailer/confirmation_instructions.it.text.erb new file: app/views/user_mailer/password_change.it.html.erb new file: app/views/user_mailer/password_change.it.text.erb new file: app/views/user_mailer/reset_password_instructions.it.html.erb new file: app/views/user_mailer/reset_password_instructions.it.text.erb Giuseppe Pignataro 2017-04-30 14:14:47 +0200
  • 1b9a5b418f Fix character_counter.jsx AA4ch1 2017-04-30 20:38:19 +0900
  • 7102d714a6 Update ar.yml ButterflyOfFire 2017-04-30 13:46:52 +0200
  • 5e965bd3da Minor changes to Norwegian locale Audun Larsen 2017-04-30 13:35:01 +0200
  • 15a624f6ae Update ar.jsx ButterflyOfFire 2017-04-30 12:53:14 +0200
  • 0167251a81 Norwegian translation fixes. Thor H. Johansen 2017-04-30 12:12:44 +0200
  • b4cec4f944 Merge remote-tracking branch 'upstream/master' Thor H. Johansen 2017-04-30 12:07:55 +0200
  • d6007c7ca4 improve translation that out of context virtualpain 2017-04-30 16:51:50 +0700
  • a9adb13392 add activerecord.id.yml virtualpain 2017-04-30 16:49:02 +0700
  • 49c33d32cf update id.yml for new strings and improvements virtualpain 2017-04-30 16:45:54 +0700
  • 6a35f57e04 Merge remote-tracking branch 'tootsuite/master' Spyros 2017-04-30 11:33:24 +0200
  • 7c8694e0b9 Enable MathJax at users' pages 北䑓如法 2017-04-30 17:31:57 +0900
  • 1663e32d1a update id.jsx file virtualpain 2017-04-30 16:14:06 +0700
  • c4295de561 Add FanTarget Shinpei Kawahito 2017-04-30 17:08:47 +0900
  • 5356dda01b Merge tag 'v1.3.2' into feature/update-version-to-1.3.2 root 2017-04-30 16:54:30 +0900
  • 98fc4e931e Use envify + NODE_ENV=production for smaller JS bundle Nolan Lawson 2017-04-29 23:54:37 -0700
  • a49c1b796a Revert "Use PostgreSQL inheritance for blocks and mutes (#2520)" Akihiko Odaki 2017-04-30 15:37:07 +0900
  • f91089209b Merge b88ffa1f6e into 4a5f73c8ae Yamagishi Kazutoshi 2017-04-30 06:18:49 +0000
  • b88ffa1f6e Fix migrate (regression from #2520) Yamagishi Kazutoshi 2017-04-30 13:49:53 +0900
  • 6563a14783 Remove Intl polyfill Nolan Lawson 2017-04-29 22:50:03 -0700
  • 32dbf323e4 Add comma (opps) 北䑓如法 2017-04-30 13:46:46 +0900
  • 51ed2fc043 Merge branch 'master' into rp-tools TheInventrix 2017-04-29 22:43:38 -0600
  • 784b100618 Add the extension AMScd.js 北䑓如法 2017-04-30 13:39:31 +0900
  • 7e2c65f85e Fix "Could not find actionview-5.0.2" shinriyo 2017-04-30 11:32:10 +0900
  • 4058891d63 Merge 780b6fff0b into 4a5f73c8ae Kane York 2017-04-30 02:05:31 +0000
  • 3a05fb1c1c fix rubocop Style/SpaceInLambdaLiteral Yoshiyuki Hirano 2017-04-30 09:28:47 +0900
  • 3f574cc8f2 fix rubocop Style/AlignParameters, Style/EachWithObject Yoshiyuki Hirano 2017-04-30 09:28:07 +0900
  • 7518544177 fix rubocop Style/AlignHash Yoshiyuki Hirano 2017-04-30 09:25:27 +0900
  • 32121710f0 fix rubocop Style/BlockDelimiters Yoshiyuki Hirano 2017-04-30 09:23:57 +0900
  • efa12bd250 fix rubocop Lint/UselessAssignment Yoshiyuki Hirano 2017-04-30 09:23:25 +0900
  • 45352b47f2 disable Bundler/OrderedGems Yoshiyuki Hirano 2017-04-30 09:21:50 +0900