clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,315 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

7315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
friendica ff9c19d75a Merge https://github.com/friendica/friendica into pull 2012-11-22 20:55:03 -08:00
friendica 278f30790a rev update 2012-11-22 20:54:44 -08:00
friendica 226d1ba7c1 Merge pull request #537 from fermionic/20121121-features 
Port Features from Red
 2012-11-22 20:54:16 -08:00
Zach Prezkuta beec28cc62 found a bug already 2012-11-22 09:34:50 -07:00
Zach Prezkuta a536a4e657 local stuff leaked 2012-11-22 09:21:21 -07:00
Zach Prezkuta 04f5506318 forgot some slightly important files 2012-11-22 09:20:03 -07:00
Zach Prezkuta 94204d9160 implement features 2012-11-22 09:14:22 -07:00
Michael Vogel e36c30d285 Vier: Margin problems with code fixed. 2012-11-22 15:06:15 +01:00
friendica 891bfd9f91 further jenkins include fixes 2012-11-22 05:09:28 -08:00
friendica 9835efc9e4 fix jenkins tests 2012-11-22 05:06:15 -08:00
friendica 868bdc9b6a php warning 2012-11-22 03:19:05 -08:00
Thomas Willingham c0a435aa18 Update doco for consistency - we call "pages" forums now. 2012-11-22 02:52:41 +00:00
friendica 0840c8365a always check for valid dfrn_id before auto_redir 2012-11-21 15:56:00 -08:00
friendica ed1b84fb60 Merge https://github.com/friendica/friendica into pull 2012-11-21 15:42:20 -08:00
friendica 4d289574ca ensure that auto_redir does not loop 2012-11-21 15:41:14 -08:00
friendica d3b2b1b7ec rev update 2012-11-21 15:40:07 -08:00
Tobias Diekershoff c40740d19f ZH-CN: Update to the strings 2012-11-20 17:26:54 +01:00
Thomas Willingham ded2aea16a Merge branch 'master' of https://github.com/friendica/friendica 2012-11-19 16:03:54 +00:00
Thomas Willingham 7139e60b94 Diabook - fix wall-to-wall posts 2012-11-19 15:58:50 +00:00
friendica f1c579e74a Merge https://github.com/friendica/friendica into pull 2012-11-18 23:50:37 -08:00
friendica 53a908a3d7 fix directory 2012-11-18 23:44:03 -08:00
friendica 70d0ed9402 log directory updates 2012-11-18 22:53:01 -08:00
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
Tobias Diekershoff 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
Tobias Diekershoff 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