Commit graph

  • eef8fbe52c Merge https://github.com/friendica/friendica into pull friendica 2012-11-14 14:00:08 -08:00
  • ab0dc3131a fix wallmessage friendica 2012-11-14 13:59:31 -08:00
  • a00723fb9c modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php modified: view/theme/smoothly/wall_thread.tpl pixelroot 2012-11-14 20:10:08 +01:00
  • 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 pixelroot 2012-11-14 11:43:26 +01:00
  • 6fd47ba78e Even shinier Dispy. Thomas Willingham 2012-11-14 03:01:15 +00:00
  • eecf099079 Merge https://github.com/friendica/friendica into pull friendica 2012-11-13 17:15:56 -08:00
  • 66f0cf9f5b rev update friendica 2012-11-13 17:15:17 -08:00
  • 3dc4c52022 Merge pull request #533 from fabrixxm/moveme friendica 2012-11-13 14:06:20 -08:00
  • 79f35d01a7 "Everything" now includes Vier Thomas Willingham 2012-11-13 16:21:03 +00:00
  • 4c6401cfb0 Merge branch 'master' of https://github.com/friendica/friendica Thomas Willingham 2012-11-13 15:52:16 +00:00
  • 4b5dea5c89 Update view/pl/strings.php tobiasd 2012-11-13 16:52:18 +01:00
  • 13ffe6274c Everything is shiny (except frost and smoothly). Thomas Willingham 2012-11-13 15:50:48 +00:00
  • 7e16909d0e deleted: view/theme/smoothly/events_reminder.tpl pixelroot 2012-11-13 16:37:53 +01:00
  • 0e2fdee20e modified: view/theme/smoothly/jot-header.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-11-13 16:36:36 +01:00
  • ce12b3d2f0 Merge pull request #535 from fabrixxm/master fabrixxm 2012-11-13 07:16:22 -08:00
  • 7093c1b9f6 update all languages strings.php Fabrixxm 2012-11-13 10:13:28 -05:00
  • 8de346b943 fix po2php \"" issue. Fabrixxm 2012-11-13 10:02:03 -05:00
  • 9886139d71 PL: update to the strings Tobias Diekershoff 2012-11-13 15:39:07 +01:00
  • 5a2c01d572 Merge pull request #532 from fabrixxm/quattrofixs fabrixxm 2012-11-13 03:08:26 -08:00
  • cc20276eb5 Merge pull request #534 from zzottel/master zzottel 2012-11-13 02:34:51 -08:00
  • c4e4ee892e Mark items read on filtered network page, but still keep the "mark everything read" mechanism on viewing the unfiltered network page. zottel 2012-11-13 11:30:43 +01:00
  • 374683503a uimport: check check to ensure the username isn't already taken before import (issue 508) Fabrixxm 2012-11-13 04:52:32 -05:00
  • 9afe50d1e5 uimport: add register policy and max daily registrations check (issue 508) Fabrixxm 2012-11-13 04:40:15 -05:00
  • d40099e97c add $item.shiny to default template Fabrixxm 2012-11-12 12:55:18 -05:00
  • f3716d51ef quattro: fix tag item template add correct initial and final divs Fabrixxm 2012-11-12 12:45:49 -05:00
  • 9f09955925 modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css pixelroot 2012-11-12 15:35:16 +01:00
  • 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 pixelroot 2012-11-12 15:01:19 +01:00
  • 30e429e6ce Vier: Changed the color of links and notification counter. Michael Vogel 2012-11-12 08:22:49 +01:00
  • b6b85b9773 Vier: Colors of links changed Michael Vogel 2012-11-12 00:38:45 +01:00
  • b75ca0d5b8 Merge https://github.com/friendica/friendica into pull friendica 2012-11-11 13:58:17 -08:00
  • 009744af50 allow posted ACLs to be comma-delimited string besides the default array friendica 2012-11-11 13:56:21 -08:00
  • 4c3e9fde28 Diabook - move pause icon. Thomas Willingham 2012-11-11 18:44:13 +00:00
  • fccc76371f Move the language selector. Thomas Willingham 2012-11-11 18:42:35 +00:00
  • 1a884e4065 Diabook - an out of date buglink probably shouldn't be in the navigation. Thomas Willingham 2012-11-11 18:39:16 +00:00
  • 9ea96c74a2 Diabook - remove jquery that seems to do nothing except break ACL in 90% of all browsers. Thomas Willingham 2012-11-11 18:31:11 +00:00
  • 8b961b0a39 Diabook - yeah, we're supposed to *stop* duplicating code... Thomas Willingham 2012-11-11 17:49:41 +00:00
  • f19bd6b62f Move-Account minor English changes. Thomas Willingham 2012-11-11 16:01:36 +00:00
  • 4bd70c15db Merge branch 'master' of https://github.com/friendica/friendica Thomas Willingham 2012-11-11 15:46:04 +00:00
  • 10e84c548c Diabook threaded comments. Thomas Willingham 2012-11-11 15:44:36 +00:00
  • f28b49e6d8 PL: update to the strings Tobias Diekershoff 2012-11-11 10:56:07 +01:00
  • c88e7d75c0 CS: update to the strings Tobias Diekershoff 2012-11-11 10:55:47 +01:00
  • 6e0dd29c1b include some notes on grabbing the tumblr avatar friendica 2012-11-11 00:44:30 -08:00
  • a807206804 Merge https://github.com/friendica/friendica into pull friendica 2012-11-11 00:30:37 -08:00
  • de5a21bec4 improve recognition of tumblr feeds. I hope we don't need special feed logic to find the feeds for every site on the web. We were so far beyond this ten years ago. friendica 2012-11-11 00:28:21 -08:00
  • 197a12adb5 Vier: Further design improvements Michael Vogel 2012-11-11 00:39:08 +01:00
  • b875191237 Diaspora: Avatars of repeated items weren't found Vier: Complete redesign of the navigation header Michael Vogel 2012-11-10 23:19:32 +01:00
  • 0e95b6b527 Merge pull request #531 from fabrixxm/master friendica 2012-11-10 03:06:28 -08:00
  • 7187107034 glitch with DE, PL strings Tobias Diekershoff 2012-11-10 08:50:26 +01:00
  • 286578542f DE: update to the strings Tobias Diekershoff 2012-11-10 08:37:21 +01:00
  • 85feaa1a8d PL: update to the strings Tobias Diekershoff 2012-11-10 08:36:43 +01:00
  • 71e43e68d4 Merge remote-tracking branch 'upstream/master' Michael Vogel 2012-11-09 23:40:17 +01:00
  • ff659a822b add apple/gnome web app tags Fabrixxm 2012-11-09 13:23:47 -05:00
  • b15352f650 quattro: collapse threaded comment box Fabrixxm 2012-11-09 11:58:35 -05:00
  • c8b4ce9cca quattro: fix shiny items with threads. fix 'tagged' template Fabrixxm 2012-11-09 11:24:49 -05:00
  • 41dfc7f29e items: new property 'shiny'. separate 'indent' (''|'comment') from 'shiny' (''|'shiny') Fabrixxm 2012-11-09 11:13:59 -05:00
  • 5541f396d8 doc: add "Move account" basic documentation Fabrixxm 2012-11-09 04:00:15 -05:00
  • 1bc9f8b992 help: load Home.md in aside when not in home,add new markdown syntax New markdown block "warning" Fabrixxm 2012-11-09 03:56:45 -05:00
  • b01ca0e345 what happened to the photos page vcard? friendica 2012-11-09 00:21:16 -08:00
  • cafb4d62f4 a little bit of phpdoc Fabrixxm 2012-11-09 02:43:22 -05:00
  • fb02d72a35 vier: toggle comments only with threaded comments Michael Vogel 2012-11-09 08:01:16 +01:00
  • f71db67a36 Merge https://github.com/friendica/friendica into pull friendica 2012-11-08 20:47:04 -08:00
  • 4199f49b54 remember me to base theme friendica 2012-11-08 20:46:44 -08:00
  • a6c05b5186 Merge pull request #530 from fermionic/20121108-dispy-menu-fix fermionic 2012-11-08 18:16:01 -08:00
  • b41687e209 "vier": Button for show/hide of text area for comments Michael Vogel 2012-11-09 01:56:51 +01:00
  • 36a9b2ed9a fix help button position Zach Prezkuta 2012-11-08 17:50:37 -07:00
  • 083d660f61 Merge https://github.com/friendica/friendica into pull friendica 2012-11-08 16:32:25 -08:00
  • 9b629186a9 rev update friendica 2012-11-08 16:29:54 -08:00
  • 824dcb8e76 Merge pull request #529 from fermionic/20121107-remember-me friendica 2012-11-08 16:29:02 -08:00
  • b14e557575 Vier: Fixing "vier" so that it looks again like it was intended. Michael Vogel 2012-11-09 01:19:24 +01:00
  • ac164cfca8 refresh login time every 12 hours for 'Remember me' Zach Prezkuta 2012-11-08 17:00:37 -07:00
  • 5d2d306d9f Make reshared Diaspora postings look lile wall-to-wall postings (preparation for real forwards in friendica) Michael Vogel 2012-11-08 21:45:53 +01:00
  • 4196b6a96c Merge remote-tracking branch 'upstream/master' Michael Vogel 2012-11-08 21:44:17 +01:00
  • 225fd777fd PL: added Polish localization. Tha to Adam Jurkiewicz and the rest of the translation team :-) Tobias Diekershoff 2012-11-08 18:54:42 +01:00
  • 815d48e5e4 frost-mobile: on subdirectory installs the login screen image was not found Tobias Diekershoff 2012-11-08 06:48:49 +01:00
  • e116712bf5 add ability to remember logged in user after browser closes Zach Prezkuta 2012-11-07 18:59:30 -07:00
  • cbbd68563b Merge pull request #527 from fermionic/20121106-frost-updates fermionic 2012-11-07 07:41:17 -08:00
  • 1e1ea43e74 Merge pull request #528 from fabrixxm/moveme fabrixxm 2012-11-07 06:31:44 -08:00
  • 98958b4fb9 fix uexport query for groups and group members Fabrixxm 2012-11-07 09:26:05 -05:00
  • 6454faede1 Friendicaland. Thomas Willingham 2012-11-06 21:17:46 +00:00
  • bff31a49eb leaked local change Zach Prezkuta 2012-11-06 08:49:03 -07:00
  • 999c3439e6 fix mobile photo uploads; better theme control; frost improvements Zach Prezkuta 2012-11-06 08:43:19 -07:00
  • 3c61ba7f53 Uimport - slightly modify text (better English, not better doco). Thomas Willingham 2012-11-06 15:01:46 +00:00
  • 776552226b Merge https://github.com/friendica/friendica into pull friendica 2012-11-06 01:10:36 -08:00
  • fd4d35b16c set writable for ostatus followers friendica 2012-11-06 01:10:12 -08:00
  • eb3408b574 Merge pull request #526 from zzottel/master zzottel 2012-11-05 23:18:48 -08:00
  • b7e121ccf7 Forgot to commit the changes (regarding fermionic's comments) in notifier.php zottel 2012-11-06 08:16:08 +01:00
  • 64b0e490d5 Merge pull request #525 from fabrixxm/moveme friendica 2012-11-05 18:48:05 -08:00
  • cef5afc53d moveme: remove debug comment Fabrixxm 2012-11-05 04:15:09 -05:00
  • 5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme Fabrixxm 2012-11-05 09:37:58 +01:00
  • 385ee5a862 pass $argv & $argc as reference to *_run() functions. Fabrixxm 2012-11-05 09:28:54 +01:00
  • aa20042bec moveme: fix contact photos Fabrixxm 2012-11-05 09:18:55 +01:00
  • 2093fa8b3f DE: update to the strings Tobias Diekershoff 2012-11-05 07:29:55 +01:00
  • ff40442768 Restoring the community pages in diabook Michael 2012-11-05 00:20:32 +01:00
  • fe3f1af92f Merge remote-tracking branch 'upstream/master' root 2012-11-04 23:31:05 +01:00
  • 6afa5d1c48 In the API you now can update not only the body but also the title. In html2plain the function for valid urls was improved. Michael 2012-11-04 23:18:52 +01:00
  • 1d91b2d1b3 Merge https://github.com/friendica/friendica into pull friendica 2012-11-04 13:43:42 -08:00
  • caebcc5e83 rev update friendica 2012-11-04 13:43:28 -08:00
  • cc50abeabe Merge pull request #522 from zzottel/master friendica 2012-11-04 13:40:45 -08:00
  • 339c0ef735 Merge pull request #524 from beardy-unixer/master friendica 2012-11-04 13:40:24 -08:00
  • 973efa0c75 Oops, re-kill the dead snake. Thomas Willingham 2012-11-04 20:02:41 +00:00