Commit Graph

  • 0c2fe22bc1 Add test coverage to CSS class generation (#2285) Joël Quenneville 2017-04-23 00:04:32 -0400
  • b0a45f0786 Merge branch 'master' into test_css_classes Eugen 2017-04-23 06:03:49 +0200
  • 6f0b3b069f Adding arabic string localization (rebased) (#1895) Koala Yeung 2017-04-23 11:58:47 +0800
  • a324e74419 fixed merge mistake. Keiji Yoshimi 2017-04-23 12:37:57 +0900
  • 9cd20a7062 Tooltip for boosting depends on toot visibility (#1394) (#1754) Ashley 2017-04-23 15:36:40 +1200
  • 1bb855d7b2 fixed text. Keiji Yoshimi 2017-04-23 12:04:41 +0900
  • 0eb9040bc0 change form text after user clicked content wanrning button. Keiji Yoshimi 2017-04-23 00:25:09 +0900
  • 219fb317ee Remove unnecessary variable in ColumnLink component (#2341) Yamagishi Kazutoshi 2017-04-23 12:21:38 +0900
  • 66fd8e7821 ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197) Evan Minto 2017-04-22 20:21:10 -0700
  • e75a698e22 Merge branch 'master' into change-boost-tooltips Ashley 2017-04-23 15:20:26 +1200
  • 1ed65fa531 Changed 'toot' to 'status' Expenses 2017-04-23 15:18:43 +1200
  • 524fe0b6d6 fixed error of undefined variable outerStyle Keiji Yoshimi 2017-04-23 12:12:58 +0900
  • 47c9949dd7 Remove unnecessary variable in ColumnLink component Yamagishi Kazutoshi 2017-04-23 12:06:37 +0900
  • 744eafec49 Added missing bracket Expenses 2017-04-23 15:02:52 +1200
  • 83e3538181 Update CA certificates in Dockerfile (#2339) Yamagishi Kazutoshi 2017-04-23 11:59:56 +0900
  • 34b3a96b95 Update CA certificates in Dockerfile Yamagishi Kazutoshi 2017-04-23 11:50:27 +0900
  • 9c0f53ab42 Try again :P Expenses 2017-04-23 14:50:00 +1200
  • baa5c03798 Removed spaces that were added in merge conflict resolution Expenses 2017-04-23 14:48:25 +1200
  • 25a1cf4ce5 Merge aedb2c6ab6 into 723f25a999 Pierre Ozoux 2017-04-23 02:43:48 +0000
  • 723f25a999 Admin UI for confirming users (#2245) Ash Furrow 2017-04-23 04:43:42 +0200
  • 59b1de0bcf Add a confirmation modal: (#2279) Eugen 2017-04-23 04:39:50 +0200
  • 2366827dc2 Merge branch 'master' into change-boost-tooltips Ashley 2017-04-23 14:36:24 +1200
  • dd2e33b918 Merge branch 'master' into feature-confirmation-modal Eugen 2017-04-23 04:32:55 +0200
  • df46864b39 Alter Japanese translations for CW and NSFW (#2305) Akihiko Odaki 2017-04-23 11:31:40 +0900
  • cca41ea544 Replace inline styles with CSS classes (BEM) (#2338) Stephen Burgess 2017-04-22 21:26:55 -0500
  • 869fae3a9e Merge 16f91633d4 into 532bec6e56 Denys Vitali 2017-04-23 02:23:59 +0000
  • 532bec6e56 Clean up flash display in views (#2336) Matt Jankowski 2017-04-22 22:22:34 -0400
  • ee82d8a876 Move force_ssl check to production config (#2165) Matt Jankowski 2017-04-22 22:22:22 -0400
  • b966ad05f5 Merge branch 'master' into feature/584-css-classnames Stephen Burgess 2017-04-22 20:42:06 -0500
  • 9ed306b874 fix(nl): do not lose translations Stephen Burgess 2017-04-22 20:41:18 -0500
  • fec5025136 fix(status__wrapper): Remove duplicate css name Stephen Burgess 2017-04-22 20:39:37 -0500
  • 9e1f68c1e5 first pass at upgrade, restart, nightly jobs Axel Anderson 2017-04-22 21:30:50 -0400
  • bfe20e9351 fix(tests): Add space back in display name Stephen Burgess 2017-04-22 20:14:56 -0500
  • 162d817add fix(permalink): Do not lose classname Stephen Burgess 2017-04-22 19:22:19 -0500
  • 1b3a47cafa OEmbed support for PreviewCard Eugen Rochko 2017-04-23 02:10:33 +0200
  • 1a24147121 Further consolidate flash messages Matt Jankowski 2017-04-22 16:00:45 -0400
  • f6b2ad80b2 Add flashes partial to DRY up admin/auth layouts Matt Jankowski 2017-04-22 15:54:37 -0400
  • 296b6f7df4 fix(classnames): Remove all non-dynamic inline styles Stephen Burgess 2017-04-22 19:04:24 -0500
  • 97e3c92845 fix(classnames): Add classnames to rest of components Stephen Burgess 2017-04-22 16:32:40 -0500
  • dbb7a05036 Merge 9340c8097d into 1646ca75f0 tom 2017-04-22 21:15:22 +0000
  • c2fab90160 Merge 07df40ce45 into 1646ca75f0 Ashley 2017-04-22 21:15:22 +0000
  • 98444703dc fix(status): Move styles from inline to classes for statuses Stephen Burgess 2017-04-22 16:07:12 -0500
  • 93b5b24eeb fix column width on mobile Axel Anderson 2017-04-22 17:06:15 -0400
  • eef712481e Merge pull request #14 from rainyday/features/br Shel Raphen 2017-04-22 16:48:26 -0400
  • 1c6e444395 Fix status whitespace Rachel 2017-04-12 16:00:25 -0700
  • 841be79351 Merge remote-tracking branch 'refs/remotes/origin/master' into tootsuite/master shel 2017-04-22 16:41:17 -0400
  • 1646ca75f0 Fix character images' sizing to make it robust (#2327) mecab 2017-04-23 05:28:54 +0900
  • 8dcc8507f0 Remove unused fonts, a defunct controller, and update .gitignore shel 2017-04-22 16:21:56 -0400
  • 03f7393982 Merge remote-tracking branch 'refs/remotes/tootsuite/master' shel 2017-04-22 16:20:05 -0400
  • 16f91633d4 Add Youtube Embed Denys Vitali 2017-04-22 21:09:34 +0200
  • 248c3d049d enable db persistance Axel Anderson 2017-04-22 15:47:33 -0400
  • 543976ece8 add custom styles file; use 25% width for columns Axel Anderson 2017-04-22 00:34:12 -0400
  • ca14946b7a Merge pull request #23 from alarky/src/v122_for_merge_to_osaka alarky 2017-04-23 04:27:45 +0900
  • da9e3ec199 Merge remote-tracking branch 'origin/osaka-master' into src/v122_for_merge_to_osaka alarky 2017-04-23 04:23:50 +0900
  • 7440e7eac2 Merge branch 'master' into features/whitespace Rachel H 2017-04-22 12:20:16 -0700
  • 4c25782023 Move force_ssl check to production config Matt Jankowski 2017-04-19 13:36:03 -0400
  • 68d85e9e0a Merge remote-tracking branch 'refs/remotes/tootsuite/master' YaQ00 2017-04-23 03:56:42 +0900
  • 020c656886 Merge branch 'master' into master YaQ00 2017-04-23 03:55:32 +0900
  • da3733ae37 tweaks myk bilokonsky 2017-04-22 20:54:07 +0200
  • a4d4d2f757 Width Fix YaQ00 2017-04-23 03:51:28 +0900
  • 079d32926b Add simple test for new controller Eugen Rochko 2017-04-22 20:44:08 +0200
  • f6e94e09a1 fix(classnames): Status icon style classnames Stephen Burgess 2017-04-22 13:42:23 -0500
  • 0133525dcf Merge pull request #22 from alarky/osaka-benize alarky 2017-04-23 03:23:14 +0900
  • f876665264 Translation emojis and sorted on alphabet (#2328) jeroenpraat 2017-04-22 20:22:46 +0200
  • 6de00925cb Merge remote-tracking branch 'origin/osaka-master' into osaka-benize alarky 2017-04-23 03:22:10 +0900
  • 80287db770 translate to Kansai-ben "localtimeline" llminatoll 2017-04-22 23:54:21 +0900
  • 0f79123734 Merge pull request #20 from llminatoll/change-wording-no-hashtag alarky 2017-04-23 03:14:46 +0900
  • 033ea7a717 Merge pull request #12 from marrus-sh/ce-max-chars Shel Raphen 2017-04-22 14:13:31 -0400
  • 8ef59d6688 Soft block in the background Eugen Rochko 2017-04-22 20:10:31 +0200
  • 462e4570a8 Revert "Add files via upload" YaQ00 2017-04-23 03:00:26 +0900
  • 5817bae2da fix can toot whitespace (#2218) ばん 2017-04-23 02:48:55 +0900
  • 9f587d4611 Authorized followers controller, stub for bulk action Eugen Rochko 2017-04-22 19:43:54 +0200
  • a74023db68 Add files via upload YaQ00 2017-04-23 02:30:47 +0900
  • 097d0fcefb Add theme setting in user preferences. chrome 2017-04-23 02:09:42 +0900
  • b0d0e9edeb Translation emojis and sorted on alphabet jeroenpraat 2017-04-22 18:46:36 +0200
  • 12263a58f5 minor tweaks myk bilokonsky 2017-04-16 16:44:39 +0200
  • 9b4b8c6d28 updated some text myk bilokonsky 2017-04-16 16:31:10 +0200
  • 89d10078a9 moar modifications myk bilokonsky 2017-04-15 17:58:08 +0200
  • 81ec75ec36 various eccentricities added myk bilokonsky 2017-04-15 17:38:41 +0200
  • e2dffe1f54 switched to custom fluffy elephant friend myk bilokonsky 2017-04-15 17:15:39 +0200
  • 12171176e8 renamed function myk bilokonsky 2017-04-11 22:08:20 +0200
  • ba536a8321 two colors was a bad idea and I apologize. myk bilokonsky 2017-04-11 22:06:36 +0200
  • bc60bb72b7 removed md5 and added sha1; playing with border/fill being different colors to augment uniqueness myk bilokonsky 2017-04-11 21:53:33 +0200
  • b3dca26d8e js-only color tweak myk bilokonsky 2017-04-11 21:12:32 +0200
  • de0c4da7f8 Fix character images' sizing to make it robust mecab 2017-04-23 00:38:13 +0900
  • 22d0047285 Merge branch 'master' into feature-private-federation Eugen 2017-04-22 17:44:07 +0200
  • 4cfc155560 Improve aria support - Columns and Navigation Drawer Icons (#2299) Stephen Burgess 2017-04-22 10:30:35 -0500
  • a1174a6d7e Add og:url tags (#2298) Wesley Ellis 2017-04-22 11:29:46 -0400
  • 5357329454 Fix TabsBar update (#2300) Akihiko Odaki 2017-04-23 00:29:02 +0900
  • 7fea36d155 Added strings for emoji category localization (#2302) Ashley 2017-04-23 03:28:36 +1200
  • 2bf7e81ed5 update emojione-picker for fixed warnings. (#2324) Keiji, Yoshimi 2017-04-23 00:28:02 +0900
  • 70b57fb559 Add a confirmation modal: - Deleting a toot - Muting, blocking someone - Clearing notifications Eugen Rochko 2017-04-21 20:42:10 +0200
  • 4adc5cc00c translate to Kansai-ben "hashtag" llminatoll 2017-04-22 23:49:24 +0900
  • b1a2f52e49 update emojione-picker for fixed warnings. Keiji Yoshimi 2017-04-22 23:29:56 +0900
  • 985f48f98b Alter Japanese translations for CW and NSFW Akihiko Odaki 2017-04-22 12:58:44 +0900
  • cdccdd7a72 fix alarky 2017-04-22 22:58:18 +0900
  • 9afbcc95ef add ad alarky 2017-04-22 22:57:27 +0900
  • ca8ae21b52 missing a var (#2320) Quent-in 2017-04-22 15:12:09 +0200
  • d0ec4fb828 refactor-cores (#2308) masarakki 2017-04-22 22:11:56 +0900
  • 4428cf6f07 Fix Japanese translation of privacy disclaimer (#2315) unarist 2017-04-22 22:10:14 +0900