Commit Graph

348 Commits

Author SHA1 Message Date
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica 145713c8e2 string update 2012-04-04 15:51:56 -07:00
friendica 32b346f5f1 string update 2012-03-30 04:53:00 -07:00
friendica a5e7c73e67 string update 2012-03-06 15:09:57 -08:00
friendica 8473444242 string update 2012-03-05 16:43:44 -08:00
friendica 9441ff5142 string update for 2.38 2012-02-24 22:47:43 -08:00
friendica 3e85c1d330 make 'x minutes ago' fully translateable with argument ordering. string update. 2012-02-12 17:15:09 -08:00
friendica 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
zottel 690436bd1b Update messages.po 2012-01-10 08:22:53 -08:00
Fabio Comuni 49507a4356 Update messages.po 2011-12-14 16:11:07 +01:00
friendica adcaefce89 string update 2011-12-13 19:21:55 -08:00
friendica b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
Fabio Comuni dc3d47edcf update messages.po 2011-11-15 17:42:45 +01:00
Friendika 32808a934d string update 2011-10-18 04:28:36 -07:00
Friendika d723ff4770 diaspora top level status posts, string update 2011-08-14 21:23:02 -07:00
Friendika 48ffa880f0 cleanup 2011-08-07 16:15:54 -07:00
Friendika 5a0690d940 add attachments to FB posts, fix paren string in statusnet, do not insert attach div into post if no attachments 2011-05-26 06:46:55 -07:00
Friendika cd536731c3 minor string update 2011-05-25 17:20:41 -07:00
Fabio Comuni ad2aded259 Small tweak to a copule of translatable strings 2011-05-25 12:23:45 +02:00
Fabio Comuni dd32a2366c update messages.po 2011-05-23 12:00:53 +02:00
Fabio Comuni 4c2c14d34c Update run_xgettext script and util/messages.po to use with transifex. Fix to po2php 2011-05-10 14:20:00 +02:00
Friendika 0f261ef8fa configurable FB poll interval, default 1hr. 2011-05-02 20:14:37 -07:00
Friendika d45ad7bb6b suppress duplicate FB posts (incoming after posted locally) 2011-04-27 04:24:00 -07:00
Friendika a0e7d8fa00 redirect to profile photo upload on very first login 2011-04-23 17:31:23 -07:00
Friendika afe4cc8bfa pull request #91 fabrixxm (manual merge) 2011-04-20 04:50:12 -07:00
Friendika 3787e1e500 provide disclosure warning on private network page 2011-04-19 21:09:25 -07:00
Friendika d874a55178 per contact network page (link in photo menu) 2011-04-19 20:50:02 -07:00
Friendika a0179235d2 provide a way to disable mailbox integration 2011-04-18 20:20:04 -07:00
Friendika 9e54a070c2 string update 2011-04-18 15:52:31 -07:00
Friendika 158b65894a initial checkin mailbox reading functions - lots more to do 2011-04-15 19:16:37 -07:00
Friendika 44c47f118c "profile locator/address" is now called "Identity Address" to reduce confusion 2011-04-14 20:37:42 -07:00
Friendika 6683560c7e upd8 readme 2011-04-13 21:14:09 -07:00
Friendika d4bb560e7f small wording change 2011-04-12 21:37:54 -07:00
Friendika 2d7366bf81 profile visibility editor 2011-04-12 21:23:21 -07:00
Friendika 5654ce926c move all message display sub-functions from boot.php into conversation.php 2011-04-12 17:58:16 -07:00
Fabio Comuni 969cc6996a Fix a typo, updated IT strings 2011-04-08 12:35:42 +02:00
Friendika e35a5bac55 the rest of the english html templates except for htconfig 2011-04-07 23:10:43 -07:00
Friendika 338ba48554 more templates 2011-04-07 18:00:35 -07:00
Friendika 4043ede080 more templates 2011-04-06 23:03:54 -07:00
Friendika c32ed16303 more templates converted to string files 2011-04-06 22:42:08 -07:00
Friendika 6728a11ee3 support feed attachments/enclosures, and fix for bug #30 2011-04-06 19:42:35 -07:00
Friendika f1db34eebc more templates gone 2011-03-29 17:19:12 -07:00
Fabio Comuni 1f1fe4d5be Merge branch 'master' of github.com:fabrixxm/friendika 2011-03-23 14:04:35 +01:00
Fabio Comuni 4a14269349 Added plural string for contact block 2011-03-23 13:58:46 +01:00
fabrixxm 9350489615 Updated util/messages.po 2011-03-22 08:16:40 +01:00
Fabio Comuni 7df8e18dd1 Update more strings 2011-03-18 11:02:42 +01:00
fabrixxm a00beafe7f updated strings 2011-03-11 07:28:13 +01:00
fabrixxm 9f7878057f update source strings 2011-03-11 00:22:21 +01:00