Commit Graph

7436 Commits

Author SHA1 Message Date
Thomas Willingham a6e7ad9771 Merge branch 'master' of https://github.com/friendica/friendica 2012-11-27 23:58:00 +00:00
friendica 32868dab79 catch stragglers in "chunked" delivery mode 2012-11-27 15:17:41 -08:00
Thomas Willingham 512729073b Unmark Diabook experimental 2012-11-27 17:14:13 +00:00
Thomas Willingham 8c3ea4b4d4 Add max_daily_registrations to admin panel. 2012-11-27 17:13:32 +00:00
Thomas Willingham 7de455602c Revert Diabook. 2012-11-27 16:28:12 +00:00
Thomas Willingham 5d1cbc2677 Remove German Pages.md (replaced with Forums.md) 2012-11-26 06:15:18 +00:00
tobiasd cced235c04 Merge pull request #538 from balderino/master
renaming pages to forums (german doc-files)
2012-11-25 22:11:41 -08:00
Thomas Willingham 95322ff5f4 Diabook - of all the things to miss...wall-item-content. 2012-11-26 05:49:13 +00:00
Thomas Willingham 586acbe998 Merge branch 'master' of https://github.com/friendica/friendica 2012-11-26 04:39:08 +00:00
Thomas Willingham fa5d25ec7a Diabook - better 1024 resolution support. 2012-11-26 04:38:19 +00:00
friendica 5d904a9fa8 improve performance of photo upload page 2012-11-25 19:34:54 -08:00
friendica 15ede093cf Merge https://github.com/friendica/friendica into pull 2012-11-25 19:21:24 -08:00
friendica bb51be4ea8 rev update 2012-11-25 19:21:08 -08:00
Thomas Willingham b0b4baa331 Diabook - kill wall_thread, remove need for wide variants, fix live updates, add todo list. 2012-11-26 02:11:19 +00:00
balderino 8ac28eec97 update_forums 2012-11-25 19:42:20 +01:00
Tobias Diekershoff 54bcfd2535 PL: update to the strings 2012-11-25 12:57:55 +01:00
Tobias Diekershoff 50aa5face7 DE: update to the strings 2012-11-25 12:57:28 +01:00
Tobias Diekershoff ae58049110 ZH-CN: Update to the strings 2012-11-25 12:52:18 +01:00
Tobias Diekershoff 569a8edcb0 DE: Move-Account.md translated 2012-11-24 06:33:22 +01:00
Michael Vogel 88f5865738 Vier: Maximum with for content area 2012-11-23 12:15:03 +01:00
friendica fcbdefcfd5 missing network_to_name 2012-11-22 21:04:03 -08:00
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