Commit Graph

1126 Commits (ac3f3a6e9fb46ab608f26d4dfc12ee631e0e453a)
 

Author SHA1 Message Date
Friendika ac3f3a6e9f kill orphans
12 years ago
Friendika 073f3720ac Merge branch 'tobiasd-master'
12 years ago
Friendika 4e63b0acb9 ensure that jot_plugins inherit '$visitor' correctly
12 years ago
Tobias Diekershoff 09af200bcc german choose existing pic for the avatar
12 years ago
Tobias Diekershoff dd3f21b98a Merge branch 'master' of git://github.com/friendika/friendika
12 years ago
Friendika d322bb4613 Merge branch 'fabrixxm-master'
12 years ago
Friendika 8a55168d4f Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into fabrixxm-master
12 years ago
Friendika c26463b65b Merge branch 'omigeot-master'
12 years ago
Friendika c4ddee005e Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master
12 years ago
olivierm 4e913d59ea Fixed some typo (prevented Friendika to load with french locale)
12 years ago
Tobias Diekershoff 0c83fb4d80 Merge branch 'master' of git://github.com/friendika/friendika
12 years ago
Friendika 8cced061bb found it - typo
12 years ago
Friendika 1d0d765344 more error checking on posts
12 years ago
Tobias Diekershoff acd5f49d43 wording
12 years ago
Friendika 6bb8f677c2 Merge branch 'fabrixxm-master'
12 years ago
Friendika 2a9bfae2b7 prevent runaway notifications when parent=0 due to race condition
12 years ago
Fabio Comuni ebbdb7b301 Upload profile photo page it title
12 years ago
Fabio Comuni fb7959cfc0 Add a link to user photos in Upload Profile Photo page
12 years ago
Fabio Comuni d72f248b3c Allow to set a photo from albums as profile photo
12 years ago
Fabio Comuni cc6a5f59b4 Merge branch 'master' of https://github.com/friendika/friendika.git
12 years ago
Friendika 5c98032893 Merge branch 'photos' of https://github.com/fabrixxm/friendika into fabrixxm-photos
12 years ago
fabrixxm 9cf04b6110 small fix to IT strings
12 years ago
Friendika 1eef647edb warn folks that changing your domain name after making friends is not supported at this time.
12 years ago
Friendika ac3cbe380f found the issue - remove the extra tracing stuff
12 years ago
Friendika c6b00f7230 allow parentless items from SN - add more tracing on notify failures
12 years ago
Friendika e2c8bedfe5 allow changing album name in photo edit page
12 years ago
fabrixxm b5c3fb1545 remove an erroneously pasted line
12 years ago
Fabio Comuni c15c550a06 Fix tabs
12 years ago
Fabio Comuni bed0391e6f Show lock info on photos
12 years ago
Fabio Comuni 9b3131861f Extend lockview to show info on items, photos and events
12 years ago
Friendika 01cd7cc9f2 don't parse garbage in phase2 of dfrn_deliver either
12 years ago
Friendika a4cbdc2414 remove self
12 years ago
Friendika 01c83f0e93 Merge branch 'tobiasd-master'
12 years ago
Tobias Diekershoff 5e73f9da86 double $ in de/strings.php corrected
12 years ago
Friendika 1558cd8085 Merge branch 'tobiasd-master'
12 years ago
Friendika 33b2490a91 Merge branch 'fabrixxm-master'
12 years ago
Tobias Diekershoff 73c2ccbc78 updates to the German strings.php file
12 years ago
Friendika 2a4d1fa858 append jotplugin tools to current toolbar row
12 years ago
fabrixxm 2f6ef7b5eb IT string update
12 years ago
fabrixxm 97bb80c00f Merge branch 'friendika-master'
12 years ago
Friendika 0a32370e32 silence php notices about $manual_id not being defined
12 years ago
Friendika a8cea3f30c don't try to parse non-xml in dfrn_deliver
12 years ago
Friendika 25c2640c17 be more forgiving about the order of link parameters in html->bb
12 years ago
Friendika 1a18f4bcde get media-rss thumbnail if available and nothing else was found (e.g. github).
12 years ago
Friendika 46c37fc779 string update, allow js_upload file selection text to be localised
12 years ago
Friendika ee45dee932 suppress some scraping errors when confronted with hybrid/strange
12 years ago
fabrixxm a3fd84661f Merge branch 'friendika-master'
12 years ago
Friendika fce9988f73 backward compatibility
12 years ago
Friendika a347d040f0 protocol reversal, roll dfrn_version to 2.1
12 years ago
Friendika 777c47aaa6 silence a few notice warnings
12 years ago