Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						befc519726
					 | 
					
						
						
							
							Merge branch 'master' of git.20c.com:pdb/gh-peeringdb
						
						
						
						
						
						
						
						Conflicts:
	peeringdb_server/management/commands/pdb_load_data.py 
						
						
					 | 
					
						2018-11-09 10:19:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						45a272a7a5
					 | 
					
						
						
							
							docs
						
						
						
						
						
						
					 | 
					
						2018-11-09 10:18:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						3cfa80c6bf
					 | 
					
						
						
							
							yapf it
						
						
						
						
						
						
					 | 
					
						2018-11-09 09:58:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						8706c67719
					 | 
					
						
						
							
							yapf style
						
						
						
						
						
						
					 | 
					
						2018-11-09 09:57:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						7af6adaa9f
					 | 
					
						
						
							
							Merge branch 'master' of git.20c.com:pdb/gh-peeringdb
						
						
						
						
						
						
					 | 
					
						2018-11-09 09:57:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						3399036cf5
					 | 
					
						
						
							
							docs
						
						
						
						
						
						
					 | 
					
						2018-11-09 09:57:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						e3ab24d19d
					 | 
					
						
						
							
							how to populate your test instance with initial data
						
						
						
						
						
						
					 | 
					
						2018-11-09 09:56:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						9d2ee62dd3
					 | 
					
						
						
							
							fix init.sql
						
						
						
						
						
						
					 | 
					
						2018-11-09 07:38:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						4fa98c3792
					 | 
					
						
						
							
							fix init.sql inclusion
						
						
						
						
						
						
					 | 
					
						2018-11-09 07:27:46 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						d7be56df70
					 | 
					
						
						
							
							potty mouth
						
						
						
						
						
						
					 | 
					
						2018-11-09 06:20:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						93906c82ae
					 | 
					
						
						
							
							facs can now be installed via pip
						
						
						
						
						
						
					 | 
					
						2018-11-08 19:49:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						0edf47bbfb
					 | 
					
						
						
							
							initial commit of code
						
						
						
						
						
						
					 | 
					
						2018-11-08 19:45:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						5d7c69de38
					 | 
					
						
						
							
							Merge pull request #379 from masan007/master
						
						
						
						
						
						
						
						cs_CZ localization 
						
						
					 | 
					
						2018-11-05 17:40:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masan007
							
						 
					 | 
					
						
						
							
						
						ad6153ab8d
					 | 
					
						
						
							
							Delete djangojs.mo
						
						
						
						
						
						
					 | 
					
						2018-11-05 16:27:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masan007
							
						 
					 | 
					
						
						
							
						
						6b14ae36a2
					 | 
					
						
						
							
							Delete django.mo
						
						
						
						
						
						
					 | 
					
						2018-11-05 16:27:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						561c0644ab
					 | 
					
						
						
							
							Merge pull request #382 from kalend/master
						
						
						
						
						
						
						
						Russian translation of PeeringDB 
						
						
					 | 
					
						2018-11-05 14:18:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Ilin
							
						 
					 | 
					
						
						
							
						
						068db815e3
					 | 
					
						
						
							
							Merge branch 'master' into master
						
						
						
						
						
						
					 | 
					
						2018-11-05 13:16:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Ilin
							
						 
					 | 
					
						
						
							
						
						5ddd62ee5c
					 | 
					
						
						
							
							Merge pull request #1 from kalend/Russian-translation
						
						
						
						
						
						
						
						Russian translation 
						
						
					 | 
					
						2018-11-05 12:51:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						d42c0b321c
					 | 
					
						
						
							
							add zh_TW locale base files (#372)
						
						
						
						
						
						
					 | 
					
						2018-09-19 07:52:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						16401483e1
					 | 
					
						
						
							
							fix #373: add th_TH locale
						
						
						
						
						
						
					 | 
					
						2018-09-17 08:47:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						b004ae1165
					 | 
					
						
						
							
							Merge pull request #363 from mwtr/master
						
						
						
						
						
						
						
						Please upload JP po files of second revision on beta page. 
						
						
					 | 
					
						2018-09-17 11:37:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masan007
							
						 
					 | 
					
						
						
							
						
						1c145e5cc9
					 | 
					
						
						
							
							Add files via upload
						
						
						
						
						
						
					 | 
					
						2018-09-01 12:57:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masan007
							
						 
					 | 
					
						
						
							
						
						a840a56a5b
					 | 
					
						
						
							
							Add files via upload
						
						
						
						
						
						
					 | 
					
						2018-09-01 12:48:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								masan007
							
						 
					 | 
					
						
						
							
						
						b122685854
					 | 
					
						
						
							
							Add files via upload
						
						
						
						
						
						
					 | 
					
						2018-09-01 12:47:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						2f2e7acca0
					 | 
					
						
						
							
							fix #364: generate ro_RO locale
						
						
						
						
						
						
					 | 
					
						2018-08-28 20:35:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Masataka MAWATARI
							
						 
					 | 
					
						
						
							
						
						eb2db53ac4
					 | 
					
						
						
							
							second revision after beta publishing
						
						
						
						
						
						
					 | 
					
						2018-08-19 14:01:55 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Masataka MAWATARI
							
						 
					 | 
					
						
						
							
						
						a5ee534e66
					 | 
					
						
						
							
							first revision after uploading po files on beta peeringdb website.
						
						
						
						
						
						
					 | 
					
						2018-08-12 14:30:40 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						a2e73a66c8
					 | 
					
						
						
							
							fix typo in greek locale
						
						
						
						
						
						
					 | 
					
						2018-08-03 17:15:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						43e1c68a86
					 | 
					
						
						
							
							fix ja_JP locale issues
						
						
						
						
						
						
					 | 
					
						2018-08-03 07:58:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						71e194664c
					 | 
					
						
						
							
							fix el_GR locale issues
						
						
						
						
						
						
					 | 
					
						2018-08-03 07:57:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						419cedee11
					 | 
					
						
						
							
							fix typo 'gatehered' to 'gathered' (#259)
						
						
						
						
						
						
					 | 
					
						2018-07-25 10:30:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						b5bbfe0d70
					 | 
					
						
						
							
							Merge pull request #347 from peeringdb/spanish
						
						
						
						
						
						
						
						Add Spanish 
						
						
					 | 
					
						2018-07-17 11:11:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						3e3bf84e11
					 | 
					
						
						
							
							Merge pull request #345 from mwtr/master
						
						
						
						
						
						
						
						Completed to translate django.po to Japanese 
						
						
					 | 
					
						2018-07-17 11:11:01 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						a3303f3c12
					 | 
					
						
						
							
							remove dupe german locale file
						
						
						
						
						
						
					 | 
					
						2018-07-17 08:07:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						5c538db67f
					 | 
					
						
						
							
							Merge pull request #350 from funkestefan/master
						
						
						
						
						
						
						
						German translation (de_DE) 
						
						
					 | 
					
						2018-07-17 11:07:31 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Funke
							
						 
					 | 
					
						
						
							
						
						d8ffc75f90
					 | 
					
						
						
							
							proofreading, filling in missing parts
						
						
						
						
						
						
					 | 
					
						2018-07-02 20:49:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Funke
							
						 
					 | 
					
						
						
							
						
						d0783639d7
					 | 
					
						
						
							
							CACSA
						
						
						
						
						
						
					 | 
					
						2018-07-01 14:33:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Funke
							
						 
					 | 
					
						
						
							
						
						e68250a9a1
					 | 
					
						
						
							
							ready for review
						
						
						
						
						
						
					 | 
					
						2018-07-01 09:01:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Funke
							
						 
					 | 
					
						
						
							
						
						7abea55604
					 | 
					
						
						
							
							DOXSI #2
						
						
						
						
						
						
					 | 
					
						2018-07-01 09:00:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Funke
							
						 
					 | 
					
						
						
							
						
						91ba014a9e
					 | 
					
						
						
							
							DOXSI
						
						
						
						
						
						
					 | 
					
						2018-07-01 07:57:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Ilin
							
						 
					 | 
					
						
						
							
						
						1db07da2a1
					 | 
					
						
						
							
							Update djangojs.po
						
						
						
						
						
						
					 | 
					
						2018-06-27 22:46:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Ilin
							
						 
					 | 
					
						
						
							
						
						e27972e3ba
					 | 
					
						
						
							
							Update django.po
						
						
						
						
						
						
					 | 
					
						2018-06-27 22:42:13 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Funke
							
						 
					 | 
					
						
						
							
						
						e320e89b3c
					 | 
					
						
						
							
							authors update, lots of work from Sara
						
						
						
						
						
						
					 | 
					
						2018-06-25 20:06:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Funke
							
						 
					 | 
					
						
						
							
						
						a7ad6b6b92
					 | 
					
						
						
							
							authors update, lots of work from Sara
						
						
						
						
						
						
					 | 
					
						2018-06-25 20:06:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Funke
							
						 
					 | 
					
						
						
							
						
						3fffdf8528
					 | 
					
						
						
							
							Merge pull request #3 from arnoldnipper/master
						
						
						
						
						
						
						
						Add files via upload 
						
						
					 | 
					
						2018-06-25 19:48:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arnold Nipper
							
						 
					 | 
					
						
						
							
						
						dc7aa5ce6b
					 | 
					
						
						
							
							Add files via upload
						
						
						
						
						
						
					 | 
					
						2018-06-25 19:24:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Funke
							
						 
					 | 
					
						
						
							
						
						9ce12d0e54
					 | 
					
						
						
							
							Merge pull request #2 from finksv/master
						
						
						
						
						
						
						
						Lines 1865 - 2009 + 2154 - End 
						
						
					 | 
					
						2018-06-25 07:00:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Funke
							
						 
					 | 
					
						
						
							
						
						242a0abbc4
					 | 
					
						
						
							
							Merge branch 'master' into master
						
						
						
						
						
						
					 | 
					
						2018-06-25 06:59:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						d2604f0fba
					 | 
					
						
						
							
							fix #348: should be cs_CZ not cz_CZ
						
						
						
						
						
						
					 | 
					
						2018-06-22 06:01:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stefan Pratter
							
						 
					 | 
					
						
						
							
						
						9a6150458c
					 | 
					
						
						
							
							fix #348: init cz_CZ locale
						
						
						
						
						
						
					 | 
					
						2018-06-22 06:00:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |