Commit graph

7372 commits

Author SHA1 Message Date
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
225fd777fd PL: added Polish localization. Tha to Adam Jurkiewicz and the rest of the translation team :-) 2012-11-08 18:54:42 +01:00
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
zottel
b7e121ccf7 Forgot to commit the changes (regarding fermionic's comments) in notifier.php 2012-11-06 08:16:08 +01:00
friendica
64b0e490d5 Merge pull request #525 from fabrixxm/moveme
Move users between servers
2012-11-05 18:48:05 -08:00
Fabrixxm
cef5afc53d moveme: remove debug comment 2012-11-05 04:15:09 -05:00
Fabrixxm
5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme 2012-11-05 09:37:58 +01:00
Fabrixxm
385ee5a862 pass $argv & $argc as reference to *_run() functions. 2012-11-05 09:28:54 +01:00
Fabrixxm
aa20042bec moveme: fix contact photos 2012-11-05 09:18:55 +01:00
2093fa8b3f DE: update to the strings 2012-11-05 07:29:55 +01:00
Michael
ff40442768 Restoring the community pages in diabook 2012-11-05 00:20:32 +01:00
root
fe3f1af92f Merge remote-tracking branch 'upstream/master' 2012-11-04 23:31:05 +01:00
Michael
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. 2012-11-04 23:18:52 +01:00
friendica
1d91b2d1b3 Merge https://github.com/friendica/friendica into pull 2012-11-04 13:43:42 -08:00
friendica
caebcc5e83 rev update 2012-11-04 13:43:28 -08:00
friendica
cc50abeabe Merge pull request #522 from zzottel/master
Delete contents from a user when he removes his account
2012-11-04 13:40:45 -08:00
friendica
339c0ef735 Merge pull request #524 from beardy-unixer/master
Only show "Welcome to $Sitename" if you haven't made your own homepage.
2012-11-04 13:40:24 -08:00