| 
								
								
									 lain | 72945b5b32 | update frontend | 2018-12-13 21:04:39 +01:00 |  | 
				
					
						| 
								
								
									 lain | 8682be29a5 | update frontend | 2018-12-10 20:46:10 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 94d8f1ab30 | Merge branch '394_user_tags' into 'develop' [#394] User tags
Closes #394
See merge request pleroma/pleroma!508 | 2018-12-07 18:25:38 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 7b19487389 | [#394] Added users.tagsand admin routes to tag and untag users. Added tests. | 2018-12-06 20:06:50 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 4944498133 | Merge branch 'develop' into feature/compat/push-subscriptions # Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex | 2018-12-06 20:15:16 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 8b4397c704 | Merge branch 'develop' into feature/compat/push-subscriptions # Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock | 2018-12-06 19:55:58 +07:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | a7b1a66be3 | update-pleroma-frontend | 2018-12-03 13:24:25 +09:00 |  | 
				
					
						| 
								
								
									 lain | 4996fb07d8 | Genereate uuids for existing info fields. | 2018-12-01 12:00:33 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | db8f269cd3 | update pleroma frontend | 2018-11-18 17:27:48 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2a75de84e1 | update pleroma frontend | 2018-11-14 16:08:22 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 934125695d | Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld | 2018-11-08 20:21:45 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 705bfe39e9 | priv/static/litepub-1.0.jsonld: Local copy of https://litepub.github.io/litepub/context.jsonld | 2018-11-08 19:35:23 +01:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | 72a880431f | update pleroma frontend | 2018-10-26 23:35:06 +09:00 |  | 
				
					
						| 
								
								
									 scarlett | 7cb227dc62 | update pleroma-fe | 2018-10-23 12:16:49 +01:00 |  | 
				
					
						| 
								
								
									 scarlett | f6dda65dda | update pleroma-fe | 2018-10-23 12:15:48 +01:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | be7bb90bef | update-pleroma-frontend | 2018-10-07 09:58:08 +09:00 |  | 
				
					
						| 
								
								
									 William Pitcock | bb213a85c5 | update pleroma frontend | 2018-09-22 05:08:15 +00:00 |  | 
				
					
						| 
								
								
									 Martin Kühl | d94ee5cd50 | Mastodon API: Support push subscription CRUD | 2018-09-22 07:04:01 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c9f6eb9a41 | user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task) | 2018-09-20 23:50:56 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 83e3afac2c | Update mastodon frontend | 2018-09-20 16:13:13 +00:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | f829b18273 | update-pleroma-frontend | 2018-09-14 10:47:10 +09:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e5546c282f | update pleroma frontend | 2018-09-09 12:14:34 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 76c67a41c1 | Merge branch 'develop' into 'feature/staff-discovery-api' # Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 2018-09-03 14:55:42 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 1c9e539b47 | Merge branch 'feature/mastodon_api_2.4.x' into 'develop' Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266 | 2018-09-03 12:33:36 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | cf5d1302aa | migrations: add is_moderator index for users table | 2018-09-03 11:55:12 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2b4b4888a9 | update pleroma frontend | 2018-08-31 04:35:18 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1a70d41f8e | migrations: add index creation migration and recipients_to/cc removal migration | 2018-08-29 18:41:02 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 038139d641 | migrations: drop filler migration | 2018-08-29 18:41:02 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 40ea07cd2f | migrations: add migration to fill in recipients_to/recipients_cc fields | 2018-08-29 08:43:24 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 81673b8136 | activity: add recipients_to and recipients_cc fields | 2018-08-29 08:42:33 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 6e030129fb | [MastodonAPI] Add filters | 2018-08-27 15:09:05 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 5ffaa2bf69 | Revert "enable scope options and such" This reverts commit e5642d7566. | 2018-08-27 10:49:12 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e5642d7566 | enable scope options and such | 2018-08-27 10:46:01 +00:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | ce8c7e77a1 | update pleroma frontend | 2018-08-26 21:08:03 +09:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 47661ce44b | update pleroma frontend | 2018-08-24 21:59:57 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | d8fb340565 | update pleroma frontend | 2018-08-20 18:10:29 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 7a11ea1ceb | update pleroma frontend | 2018-08-20 04:45:34 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | d8bb27970b | update pleroma frontend | 2018-08-18 18:19:11 +00:00 |  | 
				
					
						| 
								
								
									 lain | 701f5df45c | update frontend | 2018-08-12 18:16:19 +02:00 |  | 
				
					
						| 
								
								
									 lain | 4a612b8c1b | Update Mastofe. | 2018-08-12 18:02:43 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 13440a80e1 | Merge branch 'feature/invites' into 'develop' Invites
Closes #108
See merge request pleroma/pleroma!208 | 2018-08-12 12:04:15 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 4f589998ee | activitypub: support filtering activities by whether or not they are a reply (closes #109) | 2018-06-18 03:21:32 +00:00 |  | 
				
					
						| 
								
								
									 lain | ddc654d587 | update frontend | 2018-06-12 19:38:25 +02:00 |  | 
				
					
						| 
								
								
									 Artik Banana | 991b8a6b9d | Replace avi.png with the Pleroma logo | 2018-06-12 11:55:38 +00:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | f42ffbe9a8 | Initial invites support + tests. | 2018-06-12 14:55:16 +03:00 |  | 
				
					
						| 
								
								
									 lambda | 564c73ab24 | Merge branch 'feature/list-streaming' into 'develop' MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183 | 2018-06-12 07:19:45 +00:00 |  | 
				
					
						| 
								
								
									 eal | 29c9c8d93b | Extract host from ap_id, add index | 2018-06-06 21:13:40 +03:00 |  | 
				
					
						| 
								
								
									 lain | 9d054d30bc | Revert "Update Mastofe." This reverts commit 726b131b0a.
Some things broke (threads). | 2018-06-02 19:45:23 +02:00 |  | 
				
					
						| 
								
								
									 lain | 726b131b0a | Update Mastofe. | 2018-06-02 16:11:38 +02:00 |  | 
				
					
						| 
								
								
									 eal | 5d3fdbc082 | MastoAPI: Add streaming for lists. | 2018-05-30 16:48:59 +03:00 |  |