mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
1 972 Commity
3 Gałęzie
64 Tagi
224 MiB
Wykres commitów

741 Commity (4e8a97f30a585eb707081a9216f840eb443a8764)

Autor SHA1 Wiadomość Data
Friendika ba99ce3d0a Merge branch 'master' of https://github.com/erikl/friendika into erikl-master 2011-03-24 04:06:01 -07:00
Friendika 51447932f7 link same as visited 2011-03-24 01:16:14 -07:00
Friendika f0bd849555 Merge branch 'fabrixxm-master' 2011-03-23 14:32:23 -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
erik af12c696cb Edited view/sv/strings.php via GitHub 2011-03-22 14:12:33 -07:00
erik eb02adb163 Edited view/sv/wall_received_eml.tpl via GitHub 2011-03-22 12:22:25 -07:00
erik 93b1f32170 Edited view/sv/settings_nick_unset.tpl via GitHub 2011-03-22 12:21:15 -07:00
erik 0353b36f5d Edited view/sv/settings_nick_subdir.tpl via GitHub 2011-03-22 12:19:04 -07:00
erik 42a5eb5d9b Edited view/sv/settings_nick_set.tpl via GitHub 2011-03-22 12:18:09 -07:00
erik b57b89516f Edited view/sv/settings.tpl via GitHub 2011-03-22 12:17:25 -07:00
erik fe7e6ad064 Edited view/sv/request_notify_eml.tpl via GitHub 2011-03-22 12:14:59 -07:00
erik 250d467f33 Edited view/sv/registrations.tpl via GitHub 2011-03-22 12:13:15 -07:00
erik 8c245a5d2f Edited view/sv/registrations-top.tpl via GitHub 2011-03-22 12:12:23 -07:00
erik 61ba37b1ed Edited view/sv/register_verify_eml.tpl via GitHub 2011-03-22 12:11:15 -07:00
erik b2089c559c Edited view/sv/register_open_eml.tpl via GitHub 2011-03-22 12:08:25 -07:00
erik aa0915a2ad Edited view/sv/pwdreset.tpl via GitHub 2011-03-22 12:07:38 -07:00
erik a7601bc1a6 Edited view/sv/profile-in-netdir.tpl via GitHub 2011-03-22 12:04:06 -07:00
erik 5dae05f275 Edited view/sv/profile-in-directory.tpl via GitHub 2011-03-22 12:03:00 -07:00
erik 2856664eeb Edited view/sv/profile-hide-friends.tpl via GitHub 2011-03-22 12:01:47 -07:00
erik 59a7ff8331 Edited view/sv/profile_tabs.tpl via GitHub 2011-03-22 12:00:49 -07:00
erik 5ead1a8599 Edited view/sv/profile_photo.tpl via GitHub 2011-03-22 11:59:50 -07:00
erik 0cbe80aeea Edited view/sv/profile_listing_header.tpl via GitHub 2011-03-22 11:59:03 -07:00
erik 143b9ef1d5 Edited view/sv/profile_entry_default.tpl via GitHub 2011-03-22 11:58:04 -07:00
erik 6f2b633787 Edited view/sv/profile_edit.tpl via GitHub 2011-03-22 11:54:48 -07:00
erik 2e6f718f0d Edited view/sv/profile_advanced.php via GitHub 2011-03-22 11:53:34 -07:00
erik c7b671aa2d Edited view/sv/profile.php via GitHub 2011-03-22 11:07:18 -07:00
erik 15ef0e601e Edited view/sv/passchanged_eml.tpl via GitHub 2011-03-22 11:05:36 -07:00
erik 196ba3c51a Edited view/sv/pagetypes.tpl via GitHub 2011-03-22 11:04:26 -07:00
erik 82bf55666f Edited view/sv/msg-header.tpl via GitHub 2011-03-22 11:03:30 -07:00
erik 90826f8a7d Edited view/sv/mail_received_text_body_eml.tpl via GitHub 2011-03-22 11:02:24 -07:00
erik 091cecec02 Edited view/sv/mail_received_html_body_eml.tpl via GitHub 2011-03-22 11:01:09 -07:00
erik 0f61fa8de1 Edited view/sv/lostpass_eml.tpl via GitHub 2011-03-22 10:59:40 -07:00
erik d578c45ef8 Edited view/sv/lostpass.tpl via GitHub 2011-03-22 10:58:50 -07:00
erik f88b5f75ad Edited view/sv/jot-header.tpl via GitHub 2011-03-22 10:58:03 -07:00
erik 02975027da Edited view/sv/intros-top.tpl via GitHub 2011-03-22 10:57:00 -07:00
erik ea1a69c84f Edited view/sv/intro_complete_eml.tpl via GitHub 2011-03-22 10:56:22 -07:00
erik 06b76e47d9 Edited view/sv/install_db.tpl via GitHub 2011-03-22 10:55:11 -07:00
erik 2f982c9332 Edited view/sv/insecure_net.tpl via GitHub 2011-03-22 10:54:20 -07:00
erik d99d46631e Edited view/sv/head.tpl via GitHub 2011-03-22 10:52:45 -07:00
erik f8faa73fb8 Edited view/sv/group_new.tpl via GitHub 2011-03-22 10:51:30 -07:00
erik fff72ffe27 Edited view/sv/group_edit.tpl via GitHub 2011-03-22 10:50:36 -07:00
erik 189abd2edf Edited view/sv/friend_complete_eml.tpl via GitHub 2011-03-22 10:48:52 -07:00
erik 9b7df09e7a Edited view/sv/follow_notify_eml.tpl via GitHub 2011-03-22 10:46:49 -07:00
erik 232ed2bdc5 Edited view/sv/directory_header.tpl via GitHub 2011-03-22 10:45:16 -07:00
erik bc49c08dc7 Edited view/sv/dfrn_req_confirm.tpl via GitHub 2011-03-22 10:43:45 -07:00
erik 4eb8270fbe Edited view/sv/cropbody.tpl via GitHub 2011-03-22 10:42:02 -07:00
erik 8747c12c80 Edited view/sv/contact_edit.tpl via GitHub 2011-03-22 10:41:01 -07:00
erik 6b1348c5f2 Edited view/sv/cmnt_received_eml.tpl via GitHub 2011-03-22 10:38:31 -07:00
erik 771acb9cf7 Edited view/sv/follow_notify_eml.tpl via GitHub 2011-03-22 10:36:15 -07:00
erik 8de46dbc0d Edited view/sv/directory_header.tpl via GitHub 2011-03-22 10:33:24 -07:00
erik 6c41e6af61 Edited view/sv/dfrn_req_confirm.tpl via GitHub 2011-03-22 10:32:07 -07:00
erik 4a14e51e25 Edited view/sv/cropbody.tpl via GitHub 2011-03-22 10:29:53 -07:00
erik 7c3f3f92c9 Edited view/sv/contact_edit.tpl via GitHub 2011-03-22 10:28:44 -07:00
erik 37811e691b Edited view/sv/cmnt_received_eml.tpl via GitHub 2011-03-22 10:26:49 -07:00
erik 26f0b37738 commit001 2011-03-22 18:09:19 +01:00
erik 2102ca2fc0 commit001 2011-03-22 18:09:19 +01:00
erik a5bca7ea4e commit001 2011-03-22 18:09:02 +01:00
erik a5e1a4b1dc Edited view/sv/group_new.tpl via GitHub 2011-03-22 07:48:22 -07:00
erik 60c9c444dc Edited view/sv/directory_header.tpl via GitHub 2011-03-22 07:45:05 -07:00
erik c3db186bd9 Edited view/sv/cropbody.tpl via GitHub 2011-03-22 07:42:30 -07:00
erik 29972b4005 Edited view/sv/profile_entry_default.tpl via GitHub 2011-03-22 07:27:07 -07:00
erik 9672d22797 Edited view/sv/profile_listing_header.tpl via GitHub 2011-03-22 07:26:00 -07:00
Friendika c4b292a4f1 account/profile/contacts export 2011-03-22 03:07:46 -07:00
Olivier Migeot 19d7e7fefe Defined plurals (as explained by Fabio) 2011-03-22 10:28:22 +01:00
Friendika cd2a0802e4 horizontal match layout 2011-03-22 02:21:53 -07:00
Friendika 89977cd87c de keywords not saving 2011-03-21 23:54:03 -07:00
Friendika ee11a74d0b profile match 2011-03-21 21:43:22 -07:00
Friendika c74367e4c2 pagination in keyword match 2011-03-21 21:26:11 -07:00
Friendika 64e92f34d9 Merge branch 'omigeot-master' 2011-03-21 15:09:13 -07:00
Olivier Migeot b8b77adad5 More templates frenchized 2011-03-21 14:02:01 +01:00
Olivier Migeot 0926532323 Started to convert french translation to the new format. 2011-03-21 13:45:41 +01:00
Friendika 94cbf3bb80 another template down 2011-03-21 04:10:08 -07:00
Friendika 798c83b6aa localise some more templates 2011-03-21 00:21:35 -07:00
Friendika 5f9f03daf7 simplify insecure network warning 2011-03-20 19:29:01 -07:00
Friendika b7292bc673 user pref -> block remote wall posting 2011-03-20 17:54:50 -07:00
Friendika 2b0af1456c editor consistency on profile edit page 2011-03-20 15:51:09 -07:00
Fabio Comuni 894e88d792 Updated IT language 2011-03-18 14:35:41 +01:00
Friendika 9838245c6c Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext 2011-03-18 05:07:42 -07:00
Fabio Comuni 8ef6077d4d Update IT strings 2011-03-18 11:04:12 +01:00
Friendika 9f5201dcaa edit posting after submission 2011-03-18 00:30:34 -07:00
Friendika 6380d22229 better colour matching on toolbar, replace "share" with "recycle" 2011-03-17 17:31:39 -07:00
Friendika a5d5ae5efa updated swedish templates 2011-03-17 15:26:45 -07:00
Friendika 0bce69fe9c swedush string update via erikl 2011-03-17 14:55:25 -07:00
Friendika 40956faf6d swedish string update via erikl 2011-03-17 14:54:15 -07:00
Friendika 6b37e6d48d Merge branch 'master' of http://github.com/erikl/friendika into erikl-master 
Conflicts:
	view/sv/contact_edit.tpl
	view/sv/strings.php
 2011-03-17 14:44:06 -07:00
Friendika 334353e502 vorbis audio/video link buttons 2011-03-16 21:14:22 -07:00
Friendika 9e1ca52e45 small position adjustment 2011-03-16 20:14:19 -07:00
Friendika 3f432a7b82 share,retweet,relay,forward, whatever 2011-03-16 19:36:59 -07:00
Friendika f01538a54f content expiration 2011-03-15 17:31:49 -07:00
Friendika 7b92b42603 keywords split into public and private. Public will be used by the friend finder. 2011-03-14 00:28:49 -07:00
Friendika 0d161c6ef6 Merge branch 'omigeot-master' 2011-03-13 19:13:40 -07:00
Friendika a912a0d3ca Swedish translation 2011-03-12 03:15:38 -08:00
Friendika ee210718cc photo album prev/next links 2011-03-11 20:06:13 -08:00
erik e94ae8d396 commit001 2011-03-11 20:12:32 +01:00
fabrixxm a00beafe7f updated strings 2011-03-11 07:28:13 +01:00
fabrixxm 692cb54d35 it messages 2011-03-11 07:12:16 +01:00
Friendika 35c3e12df5 ability to edit image permissions 2011-03-09 21:10:16 -08:00
Friendika d6e4cd9d6b bring loozah theme up to date, move name slightly lower 2011-03-09 17:59:26 -08:00
Friendika ddaa751222 Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11 2011-03-09 02:17:44 -08:00
Fabio Comuni a543ae6d8e Update search_item.tpl 2011-03-09 09:33:08 +01:00
Friendika 5f54503780 Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11 2011-03-09 00:17:47 -08:00
Fabio Comuni 37a87b0f58 reworked wall-to-wall style 2011-03-09 08:43:17 +01:00
Friendika 0de88eb6b0 yet another template converted to language neutral format 2011-03-08 18:53:52 -08:00
Friendika 0784c072ce Italian string file typo 2011-03-08 13:47:10 -08:00
Fabio Comuni b00abf7e32 reworked items template 2011-03-08 16:51:14 +01:00
Fabio Comuni e776024b3a Fix IT strings 2011-03-08 15:40:23 +01:00
olivierm 25c674b73a Merge remote branch 'mike/master' 2011-03-08 14:39:26 +01:00
Friendika c248b28f92 indicate preference to register/communicate-with real people and not fictitious entities. 2011-03-08 04:06:37 -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 216f038456 icon changes, feed security improvements 2011-03-04 20:55:32 -08:00
Friendika 3c076b53fe use prepare_text instead of prepare_body 2011-03-03 23:13:16 -08:00
Friendika 15d3be18a9 use prepare_body for text preparation 2011-03-03 22:53:20 -08:00
olivierm 593d7037c5 Slight change in strings (now guess better whether 'likes' are plural or singular) 2011-03-02 14:38:30 +01:00
Friendika 377f991ac5 switch identities to manage pages 2011-03-01 20:18:47 -08:00
Friendika 80ed4242ee singleuser site mode plus fix search template layout 2011-02-28 19:44:47 -08:00
Tobias Diekershoff 2b2d43cce5 more strings translated to German 2011-02-27 10:24:34 +01:00
Tobias Diekershoff efbe8a46f6 some more translations into German 2011-02-27 10:13:57 +01:00
Tobias Diekershoff 9d9efb2bee translated some more strings to German 2011-02-27 08:35:01 +01:00
Friendika 05d3eb59ec status.net mentions to non-followers require the numeric profile URL, not the nickname profile URL. Though it works when they are a follower. 2011-02-26 01:53:18 -08:00
Friendika 3195ad8d2e Totally tacky... 2011-02-24 19:17:52 -08:00
Friendika 32b9546d76 provide examples for relationship partner linkage 2011-02-24 19:04:37 -08:00
olivierm d2c47924eb Merge commit 'mike/master' 2011-02-24 18:52:08 +01:00
Friendika 5641532936 yet another template 2011-02-24 02:46:06 -08:00
Friendika c98ed12e10 generalise wallwall template and fix "via wall-to-wall" float 2011-02-24 02:32:46 -08:00
Friendika a247a3cedb another template down 2011-02-23 20:43:22 -08:00
Friendika b92150297f more consistency to plugins 2011-02-23 19:54:29 -08:00
Friendika 15780914ec another template made language neutral 2011-02-23 19:30:57 -08:00
Friendika 834439b730 cleanup plugin and post settings 2011-02-23 18:24:29 -08:00
olivierm 42d1474ff1 Changed greetings in french 2011-02-23 20:57:34 +01:00
olivierm a6870ceb41 More french templates. 2011-02-23 20:41:23 +01:00
olivierm 3ad7c395fb Merge commit 'mike/master' 2011-02-23 10:18:11 +01:00
Friendika a5b80e5d56 add some calendaring functions 2011-02-22 20:08:15 -08:00
Friendika f57f9852b1 pulled strings from one more template 2011-02-22 15:35:33 -08:00
olivierm fbf0459fb2 A little more french translation. 2011-02-22 19:14:11 +01:00
Friendika 99eef96822 clear float after title for items having title 2011-02-21 20:28:29 -08:00
Friendika d124c67322 remove note about accounts being hidden in register email 2011-02-21 18:32:26 -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 079e63bba9 Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm-themetests 2011-02-21 13:27:03 -08:00
Friendika 0bf8e418a8 Merge branch 'chriscase-master' 
Conflicts:
	mod/dfrn_notify.php
 2011-02-17 14:05:51 -08:00
Chris Case 9e654f7e57 removed localized multipart email templates, now the multipart settings are configured directly in the code 2011-02-17 13:41:56 -08:00
Fabio Comuni f5557763d2 Updates to theme dupuntozero 2011-02-17 17:29:29 +01:00
Fabio Comuni 3d69e2a50c Merge branch 'master' into themetests 2011-02-17 14:14:06 +01:00
Friendika 4bff52990e ajax reload fixes 2011-02-16 21:17:49 -08:00
Friendika 67bb737aa1 broken image + linkify site link in body 2011-02-16 17:49:52 -08:00
Friendika 9f1f9da89b Merge branch 'chriscase-master' 2011-02-16 14:41:12 -08:00
Chris Case 5aa6bbbbc5 fixed encoding, i had been experimenting with different ones and forgot to change it back, now UTF-8 2011-02-16 08:05:54 -08:00
Chris Case e56895123a changed message sending to use base64 encoding 2011-02-16 05:17:40 -08:00
Fabio Comuni dc15e8640d duepuntozero: show desc on image in albums 2011-02-16 12:49:16 +01:00
Friendika 9f02057374 provide permalink for posts, include permalinks in feeds and imported from feeds 2011-02-16 02:07:11 -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 48e2a6bde9 Updated it language 2011-02-15 14:53:55 +01:00
Tobias Diekershoff 7a6174298b deleted the translated file of comment_item.tpl 2011-02-15 10:56:07 +01:00
Tobias Diekershoff afdfc725b8 some translations into German 2011-02-15 09:49:38 +01:00
Friendika 0e7b09b41c bug #0000002, strip HTML from pasted text in prv messages 2011-02-14 21:33:17 -08:00
Friendika fe1a37074a Merge branch 'chriscase-master' 2011-02-14 05:06:16 -08:00
Chris Case 94e0c3c970 fixed the charset on the html version of the message, overlooked this in the last commit, now uses utf-8 in the meta tag 2011-02-14 04:54:44 -08:00
Friendika b87ddbd58a Merge branch 'ajaxcomms' 
Conflicts:
	view/comment_item.tpl
 2011-02-14 04:46:49 -08:00
Chris Case 5eebb373e5 revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it. Translated the french version of the private message template. 2011-02-14 03:59:54 -08:00
Friendika f37caa0999 try this again 2011-02-14 02:59:22 -08:00
Chris Case f98ba371cf updated private message notification to use HTML, still need the foreign language message notifications updated 2011-02-13 14:55:48 -08:00
Friendika ee46a028d6 more test ajax comments 2011-02-12 03:42:57 -08:00
Friendika 3d9845f4a4 preliminary ajax comment setups 2011-02-12 03:14:59 -08:00
Friendika 4081ebe6c5 correct color and indent on wall-wall comments 2011-02-12 02:07:16 -08:00
Friendika 7d0de6dfb7 trim excessive space around message body (though we still need 20px padding to accomodate scrollbars) 2011-02-12 01:51:29 -08:00
Friendika f79c215293 give all comment input form elements id's 2011-02-12 01:37:21 -08:00
Chris Case 8937ba86a2 set default size for profile photo to improve render appearance/speed 2011-02-11 18:52:30 -08:00
Chris Case 6745f07817 set size of contact images to improve rendering 2011-02-11 18:26:07 -08:00
Friendika 5e02519a13 disable network toggles when ACL's are entered 2011-02-11 04:32:38 -08:00
Friendika c16e86add8 toggles "post to facebook, post to twitter", etc. 2011-02-11 02:35:19 -08:00
Friendika ca826c7ff2 images were left behind in theme rename 2011-02-08 23:24:19 -08:00
Friendika e06cd399b7 close tag on favicon link missing 2011-02-07 23:28:41 -08:00
Friendika 147d7f3bbf theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme. 
Provide indication on contact edit page of last update success/failure - can be extended later to
show actual timestamp of last successful update.
 2011-02-06 15:50:50 -08:00
Tobias Diekershoff 09af200bcc german choose existing pic for the avatar 2011-02-06 08:51:10 +01:00
Tobias Diekershoff dd3f21b98a Merge branch 'master' of git://github.com/friendika/friendika 2011-02-06 08:48:07 +01:00
Friendika d322bb4613 Merge branch 'fabrixxm-master' 2011-02-05 13:06:20 -08:00
Friendika 8a55168d4f Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into fabrixxm-master 2011-02-05 13:05:57 -08:00
Friendika c26463b65b Merge branch 'omigeot-master' 
Conflicts:
	view/fr/strings.php
 2011-02-05 13:01:28 -08:00
Friendika c4ddee005e Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master 2011-02-05 12:59:04 -08:00
olivierm 4e913d59ea Fixed some typo (prevented Friendika to load with french locale) 2011-02-05 15:19:28 +01:00
Tobias Diekershoff 0c83fb4d80 Merge branch 'master' of git://github.com/friendika/friendika 2011-02-05 09:19:03 +01:00
Tobias Diekershoff acd5f49d43 wording 2011-02-04 21:56:43 +01:00
Fabio Comuni ebbdb7b301 Upload profile photo page it title 2011-02-04 10:32:29 +01:00
Fabio Comuni fb7959cfc0 Add a link to user photos in Upload Profile Photo page 2011-02-04 10:30:56 +01:00
fabrixxm 9cf04b6110 small fix to IT strings 2011-02-04 07:36:57 +01:00
Friendika e2c8bedfe5 allow changing album name in photo edit page 2011-02-03 15:13:38 -08:00
Friendika a4cbdc2414 remove self 2011-02-03 03:58:47 -08:00
Friendika 01c83f0e93 Merge branch 'tobiasd-master' 2011-02-02 23:55:16 -08:00
Tobias Diekershoff 5e73f9da86 double $ in de/strings.php corrected 2011-02-03 08:35:23 +01:00
Friendika 1558cd8085 Merge branch 'tobiasd-master' 2011-02-02 23:27:12 -08:00
Friendika 33b2490a91 Merge branch 'fabrixxm-master' 2011-02-02 23:24:04 -08:00
Tobias Diekershoff 73c2ccbc78 updates to the German strings.php file 2011-02-03 08:17:07 +01:00
Friendika 2a4d1fa858 append jotplugin tools to current toolbar row 2011-02-02 23:07:01 -08:00
fabrixxm 2f6ef7b5eb IT string update 2011-02-03 07:42:40 +01:00
fabrixxm 670dba6666 update jot-headers 2011-02-01 18:52:16 +01:00
Friendika 9d561d4471 oembed contsant name, fix dfrnpubdeliver, add 'code' editor button 2011-01-31 23:06:45 -08:00
Friendika 7dbdf8e6fa let there be purple! ;-) 2011-01-31 20:52:23 -08:00
Friendika 837cce8a75 email cc recipients (front end) 2011-01-31 19:07:13 -08:00
Friendika fc20fb17c2 force text paste in editor 2011-01-31 14:21:23 -08:00
Friendika 3eefe8b500 more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors 2011-01-30 19:38:03 -08:00