Commit graph

73 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
18bf5d1402 theme info (like plugin info) 2012-02-25 00:30:14 -08:00
friendica
9441ff5142 string update for 2.38 2012-02-24 22:47:43 -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
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
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 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
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 2011-04-06 19:42:35 -07:00
Friendika
f1db34eebc more templates gone 2011-03-29 17:19:12 -07:00
Friendika
e1fd2ecb16 another template 2011-03-29 15:27:14 -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
Friendika
94cbf3bb80 another template down 2011-03-21 04:10:08 -07:00
Friendika
82bd1ce3cb installation issues 2011-03-21 03:33:58 -07:00
Friendika
798c83b6aa localise some more templates 2011-03-21 00:21:35 -07:00
fabrixxm
d6b4940ddd extract.php extract tt(). Updated strings.php 2011-03-13 13:51:59 +01:00
Friendika
0de88eb6b0 yet another template converted to language neutral format 2011-03-08 18:53:52 -08:00
Friendika
989b1b209e one more template free from translation, allow for later item editing within jot.tpl 2011-03-07 19:58:22 -08:00
Friendika
c98ed12e10 generalise wallwall template and fix "via wall-to-wall" float 2011-02-24 02:32:46 -08:00
Friendika
15780914ec another template made language neutral 2011-02-23 19:30:57 -08:00
Friendika
f57f9852b1 pulled strings from one more template 2011-02-22 15:35:33 -08:00
Friendika
c10879efdd default publish to directory, but offer registration privacy setting.
generalise publish option template - so once translated we can merge them all.
Update strings.
2011-02-21 16:50:06 -08:00
Friendika
c5f5102396 Merge branch 'fabrixxm-master'
Conflicts:
	addon/statusnet/statusnet.php
	util/strings.php
2011-02-15 13:40:25 -08:00
Friendika
603dc34fa0 parens in english string 2011-02-15 13:33:33 -08:00
Fabio Comuni
97723ad69f Fixed parentheses in translable string in statusnet.php. Rebulid util/strings.php. Update it/strings 2011-02-15 15:09:29 +01:00
Fabio Comuni
1bb9effd38 fin un util/strings 2011-02-15 14:41:48 +01:00
Friendika
1d12a2be69 string update 2011-02-09 00:53:51 -08:00
Friendika
e2c8bedfe5 allow changing album name in photo edit page 2011-02-03 15:13:38 -08:00
Friendika
46c37fc779 string update, allow js_upload file selection text to be localised 2011-02-02 16:51:55 -08:00
Friendika
33037754d8 removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default. 2011-01-27 18:45:19 -08:00
Friendika
b1d67c8d3c network view all item types by date 2011-01-19 17:56:36 -08:00