Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 1 | -3/+3 |
|\ | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | Moved Diaspora notes away from top, per user request | Thomas Willingham | 2012-04-02 | 1 | -3/+3 |
|/ | |||||
* | don't allow multiple friends with http/https same person, don't show mail2 ↵ | friendica | 2012-03-14 | 1 | -3/+18 |
| | | | | coming soon unless person is allowed to have email contacts | ||||
* | Merge branch 'pull' | friendica | 2012-03-13 | 1 | -1/+1 |
|\ | |||||
| * | Avoid notices | Tobias Hößl | 2012-02-28 | 1 | -1/+1 |
| | | |||||
* | | invite potential connectees to the free social web | friendica | 2012-03-13 | 1 | -1/+7 |
|/ | |||||
* | mod/dfrn_request.php and templates - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -1/+1 |
| | |||||
* | new notifications - implement storage | friendica | 2012-02-18 | 1 | -0/+1 |
| | |||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 1 | -0/+0 |
| | | | | permissions, this will make a nasty commit) | ||||
* | add verb and item to notifications to aid in localisation | friendica | 2012-01-03 | 1 | -1/+3 |
| | |||||
* | notify_intro | friendica | 2011-12-26 | 1 | -16/+14 |
| | |||||
* | separate dfrn introductions from email when it comes to expiration of ↵ | friendica | 2011-12-11 | 1 | -1/+31 |
| | | | | blocked requests | ||||
* | more social graph stuff | Friendika | 2011-11-01 | 1 | -5/+7 |
| | |||||
* | name change continued, social graph tools and stuctures, fix for spanish ↵ | Friendika | 2011-10-31 | 1 | -6/+8 |
| | | | | province name | ||||
* | faster friend requests (DFRN) | Friendika | 2011-09-06 | 1 | -4/+5 |
| | |||||
* | bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of ↵ | Friendika | 2011-09-05 | 1 | -3/+11 |
| | | | | security warnings | ||||
* | dfrn friendship issue | Friendika | 2011-08-18 | 1 | -16/+14 |
| | |||||
* | cleanup | Friendika | 2011-08-07 | 1 | -2/+2 |
| | |||||
* | some more zot changes migrating back to f9a mainline | Friendika | 2011-08-01 | 1 | -3/+3 |
| | |||||
* | more calendar work, undo strict_privacy flag to use different approach | Friendika | 2011-06-08 | 1 | -5/+3 |
| | |||||
* | strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy ↵ | Friendika | 2011-06-06 | 1 | -4/+6 |
| | | | | issues | ||||
* | add info() function. Works like notice() but show messages in a div with ↵ | Fabio Comuni | 2011-05-23 | 1 | -4/+4 |
| | | | | | | | class info-message. update code to use info() instead of notice() when appropriate (non-error message) add info-message class style in themes | ||||
* | deprecate load_view_file | Friendika | 2011-05-11 | 1 | -5/+5 |
| | |||||
* | don't use load_view_file() except in email templates and install of htconfig ↵ | Friendika | 2011-05-10 | 1 | -3/+3 |
| | | | | - to avoid getting wrong file when package is updated by copying over an older version. | ||||
* | block_public should also block the contacts page and 'Connect' page if not ↵ | Friendika | 2011-04-21 | 1 | -0/+10 |
| | | | | logged in | ||||
* | "profile locator/address" is now called "Identity Address" to reduce confusion | Friendika | 2011-04-14 | 1 | -2/+3 |
| | |||||
* | set utf-8 on all emails | Friendika | 2011-04-14 | 1 | -1/+4 |
| | |||||
* | more templates | Friendika | 2011-04-06 | 1 | -1/+3 |
| | |||||
* | dfrn remote profile protocol revision | Friendika | 2011-03-30 | 1 | -1/+1 |
| | |||||
* | placeholder arg in dfrn conversations | Friendika | 2011-03-30 | 1 | -1/+1 |
| | |||||
* | secure profile failure | Friendika | 2011-03-30 | 1 | -1/+1 |
| | |||||
* | Fix spaces around t() and tt() | fabrixxm | 2011-03-13 | 1 | -1/+1 |
| | |||||
* | update source strings | fabrixxm | 2011-03-11 | 1 | -8/+8 |
| | |||||
* | typo | Friendika | 2011-01-22 | 1 | -1/+1 |
| | |||||
* | don't urlencode $_GET vars | Friendika | 2011-01-21 | 1 | -2/+6 |
| | |||||
* | add contact edit hooks | Friendika | 2011-01-07 | 1 | -1/+1 |
| | |||||
* | friend request homecoming - ensure login redirects back to confirmation page, | Friendika | 2011-01-07 | 1 | -1/+24 |
| | | | | prune old introductions that remain blocked over 30 minutes. | ||||
* | schema typo | Friendika | 2011-01-06 | 1 | -0/+6 |
| | |||||
* | try to auto-fill the profile address if we actually do know it. | Friendika | 2011-01-01 | 1 | -2/+30 |
| | |||||
* | double profile image on friend requests | Friendika | 2010-12-22 | 1 | -1/+0 |
| | |||||
* | block connection/friend request spam | Friendika | 2010-12-20 | 1 | -6/+23 |
| | |||||
* | pull strings from connection request templates | Friendika | 2010-12-16 | 1 | -0/+14 |
| | |||||
* | clean up comments | Friendika | 2010-12-14 | 1 | -38/+93 |
| | |||||
* | replace quick fix with correct fix | Friendika | 2010-12-12 | 1 | -2/+1 |
| | |||||
* | display request issue | Friendika | 2010-12-12 | 1 | -0/+1 |
| | |||||
* | profile load optimisation | Friendika | 2010-12-11 | 1 | -1/+0 |
| | |||||
* | couple of issues w/ profile photo update propogation | Friendika | 2010-11-09 | 1 | -0/+2 |
| | |||||
* | lint | Friendika | 2010-11-07 | 1 | -1/+1 |
| | |||||
* | two-way subscriptions working with federated social accounts | Mike Macgirvin | 2010-10-25 | 1 | -2/+6 |
| | |||||
* | add nicknames to contact records (going forward and retroactive) | Mike Macgirvin | 2010-10-23 | 1 | -4/+6 |
| |