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
Thomas Willingham
973efa0c75
Oops, re-kill the dead snake.
2012-11-04 20:02:41 +00:00
Thomas Willingham
190ab46e18
Only show "Welcome to $Sitename" if you haven't made your own homepage.
2012-11-04 19:58:59 +00:00
Thomas Willingham
234598280d
Merge remote-tracking branch 'upstream/master'
2012-11-04 19:56:33 +00:00
Thomas Willingham
254c318647
Quick native-speaker-once-over of new doco.
2012-11-04 16:08:19 +00:00
Thomas Willingham
c8055cb680
Merge pull request #523 from balderino/master
...
add new englisch help files
2012-11-04 07:51:17 -08:00
balderino
0116c6accd
doc_new-englisch-help-files
2012-11-04 15:39:44 +01:00
balderino
aa3cefa5b3
doc_new-englisch-help-files
2012-11-04 15:18:03 +01:00
balderino
0180ac563e
doc_new-englisch-help-files
2012-11-04 15:14:52 +01:00
balderino
e62c518312
doc_new-englisch-help-files
2012-11-04 14:45:10 +01:00
balderino
1e89df1df7
doc_new-englisch-help-files
2012-11-04 14:41:30 +01:00
balderino
701b20fbeb
doc_new-englisch-help-files
2012-11-04 14:40:50 +01:00
balderino
b25b7c2d8c
doc_new-englisch-help-files
2012-11-04 14:38:15 +01:00
zottel
dd1e735efb
Worked in fermionic's comments (not count($r)).
2012-11-04 11:07:11 +01:00
zottel
6aca58f320
Merge remote branch 'upstream/master'
2012-11-04 11:05:40 +01:00
Michael
84fc866976
Merge remote-tracking branch 'upstream/master'
2012-11-04 09:59:58 +01:00
friendica
6ca9f0e5fa
string update
2012-11-03 15:31:33 -07:00
friendica
0627fdcce7
positional params in "was tagged in a photo" string
2012-11-03 15:29:47 -07:00
friendica
f076d7f0dc
Merge https://github.com/friendica/friendica into pull
2012-11-03 14:44:46 -07:00
friendica
3303d9db75
put 1i8n position orders in welcome string
2012-11-03 14:43:48 -07:00
Michael
2b6498b2a2
Merge remote-tracking branch 'upstream/master'
2012-11-03 22:27:34 +01:00
zottel
2871fd4793
Depublish public posts when archiving a contact
2012-11-02 23:54:03 +01:00
zottel
7de5c7ebe1
Changes to make contacts delete all content from the user when a user is deleted.
...
NOTE: I didn't add "AND account_removed = 0" to facebook.php because I don't
have a clone of the addons repository. Please someone do that for me. Thanks.
Please check carefully. I tested locally on my server, but not with other
servers.
2012-11-02 21:43:47 +01:00
fermionic
d3290f314f
Merge pull request #521 from fermionic/20121101-updates
...
Various updates
2012-11-02 12:26:49 -07:00
friendica
e8fa4279fa
no profile pic on photos page if no photos have been uploaded
2012-11-02 04:20:12 -07:00
Zach Prezkuta
c6a3b87359
update_display for display live updates
2012-11-01 18:36:11 -06:00
Zach Prezkuta
c9248b66db
display live update; don't collapse comments on live update
2012-11-01 18:31:50 -06:00
friendica
ce932dfdaf
Merge https://github.com/friendica/friendica into pull
2012-11-01 17:21:55 -07:00
friendica
08121ad6b4
rev update
2012-11-01 17:21:39 -07:00
Zach Prezkuta
6effdd570c
add a confirm dialog and a busy rotator for delete selected
2012-11-01 17:42:40 -06:00
Zach Prezkuta
e9b26ffbb3
prevent double posting of status updates and comments
2012-11-01 17:14:42 -06:00
fermionic
6ecccf6830
Merge pull request #520 from fermionic/20121101-auto-redir-and-theme-threading
...
auto redir and theme threading
2012-11-01 09:37:18 -07:00
Zach Prezkuta
3e594f0f1c
get rid of stray file
2012-11-01 10:35:20 -06:00
Zach Prezkuta
d98974572b
fix theme control of allowing threading
2012-11-01 10:33:01 -06:00
Zach Prezkuta
43de9cf904
don't try to auto redir if I'm a blocked or pending contact
2012-11-01 10:32:33 -06:00
c177a5e5b2
vier: threads
2012-11-01 15:05:31 +01:00
9086641fd1
ES: update to the strings
2012-11-01 13:12:54 +01:00
