Commits · develop · Morgan Bazalgette / pleroma

21 Apr, 2018 13 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · 26af5bad
  lain authored Apr 21, 2018
  
  26af5bad
- Formatter: Use proper escaping for links. · 0c221943
  lain authored Apr 21, 2018
  
  0c221943
- Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop' · d0b1c498
  lain authored Apr 21, 2018
```
Resolve "Enable custom panel by default and have default content"

Closes #146

See merge request !124
```
  d0b1c498
- Merge branch 'readme-update' into 'develop' · b7669c6e
  lain authored Apr 21, 2018
```
Elaborate on setup steps and CLI commands.

See merge request !126
```
  b7669c6e
- Merge branch 'nginx-certbot-doc' into 'develop' · b4b314be
  lain authored Apr 21, 2018
```
Add info about certbot with the webroot plugin to pleroma.nginx

See merge request !125
```
  b4b314be
- Update README.md · 04276f0f
  lain authored Apr 21, 2018
  
  04276f0f
- Formatting fixes. · 9e6ae447
  lain authored Apr 21, 2018
  
  9e6ae447
- add formatter · ce7618f6
  lain authored Apr 21, 2018
  
  ce7618f6
- . · 21510f69
  lain authored Apr 21, 2018
  
  21510f69
- . · 44a77897
  lain authored Apr 21, 2018
  
  44a77897
- .. · 34aab9f8
  lain authored Apr 21, 2018
  
  34aab9f8
- Update CI. · b68c4bd2
  lain authored Apr 21, 2018
  
  b68c4bd2
- Make search use id index too. · ff5e9574
  lain authored Apr 21, 2018
```
Seems to be faster in general, query planner chooses well.
```
  ff5e9574
20 Apr, 2018 6 commits
- Elaborate on setup steps and CLI commands. · caf30646
  csaurus authored Apr 20, 2018
```
* How to use MIX_ENV

* How to create a user

* Link to certbot's site with the webform which advises how to obtain
  a certificate based on web server/OS.
```
  caf30646
- Add info about certbot with the webroot plugin to pleroma.nginx · 1c6a6915
  csaurus authored Apr 20, 2018
  
  1c6a6915
- formatting · 90ad55b8
  Karen Konou authored Apr 20, 2018
  
  90ad55b8
- enable instance panel by default, added some content · b0671be2
  Karen Konou authored Apr 20, 2018
  
  b0671be2
- Formatting. · a61e8ac1
  lain authored Apr 20, 2018
  
  a61e8ac1
- Add format checking to CI. · 18c3ca78
  lain authored Apr 20, 2018
  
  18c3ca78
19 Apr, 2018 10 commits
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · 193be32f
  lain authored Apr 19, 2018
  
  193be32f
- fix again · 0b4ff1bf
  lain authored Apr 19, 2018
  
  0b4ff1bf
- Merge branch 'feature/qvitter-notification-endpoint' into 'develop' · 3f7b02e7
  lain authored Apr 19, 2018
```
TwitterAPI: Add Qvitter notification endpoint.

Closes #142

See merge request !123
```
  3f7b02e7
- TwitterAPI: Add Qvitter notification endpoint. · fa37acfc
  eal authored Apr 19, 2018
  
  fa37acfc
- Merge branch 'patch-2' into 'develop' · 678fed47
  lain authored Apr 19, 2018
```
Ignore setup_db.psql and specify a folder for custom emojis

See merge request !121
```
  678fed47
- fix again · 7b96a756
  lain authored Apr 19, 2018
  
  7b96a756
- Fix generate config · 77fc40d5
  lain authored Apr 19, 2018
  
  77fc40d5
- Ignore setup_db.psql and ignore a folder for custom emojis · 8696c25e
  Dominik V. Salonen authored Apr 19, 2018
```
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 Apr 19, 2018
```
The most common case is running it on the same server.
```
  e30a0564
- Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop' · e4da81d6
  lain authored Apr 19, 2018
```
CommonAPI post: kill \r with fire

See merge request !120
```
  e4da81d6
18 Apr, 2018 6 commits
- CommonAPI post: kill \r with fire · ee6f1552
  kaniini authored Apr 18, 2018
  
  ee6f1552
- rm_user: also ensure that cache is running. · b586ead6
  eal authored Apr 18, 2018
  
  b586ead6
- Merge branch 'fix/rm-user-task' into 'develop' · 8b5ea91f
  lain authored Apr 18, 2018
```
Fix rm_user task.

See merge request pleroma/pleroma!119
```
  8b5ea91f
- Fix rm_user task. · 4e3fc530
  eal authored Apr 18, 2018
  
  4e3fc530
- Merge branch 'fix/login-with-username-or-email' into 'develop' · a80cdd59
  lain authored Apr 18, 2018
```
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 Apr 18, 2018
  
  947431e9
17 Apr, 2018 1 commit
- update frontend · e153b364
  lain authored Apr 17, 2018
  
  e153b364
13 Apr, 2018 2 commits
- Update README.md · fef8daa4
  lain authored Apr 13, 2018
  
  fef8daa4
- Merge branch 'mix_task_rm_user' into 'develop' · 3b68eaa0
  lain authored Apr 13, 2018
```
Add rm_user mix task

See merge request pleroma/pleroma!109
```
  3b68eaa0
12 Apr, 2018 2 commits
- Switch to User.delete for rm_user task · 13a64b82
  Phenethylamine authored Apr 12, 2018
  
  13a64b82
- Add rm_user mix task · 4478b911
  Phenethylamine authored Apr 12, 2018
  
  4478b911