| 
								
								
									 rinpatch | 6085c71bd1 | Merge branch 'reactions' into 'develop' Emoji Reactions
See merge request pleroma/pleroma!1662 | 2019-11-14 08:47:10 +00:00 |  | 
				
					
						| 
								
								
									 lain | a88e834dba | Merge branch 'develop' into 'reactions' # Conflicts:
#   CHANGELOG.md | 2019-11-10 11:32:50 +00:00 |  | 
				
					
						| 
								
								
									 Phil Hagelberg | 274cc18e8a | Visually separate header. | 2019-11-09 18:08:08 -08:00 |  | 
				
					
						| 
								
								
									 Phil Hagelberg | 1dc785b74b | Move static-fe CSS to a separate file. | 2019-11-09 18:07:50 -08:00 |  | 
				
					
						| 
								
								
									 rinpatch | 3cc2437598 | Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642 | 2019-11-09 01:49:36 +03:00 |  | 
				
					
						| 
								
								
									 lain | b22ee9d966 | Merge remote-tracking branch 'origin/develop' into reactions | 2019-11-08 13:27:11 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 9d8da9ea15 | Merge branch 'fix/migration-schema' into 'develop' Fix bookmark migration using a query with a schema
See merge request pleroma/pleroma!1923 | 2019-11-02 15:07:47 +00:00 |  | 
				
					
						| 
								
								
									 lain | e14cae25aa | Merge branch 'refactor/db-add-defaults' into 'develop' Set defaults to fields with NULL values
Closes #1358
See merge request pleroma/pleroma!1914 | 2019-10-31 13:34:57 +00:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 8bb6da7cd6 | Remove following column from the migrations | 2019-10-30 18:34:14 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | c546da7cfe | Fix bookmark migration using a query with a schema This resulted in failures when updating from Pleroma <1.0 because of all
the new fields that were added to the user schema. | 2019-10-30 12:59:14 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 40d5fb6ef8 | Add a migration to fix blocked follows | 2019-10-30 15:52:37 +07:00 |  | 
				
					
						| 
								
								
									 rinpatch | 3e09b7c5ae | Fix two migrations sharing the same module name This makes ecto execute only the latter one. | 2019-10-29 16:56:24 +03:00 |  | 
				
					
						| 
								
								
									 kPherox | 5334190056 | Migrate missing follow requests | 2019-10-29 19:22:34 +09:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 435d220700 | Move setDefaultsToTables to past to run before notNull migrations | 2019-10-28 19:17:50 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 4b0893631f | Complete defaults | 2019-10-28 19:16:19 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 3c86a0ab24 | Fix SetNotNullForUsersmigration | 2019-10-28 14:45:50 +07:00 |  | 
				
					
						| 
								
								
									 lain | 2480200759 | Merge branch 'refactor/following-relationships' into 'develop' Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814 | 2019-10-28 07:27:45 +00:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 0be9cb086b | Add migration | 2019-10-27 19:29:35 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 060adfd762 | Merge branch 'improve-user-info-migration' into 'develop' User info migration improvements
See merge request pleroma/pleroma!1887 | 2019-10-27 05:33:41 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | fbadd36cc0 | Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop' Add NOT NULL constraints for users table
See merge request pleroma/pleroma!1910 | 2019-10-27 05:32:01 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | a9cadf3905 | Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop' Add NOT NULL constraints for user_invite_tokens table
See merge request pleroma/pleroma!1909 | 2019-10-27 05:31:52 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 4a72d39ca6 | Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop' Add NOT NULL constraints for thread_mutes table
See merge request pleroma/pleroma!1908 | 2019-10-27 05:31:41 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | e94144669a | Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop' Add NOT NULL constraints for scheduled_activities table
See merge request pleroma/pleroma!1907 | 2019-10-27 05:31:31 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 9e084771c6 | Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop' Add NOT NULL constraints for registrations table
See merge request pleroma/pleroma!1906 | 2019-10-27 05:31:21 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 3ac6160299 | Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop' Add NOT NULL constraints for push_subscriptions table
See merge request pleroma/pleroma!1905 | 2019-10-27 05:31:09 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 26daaa9f04 | Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop' Add NOT NULL constraints for password_reset_tokens table
See merge request pleroma/pleroma!1904 | 2019-10-27 05:30:59 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 1fc591fcfc | Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop' Add NOT NULL constraints for objects table
See merge request pleroma/pleroma!1903 | 2019-10-27 05:30:47 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 8b204b4d71 | Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop' Add NOT NULL constraints for oauth_authorizations table
See merge request pleroma/pleroma!1902 | 2019-10-27 05:30:36 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | fe97493d91 | Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop' Add NOT NULL constraints for oauth_tokens table
See merge request pleroma/pleroma!1901 | 2019-10-27 05:30:25 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 84e992d85b | Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop' Add NOT NULL constraints for notifications table
See merge request pleroma/pleroma!1900 | 2019-10-27 05:30:09 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 19a625459b | Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop' Add NOT NULL constraints for moderation_log table
See merge request pleroma/pleroma!1899 | 2019-10-27 05:29:56 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 79702b54b6 | Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop' Add NOT NULL constraints for markers table
See merge request pleroma/pleroma!1898 | 2019-10-27 05:29:45 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 2e7e43c853 | Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop' Add NOT NULL constraints for lists table
See merge request pleroma/pleroma!1897 | 2019-10-27 05:29:33 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 75dab79183 | Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop' Add NOT NULL constraints for instances table
See merge request pleroma/pleroma!1896 | 2019-10-27 05:29:18 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 24699b991a | Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop' Add NOT NULL constraints for filters table
See merge request pleroma/pleroma!1895 | 2019-10-27 05:29:05 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 3ac8eb4046 | Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop' Add NOT NULL constraints for conversation_participations table
See merge request pleroma/pleroma!1894 | 2019-10-27 05:28:45 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 6be16b8617 | Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop' Add NOT NULL constraints for conversation_participation_recipient_ships table
See merge request pleroma/pleroma!1893 | 2019-10-27 05:28:32 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | b05fbc890e | Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop' Add NOT NULL constraints for config table
See merge request pleroma/pleroma!1892 | 2019-10-27 05:28:18 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 8785d7ba5d | Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop' Add NOT NULL constraints for bookmarks table
See merge request pleroma/pleroma!1891 | 2019-10-27 05:28:03 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 93f6f173ce | Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop' Add NOT NULL constraints for apps table
See merge request pleroma/pleroma!1890 | 2019-10-27 05:27:43 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 5cb5f9a270 | Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop' Add NOT NULL constraints for activity_expirations table
See merge request pleroma/pleroma!1889 | 2019-10-27 05:27:24 +00:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 175f6c8355 | Add migration | 2019-10-26 22:59:24 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | bdb2039453 | Add migration | 2019-10-26 22:58:37 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | f5f9197fce | Add migration | 2019-10-26 22:57:43 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 2e608f7cbf | Add migration | 2019-10-26 22:56:48 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 2810729218 | Add migration | 2019-10-26 22:55:29 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | cf72b7649e | Add migration | 2019-10-26 22:54:37 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | a4cf664385 | Add migration | 2019-10-26 22:53:41 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 776c31267f | Add migration | 2019-10-26 22:52:49 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | c0b0fb19c8 | Add migration | 2019-10-26 22:50:52 +03:00 |  |