Commit graph

7436 commits

Author SHA1 Message Date
Thomas Willingham 8b961b0a39 Diabook - yeah, we're supposed to *stop* duplicating code... 2012-11-11 17:49:41 +00:00
Thomas Willingham f19bd6b62f Move-Account minor English changes. 2012-11-11 16:01:36 +00:00
Thomas Willingham 4bd70c15db Merge branch 'master' of https://github.com/friendica/friendica 2012-11-11 15:46:04 +00:00
Thomas Willingham 10e84c548c Diabook threaded comments. 2012-11-11 15:44:36 +00:00
Tobias Diekershoff f28b49e6d8 PL: update to the strings 2012-11-11 10:56:07 +01:00
Tobias Diekershoff c88e7d75c0 CS: update to the strings 2012-11-11 10:55:47 +01:00
friendica 6e0dd29c1b include some notes on grabbing the tumblr avatar 2012-11-11 00:44:30 -08:00
friendica a807206804 Merge https://github.com/friendica/friendica into pull 2012-11-11 00:30:37 -08:00
friendica 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. 2012-11-11 00:28:21 -08:00
Michael Vogel 197a12adb5 Vier: Further design improvements 2012-11-11 00:39:08 +01:00
Michael Vogel b875191237 Diaspora: Avatars of repeated items weren't found
Vier: Complete redesign of the navigation header
2012-11-10 23:19:32 +01:00
friendica 0e95b6b527 Merge pull request #531 from fabrixxm/master
"Move Account" docs
2012-11-10 03:06:28 -08:00
Tobias Diekershoff 7187107034 glitch with DE, PL strings 2012-11-10 08:50:26 +01:00
Tobias Diekershoff 286578542f DE: update to the strings 2012-11-10 08:37:21 +01:00
Tobias Diekershoff 85feaa1a8d PL: update to the strings 2012-11-10 08:36:43 +01:00
Michael Vogel 71e43e68d4 Merge remote-tracking branch 'upstream/master' 2012-11-09 23:40:17 +01:00
Fabrixxm ff659a822b add apple/gnome web app tags 2012-11-09 13:23:47 -05:00
Fabrixxm b15352f650 quattro: collapse threaded comment box 2012-11-09 11:58:35 -05:00
Fabrixxm c8b4ce9cca quattro: fix shiny items with threads. fix 'tagged' template 2012-11-09 11:24:49 -05:00
Fabrixxm 41dfc7f29e items: new property 'shiny'.
separate 'indent' (''|'comment') from 'shiny' (''|'shiny')
2012-11-09 11:13:59 -05:00
Fabrixxm 5541f396d8 doc: add "Move account" basic documentation 2012-11-09 04:00:15 -05:00
Fabrixxm 1bc9f8b992 help: load Home.md in aside when not in home,add new markdown syntax
New markdown block "warning"

    ! line1
    ! line2

will be rendered as

   <div class="md_warning"><p>line1</p><p>line2</p></div>
2012-11-09 03:56:45 -05:00
friendica b01ca0e345 what happened to the photos page vcard? 2012-11-09 00:21:16 -08:00
Fabrixxm cafb4d62f4 a little bit of phpdoc 2012-11-09 02:43:22 -05:00
Michael Vogel fb02d72a35 vier: toggle comments only with threaded comments 2012-11-09 08:01:16 +01:00
friendica f71db67a36 Merge https://github.com/friendica/friendica into pull 2012-11-08 20:47:04 -08:00
friendica 4199f49b54 remember me to base theme 2012-11-08 20:46:44 -08:00
fermionic a6c05b5186 Merge pull request #530 from fermionic/20121108-dispy-menu-fix
fix help button position in dispy
2012-11-08 18:16:01 -08:00
Michael Vogel b41687e209 "vier": Button for show/hide of text area for comments 2012-11-09 01:56:51 +01:00
Zach Prezkuta 36a9b2ed9a fix help button position 2012-11-08 17:50:37 -07:00
friendica 083d660f61 Merge https://github.com/friendica/friendica into pull 2012-11-08 16:32:25 -08:00
friendica 9b629186a9 rev update 2012-11-08 16:29:54 -08:00
friendica 824dcb8e76 Merge pull request #529 from fermionic/20121107-remember-me
add ability to remember logged in user after browser closes
2012-11-08 16:29:02 -08:00
Michael Vogel b14e557575 Vier: Fixing "vier" so that it looks again like it was intended. 2012-11-09 01:19:24 +01:00
Zach Prezkuta ac164cfca8 refresh login time every 12 hours for 'Remember me' 2012-11-08 17:00:37 -07:00
Michael Vogel 5d2d306d9f Make reshared Diaspora postings look lile wall-to-wall postings (preparation for real forwards in friendica) 2012-11-08 21:45:53 +01:00
Michael Vogel 4196b6a96c Merge remote-tracking branch 'upstream/master' 2012-11-08 21:44:17 +01:00
Tobias Diekershoff 225fd777fd PL: added Polish localization. Tha to Adam Jurkiewicz and the rest of the translation team :-) 2012-11-08 18:54:42 +01:00
Tobias Diekershoff 815d48e5e4 frost-mobile: on subdirectory installs the login screen image was not found 2012-11-08 06:48:49 +01:00
Zach Prezkuta e116712bf5 add ability to remember logged in user after browser closes 2012-11-07 18:59:30 -07:00
fermionic cbbd68563b Merge pull request #527 from fermionic/20121106-frost-updates
frost updates
2012-11-07 07:41:17 -08:00
fabrixxm 1e1ea43e74 Merge pull request #528 from fabrixxm/moveme
fix uexport query for groups and group members
2012-11-07 06:31:44 -08:00
Fabrixxm 98958b4fb9 fix uexport query for groups and group members 2012-11-07 09:26:05 -05:00
Thomas Willingham 6454faede1 Friendicaland. 2012-11-06 21:17:46 +00:00
Zach Prezkuta bff31a49eb leaked local change 2012-11-06 08:49:03 -07:00
Zach Prezkuta 999c3439e6 fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
Thomas Willingham 3c61ba7f53 Uimport - slightly modify text (better English, not better doco). 2012-11-06 15:01:46 +00:00
friendica 776552226b Merge https://github.com/friendica/friendica into pull 2012-11-06 01:10:36 -08:00
friendica fd4d35b16c set writable for ostatus followers 2012-11-06 01:10:12 -08:00
zzottel eb3408b574 Merge pull request #526 from zzottel/master
Forgot to commit the changes(regarding fermionic's comments) in notifier.php
2012-11-05 23:18:48 -08:00