Commits · 21510f6990e300117f68c5cfdfb0d4b2c7cedd18 · jeff / pleroma

Apr 21, 2018
- . · 21510f69
  lain authored 6 years ago
  
  21510f69
- . · 44a77897
  lain authored 6 years ago
  
  44a77897
- .. · 34aab9f8
  lain authored 6 years ago
  
  34aab9f8
- Update CI. · b68c4bd2
  lain authored 6 years ago
  
  b68c4bd2
- Make search use id index too. · ff5e9574
  lain authored 6 years ago
  
  Seems to be faster in general, query planner chooses well.
  ff5e9574
Apr 20, 2018
- Formatting. · a61e8ac1
  lain authored 6 years ago
  
  a61e8ac1
- Add format checking to CI. · 18c3ca78
  lain authored 6 years ago
  
  18c3ca78
Apr 19, 2018
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · 193be32f
  lain authored 6 years ago
  
  193be32f
- fix again · 0b4ff1bf
  lain authored 6 years ago
  
  0b4ff1bf
- Merge branch 'feature/qvitter-notification-endpoint' into 'develop' · 3f7b02e7
  lain authored 6 years ago
  
  TwitterAPI: Add Qvitter notification endpoint. Closes #142 See merge request pleroma/pleroma!123
  3f7b02e7
- TwitterAPI: Add Qvitter notification endpoint. · fa37acfc
  eal authored 6 years ago
  
  fa37acfc
- Merge branch 'patch-2' into 'develop' · 678fed47
  lain authored 6 years ago
  
  Ignore setup_db.psql and specify a folder for custom emojis See merge request pleroma/pleroma!121
  678fed47
- fix again · 7b96a756
  lain authored 6 years ago
  
  7b96a756
- Fix generate config · 77fc40d5
  lain authored 6 years ago
  
  77fc40d5
- Ignore setup_db.psql and ignore a folder for custom emojis · 8696c25e
  Dominik V. Salonen authored 6 years ago
  
  Wiki page should also be updated to recommend that admins put their custom emojis in /priv/static/emoji/custom/. This both makes for less hassle when doing a pull. And also prevents more mess in the /priv/static/emoji/ folder.
  8696c25e
- Revert "Ask for proxy URL if proxy enabled." · e30a0564
  eal authored 6 years ago
  
  The most common case is running it on the same server.
  e30a0564
- Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop' · e4da81d6
  lain authored 6 years ago
  
  CommonAPI post: kill \r with fire See merge request pleroma/pleroma!120
  e4da81d6
Apr 18, 2018
- CommonAPI post: kill \r with fire · ee6f1552
  kaniini authored 6 years ago
  
  ee6f1552
- rm_user: also ensure that cache is running. · b586ead6
  eal authored 6 years ago
  
  b586ead6
- Merge branch 'fix/rm-user-task' into 'develop' · 8b5ea91f
  lain authored 6 years ago
  
  Fix rm_user task. See merge request pleroma/pleroma!119
  8b5ea91f
- Fix rm_user task. · 4e3fc530
  eal authored 6 years ago
  
  4e3fc530
- Merge branch 'fix/login-with-username-or-email' into 'develop' · a80cdd59
  lain authored 6 years ago
  
  MastoAPI and OAuth: allow login with either email or username. See merge request pleroma/pleroma!118
  a80cdd59
- MastoAPI and OAuth: allow login with either email or username. · 947431e9
  eal authored 6 years ago
  
  947431e9
Apr 17, 2018
- update frontend · e153b364
  lain authored 6 years ago
  
  e153b364
Apr 13, 2018
- Update README.md · fef8daa4
  lain authored 6 years ago
  
  fef8daa4
- Merge branch 'mix_task_rm_user' into 'develop' · 3b68eaa0
  lain authored 6 years ago
  
  Add rm_user mix task See merge request pleroma/pleroma!109
  3b68eaa0
Apr 12, 2018
- Switch to User.delete for rm_user task · 13a64b82
  Phenethylamine authored 6 years ago
  
  13a64b82
- Add rm_user mix task · 4478b911
  Phenethylamine authored 7 years ago
  
  4478b911
Apr 11, 2018
- Merge branch 'develop' into 'develop' · 3d636cf5
  lain authored 7 years ago
  
  Fix issue #124 Closes #124 See merge request pleroma/pleroma!108
  3d636cf5
- update frontend · 5612716c
  lain authored 7 years ago
  
  5612716c
- update frontend · a8dddd92
  lain authored 7 years ago
  
  a8dddd92
- Oops · 2de2e29d
  Gian Sass authored 7 years ago
  
  2de2e29d
- Add unit test for pinned statuses · 3a5c0465
  Gian Sass authored 7 years ago
  
  3a5c0465
- Fix issue #124 · 907df9b8
  Gian Sass authored 7 years ago
  
  907df9b8
- Merge branch 'feld-hackneyupdate' into 'develop' · faa0feb0
  lain authored 7 years ago
  
  Update httpoison to get the latest hackney. See merge request pleroma/pleroma!107
  faa0feb0
- Update httpoison to get the latest hackney. · 366138fa
  feld authored 7 years ago
  
  Works on my computer ^TM
  366138fa
Apr 10, 2018
- Fix register_user task. · b910483c
  lain authored 7 years ago
  
  b910483c
- Order masto searches by date. · 1dd2c816
  lain authored 7 years ago
  
  1dd2c816
- Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop' · d7654f4b
  lain authored 7 years ago
  
  Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec See merge request pleroma/pleroma!104
  d7654f4b
- Merge branch 'feld-varnish' into 'develop' · 6ff583e5
  lain authored 7 years ago
  
  Remove attempted caching of toots See merge request pleroma/pleroma!106
  6ff583e5