| 
								
								
									 Thomas Willingham | 1a5d4f91cd | Diabook red.  All that's left to do now is...all sorts of other things. | 2012-11-18 23:30:48 +00:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | f644cbb30b | Diabook pink | 2012-11-18 22:52:44 +00:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | a7982caf71 | Diabook - should probably add *all* the files... | 2012-11-18 22:06:53 +00:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | 96633cb0e5 | Diabook - kill thousands more lines.  Two more to go then we can start on the bugs... | 2012-11-18 22:06:02 +00:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | 589f3603ae | Diabook - grep replace missed this | 2012-11-18 21:27:02 +00:00 |  | 
				
					
						|  | f9fbab948e | ZH-CN: initial pieces of the Chinese (China) translation. Thx to matthew_exon | 2012-11-18 20:10:05 +01:00 |  | 
				
					
						| 
								
								
									 friendica | 50e45f6942 | Merge pull request #536 from annando/master "vier", caching, reshared items from diaspora and title in the api | 2012-11-17 13:32:26 -08:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | 5dbf89be88 | Making the new reshare method optional | 2012-11-17 16:27:49 +01:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | c0376339e0 | Merge remote-tracking branch 'upstream/master' | 2012-11-17 14:29:09 +01:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | 25b4ec32c7 | Clean up code - removed useless cache code | 2012-11-17 14:27:30 +01:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | f17377e6de | New cache system with subdirectories | 2012-11-17 00:50:39 +01:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | 3f9eef1ef6 | Diabook - some more heavy lifting. | 2012-11-16 22:29:39 +00:00 |  | 
				
					
						|  | 94a16f23c4 | DE: update to the strings | 2012-11-16 09:58:00 +01:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | c12a27c73c | More diabook... | 2012-11-16 02:49:05 +00:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | da2aabd61d | Diabook - couple of fixes. | 2012-11-16 01:58:28 +00:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | bb86214698 | Add the event/birthday thing from Andreas. | 2012-11-16 01:44:09 +00:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | da1b4939f0 | Merge branch 'master' of https://github.com/friendica/friendica | 2012-11-16 00:37:53 +00:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | b19c832381 | Diabook.  Get the paths right.  There seems to be something in the PHP putting us in unexpected directories...but it works now. | 2012-11-16 00:36:52 +00:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | 09150cb5dc | Diabook - some heavy lifting.  Lots more still to do. | 2012-11-15 23:54:13 +00:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | e67062d9cf | Merge remote-tracking branch 'upstream/master' | 2012-11-15 21:52:35 +01:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | fce18fd223 | Vier: New Icon set | 2012-11-15 21:47:36 +01:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | ff5ab7e9c6 | Vier: Further improvements. | 2012-11-15 08:18:25 +01:00 |  | 
				
					
						| 
								
								
									 friendica | eef8fbe52c | Merge https://github.com/friendica/friendica into pull | 2012-11-14 14:00:08 -08:00 |  | 
				
					
						| 
								
								
									 friendica | ab0dc3131a | fix wallmessage | 2012-11-14 13:59:31 -08:00 |  | 
				
					
						| 
								
								
									 pixelroot | a00723fb9c | modified:   view/theme/smoothly/style.css modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/wall_thread.tpl | 2012-11-14 20:10:08 +01:00 |  | 
				
					
						| 
								
								
									 pixelroot | 7c4e3984be | new file:   view/theme/smoothly/search_item.tpl modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/wall_thread.tpl | 2012-11-14 11:43:26 +01:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | 6fd47ba78e | Even shinier Dispy. | 2012-11-14 03:01:15 +00:00 |  | 
				
					
						| 
								
								
									 friendica | eecf099079 | Merge https://github.com/friendica/friendica into pull | 2012-11-13 17:15:56 -08:00 |  | 
				
					
						| 
								
								
									 friendica | 66f0cf9f5b | rev update | 2012-11-13 17:15:17 -08:00 |  | 
				
					
						| 
								
								
									 friendica | 3dc4c52022 | Merge pull request #533 from fabrixxm/moveme Fix issue 508 | 2012-11-13 14:06:20 -08:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | 79f35d01a7 | "Everything" now includes Vier | 2012-11-13 16:21:03 +00:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | 4c6401cfb0 | Merge branch 'master' of https://github.com/friendica/friendica | 2012-11-13 15:52:16 +00:00 |  | 
				
					
						|  | 4b5dea5c89 | Update view/pl/strings.php | 2012-11-13 16:52:18 +01:00 |  | 
				
					
						| 
								
								
									 Thomas Willingham | 13ffe6274c | Everything is shiny (except frost and smoothly). | 2012-11-13 15:50:48 +00:00 |  | 
				
					
						| 
								
								
									 pixelroot | 7e16909d0e | deleted:    view/theme/smoothly/events_reminder.tpl | 2012-11-13 16:37:53 +01:00 |  | 
				
					
						| 
								
								
									 pixelroot | 0e2fdee20e | modified:   view/theme/smoothly/jot-header.tpl modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php | 2012-11-13 16:36:36 +01:00 |  | 
				
					
						| 
								
								
									 fabrixxm | ce12b3d2f0 | Merge pull request #535 from fabrixxm/master fix \"" issue in util/po2php.php | 2012-11-13 07:16:22 -08:00 |  | 
				
					
						| 
								
								
									 Fabrixxm | 7093c1b9f6 | update all languages strings.php | 2012-11-13 10:13:28 -05:00 |  | 
				
					
						| 
								
								
									 Fabrixxm | 8de346b943 | fix po2php \"" issue. | 2012-11-13 10:02:03 -05:00 |  | 
				
					
						|  | 9886139d71 | PL: update to the strings | 2012-11-13 15:39:07 +01:00 |  | 
				
					
						| 
								
								
									 fabrixxm | 5a2c01d572 | Merge pull request #532 from fabrixxm/quattrofixs template: new $item.shiny; some fix to quattro | 2012-11-13 03:08:26 -08:00 |  | 
				
					
						| 
								
								
									 zzottel | cc20276eb5 | Merge pull request #534 from zzottel/master Mark items read on viewing filtered network page | 2012-11-13 02:34:51 -08:00 |  | 
				
					
						| 
								
								
									 zottel | c4e4ee892e | Mark items read on filtered network page, but still keep the "mark everything read" mechanism on viewing the unfiltered network page. | 2012-11-13 11:30:43 +01:00 |  | 
				
					
						| 
								
								
									 Fabrixxm | 374683503a | uimport: check check to ensure the username isn't already taken before import (issue 508) | 2012-11-13 04:52:32 -05:00 |  | 
				
					
						| 
								
								
									 Fabrixxm | 9afe50d1e5 | uimport: add register policy and max daily registrations check (issue 508) | 2012-11-13 04:40:15 -05:00 |  | 
				
					
						| 
								
								
									 Fabrixxm | d40099e97c | add $item.shiny to default template | 2012-11-12 12:55:18 -05:00 |  | 
				
					
						| 
								
								
									 Fabrixxm | f3716d51ef | quattro: fix tag item template add correct initial and final divs | 2012-11-12 12:45:49 -05:00 |  | 
				
					
						| 
								
								
									 pixelroot | 9f09955925 | modified:   view/theme/smoothly/css/typography.css modified:   view/theme/smoothly/style.css | 2012-11-12 15:35:16 +01:00 |  | 
				
					
						| 
								
								
									 pixelroot | 8395966cf2 | modified:   view/theme/smoothly/css/typography.css new file:   view/theme/smoothly/screenshot.png
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php | 2012-11-12 15:01:19 +01:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | 30e429e6ce | Vier: Changed the color of links and notification counter. | 2012-11-12 08:22:49 +01:00 |  |