| 
								
								
									 Ivan Tashkinov | 15ce710460 | Added "GET /oauth/authorize" tests. | 2019-04-02 13:43:33 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 11c2d6bdc4 | change Repo.get(Activity, id)=>Activity.get_by_id(id)in tests | 2019-04-02 17:08:03 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 1b3d921921 | change Repo.get(User, id)=>User.get_by_id(id) | 2019-04-02 17:01:26 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 4212527928 | change Repo.get(Activity, id)=>Activity.get_by_id(id) | 2019-04-02 16:50:31 +07:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 3db9235150 | Ignore dates in wrong formats | 2019-04-02 11:32:36 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | a14742f495 | add user delete_activitiesmix task | 2019-04-02 16:30:11 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | 484162c187 | test fix | 2019-04-02 16:26:40 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | 08d64b977f | little changes and typos | 2019-04-02 16:13:34 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | 851c5bf093 | updating custom_emoji docs | 2019-04-02 15:57:57 +07:00 |  | 
				
					
						| 
								
								
									 lambda | 9305e241cb | Merge branch 'ci-speedup-2-electric-boogalo' into 'develop' CI speedup: split into proper stages to benefit from parallel execution
See merge request pleroma/pleroma!1007 | 2019-04-02 08:50:47 +00:00 |  | 
				
					
						| 
								
								
									 Alex S | 9b2188da7c | refactoring of emoji tags config to use groups | 2019-04-02 15:44:56 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | a1869f5272 | Merge remote-tracking branch 'pleroma/develop' into remove-user-activities | 2019-04-02 15:41:30 +07:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | f20e8d28de | add support for all status type (ostatus) and replase case with if | 2019-04-02 12:18:00 +05:45 |  | 
				
					
						| 
								
								
									 rinpatch | 8c71ea5a1a | remove reduntant services in docs deploy and change job names to kebab case | 2019-04-02 09:13:34 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5ee54d8183 | what the fuck | 2019-04-02 09:07:58 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 7827b929fc | huh | 2019-04-02 09:02:21 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 4861558b93 | Separate CI jobs to 3 stages to allow them to be executed in parallel | 2019-04-02 08:58:09 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | f8aa917eef | Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop' router: Add fake identity proof endpoint
See merge request pleroma/pleroma!1006 | 2019-04-02 05:31:41 +00:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 6386c1c9c1 | fetch url for OStatus to know if it is a/c or status | 2019-04-02 10:26:09 +05:45 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | f56eef8d8c | router: Add fake identity proof endpoint | 2019-04-02 01:53:38 +02:00 |  | 
				
					
						| 
								
								
									 lambda | fd7dd8f9a2 | Merge branch 'fix/default-mail-adapter' into 'develop' Add default mail adapter settings to config
See merge request pleroma/pleroma!994 | 2019-04-01 21:47:40 +00:00 |  | 
				
					
						| 
								
								
									 lambda | fc2bef5ac3 | Merge branch 'documentation-improvements' into 'develop' Small documentation improvements
See merge request pleroma/pleroma!1001 | 2019-04-01 21:20:11 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | b6f9f7b8aa | Handle dates in the Unix timestamp format (Fixes #763) | 2019-04-01 22:45:24 +02:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 1d01e8e656 | [OStatus] adds status to pleroma instance if the url given is a status | 2019-04-01 22:26:58 +05:45 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 66e7d4966d | COPYING: Wording [ci skip] | 2019-04-01 18:34:53 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5373077501 | update mastodon api link in README to point to a non-outdated docs | 2019-04-01 19:27:40 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | d976cc5df7 | Merge branch 'update-readme' into 'develop' Fix dead links in README.md and add note about new docs site
See merge request pleroma/pleroma!1000 | 2019-04-01 16:25:02 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | e2b94d8f33 | Make only important note bold rather than the whole paragraph because it looks better that way | 2019-04-01 19:24:50 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | a309b49c2d | Remove outdated howto change config and port and move it to config.md instead | 2019-04-01 19:19:06 +03:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 41f02e87a1 | Link to docs page instead of to clients.md | 2019-04-01 18:13:42 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 715a31c1ed | COPYING: wrap to 79, city.jpg Unsplash, wording [ci skip] | 2019-04-01 18:13:13 +02:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 3c9abf5dee | Fix dead links and add note about new docs site | 2019-04-01 18:02:58 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 6910fb371b | Fixed local MastoFE authentication / force_loginoption. | 2019-04-01 17:25:25 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 949cfde065 | restart makes no sense here as we instructed to stop the service before | 2019-04-01 16:26:46 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | bff8cde0cf | Instruct to stop the service only after git pulling and getting deps to minimize downtimes | 2019-04-01 16:23:32 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 7c69c6f624 | change bold text to be proper geadings in introduction.md | 2019-04-01 16:22:12 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | b46e6f0949 | Fix backup/restore page to have proper headings | 2019-04-01 16:10:47 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | cbe09d94d1 | Added force_loginauthentication option (previously applied by default). | 2019-04-01 14:46:50 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | 49733f6176 | add docs folder to gitignore ref #770 | 2019-04-01 18:28:19 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | 17d3d05a71 | code style little fix | 2019-04-01 17:54:30 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | 3601f03147 | Adding tag to emoji ets table changes in apis | 2019-04-01 17:17:57 +07:00 |  | 
				
					
						| 
								
								
									 rinpatch | fe5145eeaa | Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex | 2019-04-01 12:25:53 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 975482f091 | insert object defaults for fake activities and make credo happy | 2019-04-01 12:16:51 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | d866b59eea | oof | 2019-04-01 11:58:08 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 45ba10bf47 | Fix the issue with HTML scrubber | 2019-04-01 11:55:59 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 804173fc92 | [#923] Minor code readability fix. | 2019-04-01 09:45:44 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | eadafc88b8 | [#923] Deps config adjustment (no overrideforhttpoison), code analysis issues fixes. | 2019-04-01 09:28:56 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | baffdcc480 | [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth # Conflicts:
#	mix.exs | 2019-04-01 08:49:32 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 0bab2661ae | COPYING: Add copyright notice for the finmojis [ci skip] | 2019-04-01 02:15:14 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | d5a1e08bf1 | Add default mail adapter settings to config | 2019-03-31 17:46:17 -05:00 |  |