Commit Graph

  • d4fe6cd2bf Allow users to update their Account in the API (#1179) David Celis 2017-04-09 09:33:40 -0700
  • 4246583623
    Add /api/v1/accounts/update_credentials to the API docs David Celis 2017-04-09 09:28:41 -0700
  • 05f3311494
    Allow users to update their Account in the API David Celis 2017-04-07 11:12:11 -0700
  • 0bc2a82f2f Revert default site description, expand comment Ryan Tucker 2017-04-09 12:20:02 -0400
  • d309ffd918 Merge branch 'master' of https://github.com/tootsuite/mastodon Luclu7 2017-04-09 17:53:57 +0200
  • 472f3930b8 db Luclu7 2017-04-09 17:53:53 +0200
  • 65040df996 Minor change on API.md Ornithologist Coder 2017-04-09 17:39:35 +0200
  • ba308bec3d Minor API.md changes Ornithologist Coder 2017-04-09 17:31:30 +0200
  • 57dfeb1b0e added certbot renew --dry-run test myk bilokonsky 2017-04-09 17:18:55 +0200
  • ea6c930c04 Helper cleanup (#1348) Matt Jankowski 2017-04-09 11:11:37 -0400
  • 10734a52d8 Merge 488a36c6cc into 12e29c9660 tom 2017-04-09 15:00:44 +0000
  • c8b1408439 integrating feedback myk bilokonsky 2017-04-09 16:59:49 +0200
  • fd956e3eb2 I18n.default_locale fallback when there is no accept-language header awea 2017-04-09 16:38:14 +0200
  • 6228f0ee71 Merge branch 'master' of https://github.com/tootsuite/mastodon Carlos Escobar 2017-04-09 09:35:17 -0500
  • 7ff13d9d5c Add coverage for StreamEntriesHelper #display_name Matt Jankowski 2017-04-09 10:33:31 -0400
  • 329a1c17bd enable to scroll the setting's page sidebar 857b 2017-04-09 16:30:11 +0200
  • 5a5ef528a3 Add coverage for application helper Matt Jankowski 2017-04-09 10:28:03 -0400
  • f29244b1f8
    Addresses feedback from #1345. Ash Furrow 2017-04-09 10:26:52 -0400
  • fae10f6c3f Remove unused helper files Matt Jankowski 2017-04-09 10:23:35 -0400
  • 8d04be7538 removed spurious netdata config from vanilla nginx config myk bilokonsky 2017-04-09 16:23:28 +0200
  • 14383ad05d removed words like "just" and "simple" myk bilokonsky 2017-04-09 16:22:10 +0200
  • 4bedeeb9df removing experimental copy change myk bilokonsky 2017-04-09 16:18:40 +0200
  • 6a61020070 spacing fix myk bilokonsky 2017-04-09 16:16:34 +0200
  • 2f760cc4b6 fixed formatting myk bilokonsky 2017-04-09 16:15:11 +0200
  • 6c97c5e3d8 updated production guide myk bilokonsky 2017-04-09 16:13:42 +0200
  • 95f90a2988 testing updating copy. myk bilokonsky 2017-04-06 18:53:33 +0200
  • 985badc7db
    Adds more documentation for Heroku deploys. Ash Furrow 2017-04-09 09:41:50 -0400
  • 2c861247df Fix #1339 - better Atom titles Eugen Rochko 2017-04-09 15:12:04 +0200
  • 89b132d90a Get handle from atom feed's author/email field instead of guessing from URL Thibaut Girka 2017-04-09 15:05:41 +0200
  • 47910f57da Merge branch 'master' into skylight Eugen Rochko 2017-04-09 15:01:17 +0200
  • 12e29c9660 Update fr.jsx (#1329) StefOfficiel 2017-04-09 14:58:08 +0200
  • d45a2655a7 Remove duplicate translation Eugen 2017-04-09 14:57:56 +0200
  • 1555a138f0 Merge branch 'master' into patch-3 Eugen 2017-04-09 14:56:18 +0200
  • 082bef3027 French translation update (#1271) Olivier Humbert 2017-04-09 14:55:58 +0200
  • f254de0b4d Merge branch 'master' into patch-1 Eugen 2017-04-09 14:55:44 +0200
  • e6b48a7048 French typo (#1257) spf 2017-04-09 14:54:47 +0200
  • ba2aea3a80 add empty notifications french translation (#1111) Jonathan Klee 2017-04-09 14:54:02 +0200
  • c55be673d2 Merge branch 'master' into master Eugen 2017-04-09 14:48:45 +0200
  • e5282e4ec0 Clean up about page (#1282) Matt Jankowski 2017-04-09 08:47:25 -0400
  • 53eb31f124 Fixes #1311 margin shouldn't stay fixed (#1312) Brian Mock 2017-04-09 05:45:26 -0700
  • 388ec0d5b6 Search cleanup (#1333) Matt Jankowski 2017-04-09 08:45:01 -0400
  • 71706f21c2 Ignore implied formats for catch all route requests (#1340) Matt Jankowski 2017-04-09 08:39:41 -0400
  • 8a6222764d Exclude notification types in web UI through exclude_types in the API Eugen Rochko 2017-04-09 14:24:48 +0200
  • c227f48630 WIP #1337 Support JRuby Fabian Pfaff 2017-04-09 13:59:13 +0200
  • e86246fee6 Ignore implied formats for catch all route requests Matt Jankowski 2017-04-09 08:15:26 -0400
  • 0d12a77c13 Add exclude_types param to /api/v1/notifications Eugen Rochko 2017-04-09 13:52:24 +0200
  • 4e19d54e66 add timeout to report admin Lynn Cyrin 2017-04-09 04:50:00 -0700
  • 3946128c63 fix copy paste typo Lynn Cyrin 2017-04-09 04:49:53 -0700
  • 696e108cfc add timeout button styling Lynn Cyrin 2017-04-09 04:41:52 -0700
  • 8ac798f875 rubocop Lynn Cyrin 2017-04-09 04:37:58 -0700
  • 0259eeec0f Update fr.jsx StefOfficiel 2017-04-09 13:30:39 +0200
  • adccc68085 Add coverage for Account.advanced_search_for Matt Jankowski 2017-04-08 20:50:50 -0400
  • 5d0586b41f Add coverage for Account.search_for Matt Jankowski 2017-04-08 20:27:39 -0400
  • 39eb8b5e2f Add basic coverage for Tag.search_for Matt Jankowski 2017-04-08 20:13:07 -0400
  • 7d1be87061 Clean up SQL output in Tag and Account search methods Matt Jankowski 2017-04-08 20:08:04 -0400
  • 0732257828 Clean up about controller, use instance presenter Matt Jankowski 2017-04-08 17:54:02 -0400
  • bc912813c6 Add InstancePresenter to expose site details Matt Jankowski 2017-04-08 17:53:30 -0400
  • 92e941ac72 create timeout frontend Lynn Cyrin 2017-04-09 04:05:04 -0700
  • 8071175da7 1 MastodonRussia 2017-04-09 13:41:03 +0300
  • 016061866f 1 MastodonRussia 2017-04-09 13:35:04 +0300
  • 675a286fd2 Do not store last visited URL from API controllers Eugen Rochko 2017-04-09 12:34:02 +0200
  • 1a7c65be6f timed_silence => timeout Lynn Cyrin 2017-04-09 03:26:40 -0700
  • a6b5caf9df add timed silence routes Lynn Cyrin 2017-04-09 02:34:51 -0700
  • 39b4cf7ba1 add timed silence controller actions Lynn Cyrin 2017-04-09 02:34:34 -0700
  • a48730ee96 fix boolean issue Lynn Cyrin 2017-04-09 02:34:06 -0700
  • 6dc059d61a add unsilence worker Lynn Cyrin 2017-04-09 02:33:10 -0700
  • a83be2a413 1 MastodonRussia 2017-04-09 13:29:47 +0300
  • fa5e12e166 Update fr.jsx StefOfficiel 2017-04-09 12:27:44 +0200
  • a6f5dccafa 1 MastodonRussia 2017-04-09 13:25:43 +0300
  • 15dead9a03 1 MastodonRussia 2017-04-09 13:22:24 +0300
  • 68989f9da4 Merge 9e57c67ce2 into b1881a3d48 Alex Dunn 2017-04-09 10:21:44 +0000
  • f5f18e9aa8 1 MastodonRussia 2017-04-09 13:18:41 +0300
  • fadb09832e 1 MastodonRussia 2017-04-09 13:15:44 +0300
  • 6dc37aa400 1 MastodonRussia 2017-04-09 13:11:47 +0300
  • 8fd6695d8d Merge remote-tracking branch 'refs/remotes/tootsuite/master' into RussianLanguage MastodonRussia 2017-04-09 13:08:37 +0300
  • adc5907844 Update components.scss StefOfficiel 2017-04-09 11:47:24 +0200
  • 10d9a8c1ac Merge remote-tracking branch 'origin/RussianLanguage' into RussianLanguage MastodonRussia 2017-04-09 12:36:50 +0300
  • 4b2e052b81 Add Russian translation MastodonRussia 2017-04-09 11:58:50 +0300
  • b1881a3d48 Fix nonworking clear notices button (#1316) Rachel H 2017-04-09 02:35:23 -0700
  • ebb5dd13c8 Add Russian translation MastodonRussia 2017-04-09 12:27:41 +0300
  • 44d47fec23 Add Russian translation MastodonRussia 2017-04-09 11:58:50 +0300
  • a3d236702e Merge branch 'master' into master Valentin Ouvrard 2017-04-09 19:30:12 +1100
  • e1efcea9f4 readd root /home/mastodon/live/public; Valentin Ouvrard 2017-04-09 19:29:47 +1100
  • 810269b0ea Update List-of-Mastodon-instances.md MastodonRussia 2017-04-09 11:19:14 +0300
  • 9848f1820c Datetime french translation SansPseudoFix 2017-04-08 14:08:42 +0200
  • b5010d8501 French typo SansPseudoFix 2017-04-08 14:07:00 +0200
  • 07b318d737 Merge remote-tracking branch 'refs/remotes/tootsuite/master' Savarice 2017-04-09 03:05:31 -0400
  • b9f757d94c Add Russian translation MastodonRussia 2017-04-09 08:54:42 +0300
  • baa3100c6b Add Russian translation MastodonRussia 2017-04-09 08:44:08 +0300
  • 86ead64d85 Update List-of-Mastodon-instances.md zaclys 2017-04-09 07:26:47 +0200
  • 65b4d9cd1f Fix nonworking clear notices button Rachel 2017-04-08 22:17:12 -0700
  • 2a611aa318 Update List-of-Mastodon-instances.md zaclys 2017-04-09 06:50:59 +0200
  • e29a60e2e0 code climate Ben Roberts 2017-04-09 00:22:10 -0400
  • 55b3390980 trying to pass code climate tests Ben Roberts 2017-04-09 00:19:50 -0400
  • fe41c810e7 Merge remote-tracking branch 'upstream/master' Ben Roberts 2017-04-09 00:18:28 -0400
  • d5a675099a Add env variable to disable prepared statements (#1293) Eugen 2017-04-09 05:46:32 +0200
  • 933d143baa Sidekiq listens single stack on 127.0.0.1. The nginx config in the Mastodon documentation proxy passes to sidekiq with the hostname localhost, which resolves dual stack to 127.0.0.1 and ::1. staticsafe 2017-04-09 03:07:00 +0000
  • 392d0b5002 Revert "Add build-essential to dependencies list." staticsafe 2017-04-09 03:04:33 +0000
  • b455f0cf19 Fixes #1311 margin shouldn't stay fixed Brian Mock 2017-04-08 19:29:26 -0700
  • 6fe231d718 link to the better guide Edward Vielmetti 2017-04-08 21:51:42 -0400