Fabrixxm
9afe50d1e5
uimport: add register policy and max daily registrations check (issue 508)
2012-11-13 04:40:15 -05:00
Fabrixxm
98958b4fb9
fix uexport query for groups and group members
2012-11-07 09:26:05 -05:00
Thomas Willingham
3c61ba7f53
Uimport - slightly modify text (better English, not better doco).
2012-11-06 15:01:46 +00:00
Fabrixxm
5b4944fe8e
Merge remote-tracking branch 'remotes/friendica/master' into moveme
2012-11-05 09:37:58 +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
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
zottel
6aca58f320
Merge remote branch 'upstream/master'
2012-11-04 11:05:40 +01: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
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
Zach Prezkuta
e9b26ffbb3
prevent double posting of status updates and comments
2012-11-01 17:14:42 -06:00
Fabrixxm
1a3a5ee8d9
moveme: first successful relocated user
2012-10-31 17:13:45 +01:00
friendica
e2ca9e9db5
poco - ignore archived contacts
2012-10-30 14:25:33 -07:00
Fabrixxm
c51e057fe6
Merge remote branch 'friendica/master' into moveme
2012-10-29 05:57:58 -04:00
friendica
88c8387c44
revive "mark everything seen" on main network page - see comments
2012-10-26 14:29:42 -07:00
friendica
2347a4326c
get rid of 'Friendika'
2012-10-18 21:51:45 -07:00
Fabrixxm
65d235017c
move account. first step.
...
export basic account data as json
import basic account data in db (dbs must be at same schema version)
2012-10-17 11:13:01 -04:00
friendica
3af16ff92a
Merge https://github.com/friendica/friendica into pull
2012-10-14 17:16:41 -07:00
friendica
dec5298248
rev update
2012-10-14 17:16:25 -07:00
Michael Johnston
939227e820
Moved comment box on photos to be after the last comment, added text for the Preview link
2012-10-14 14:41:31 -04:00
fermionic
ca21f1bbc8
Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts
...
for profile and photos, detect contacts from local hub and auto-redir
2012-10-11 17:24:11 -07:00
fermionic
2f3d118e77
Merge pull request #508 from fermionic/no-theme-control-of-live-update-location
...
allow themes to decide where live updates appear
2012-10-10 17:34:28 -07:00
friendica
816db4396a
better fix for threads with no parent showing up as unseen
2012-10-10 16:17:40 -07:00
friendica
8a1f9d32ab
Merge https://github.com/friendica/friendica into pull
2012-10-10 15:59:05 -07:00
friendica
675aa56b02
rev update - prevent messages with no parent from being counted as unseen, because they cannot ever be cleared
2012-10-10 15:57:40 -07:00
fermionic
14d8033e54
Merge pull request #510 from fermionic/lockview-plugin-support
...
allow changing the lockview content with a plugin
2012-10-10 07:04:08 -07:00
Zach Prezkuta
b9818185db
for profile and photos, detect contacts from local hub and auto-redir
2012-10-09 09:50:24 -06:00
Zach Prezkuta
86d6f380dc
add home_init hook to manage to call startpage plugin
2012-10-09 09:47:14 -06:00
Zach Prezkuta
96a245409b
allow changing the lockview content with a plugin
2012-10-09 09:45:54 -06:00
Zach Prezkuta
0ea89852d2
allow themes to decide where live updates appear
2012-10-09 09:41:33 -06:00
Domovoy
8e50b3f9ce
Use saved_searches_aside.tpl in search.php
2012-10-02 16:03:20 +02:00
fermionic
9daafe7489
Merge pull request #501 from fermionic/network-remember-filters
...
don't set a date as a group
2012-10-01 13:08:48 -07:00
Zach Prezkuta
c6061d598f
don't set a date as a group
2012-10-01 14:07:32 -06:00
fabrixxm
9d4fdee65d
Merge pull request #500 from fabrixxm/quattro-fontsoptions
...
Quattro fixes
2012-10-01 07:05:58 -07:00
Fabrixxm
864d022468
editpost: add short jot action text to edit post form
2012-10-01 10:00:25 -04:00
friendica
112fafcc81
consistent handling of scaled images when using imagick
2012-09-30 03:25:20 -07:00
friendica
e60c729b51
Merge pull request #495 from fermionic/email-optimization
...
send less messages to server; remove delete option
2012-09-30 01:58:07 -07:00
friendica
c9536ac056
Merge pull request #498 from fermionic/more-robust-tag-conversion
...
allow tagging of people by name or nickname
2012-09-30 01:55:23 -07:00
Zach Prezkuta
421c72d10f
remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters
2012-09-29 17:56:50 -06:00
Zach Prezkuta
ce73cd560f
allow tagging of people by name or nickname
2012-09-29 17:55:40 -06:00
