clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,587 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

615 Commits

Author SHA1 Message Date
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
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 58309829a1 Merge branch 'omigeot-master' 2011-01-27 13:10:43 -08:00
Friendika 1d9f677438 Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master 2011-01-27 13:09:58 -08:00
olivierm bfe6380d90 More translation 2011-01-27 16:50:39 +01:00
olivierm 8c6319394c Done head.tpl 2011-01-27 16:48:54 +01:00
olivierm e93385a355 French translation : Done strings.php, started template files. 2011-01-27 16:44:55 +01:00
Friendika 620aae5b50 still not quite ready for the big photos rollover 2011-01-27 03:55:40 -08:00
Friendika 076c25e103 Revert "Revert "roll version - now in alpha 2.1"" 
This reverts commit e8a3166fa9.
 2011-01-27 03:52:18 -08:00
Friendika e8a3166fa9 Revert "roll version - now in alpha 2.1" 
This reverts commit df4f77dadd.
 2011-01-27 03:50:56 -08:00
Friendika df4f77dadd roll version - now in alpha 2.1 2011-01-27 03:46:09 -08:00
Friendika d2dddd995a set update frequency to twice daily for 'feed' contacts, unable to set update frequency on contact edit form. 2011-01-26 20:29:32 -08:00
Friendika b4642ca650 search icons (?) 2011-01-26 14:25:36 -08:00
Friendika 05350082fa Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed 2011-01-26 13:59:20 -08:00
Fabio Comuni 6ca1e2ddfe remove fixed width from wall-item-content 2011-01-26 17:11:56 +01:00
Fabio Comuni 4a2c0fcc36 Add 'jot_tool' hook, plugins can add tool icons. 2011-01-26 16:17:28 +01:00
Friendika b23de4fa90 greenzero stripped to bare essentials, imported from duepuntozero 2011-01-25 04:30:46 -08:00
Friendika 167ab039ab renamed theme - it was a bit too long 2011-01-25 04:03:47 -08:00
Tobias Diekershoff 5eacc57800 Merge git://github.com/tobiasd/friendika 2011-01-25 12:47:02 +01:00
Tobias Diekershoff 529b036dbe some more strings translated into German 2011-01-25 12:44:14 +01:00
Fabio Comuni 1f95ba5c34 Merge remote branch 'friendika-master/master' 2011-01-25 10:16:47 +01:00
Fabio Comuni f2789132ce fixed width on wall-item-wrapper 2011-01-25 10:16:15 +01:00
Tobias Diekershoff ce6a2c83f9 a green variation of the duepuntozero theme 
for this variation of the theme the header image and the link colors
were set to some tone of green that fit my current likings.
 2011-01-25 09:04:08 +01:00
Tobias Diekershoff bb1afd867d Merge branch 'master' of git://github.com/friendika/friendika 2011-01-25 08:53:39 +01:00
Friendika b0ab3e468b leave room for vertical scrollbar (when needed) 2011-01-24 23:08:39 -08:00
Friendika fc5316fe21 allow a video and/or photo to fit with scrollbars 2011-01-24 20:21:14 -08:00
Friendika 0f64e1e623 restrict post height, we may back this out later and replace with [show all] toggles 2011-01-24 20:13:52 -08:00
fabrixxm a282042ffc Bigger subject in messages 2011-01-24 19:50:34 +01:00
Tobias Diekershoff 35918a9f1f Merge branch 'master' of git://github.com/friendika/friendika 2011-01-24 13:34:57 +01:00
Friendika 163e614a3b don't translate CR-LF 2011-01-24 03:08:20 -08:00
Fabio Comuni 7bb15680a3 Merge branch 'master' of github.com:fabrixxm/friendika 2011-01-24 09:38:05 +01:00
Tobias Diekershoff 4198efe035 Merge branch 'master' of git://github.com/friendika/friendika 2011-01-24 07:33:56 +01:00
Friendika 1100d7b958 sync template updates en => fr 2011-01-23 14:35:22 -08:00
Friendika f649692c25 Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master 2011-01-23 14:19:42 -08:00
fabrixxm 655ab0c526 IT strings fix 2011-01-23 18:18:55 +01:00
olivierm 320059a506 Done timezones + marital statuses and a few time-related translations 2011-01-23 16:49:15 +01:00
Tobias Diekershoff 43dc0b4280 updated profile_advanced.php from changes in view/en 2011-01-23 08:45:30 +01:00
Tobias Diekershoff 60c5e76b2d Merge branch 'master' of git://github.com/friendika/friendika 2011-01-23 08:43:30 +01:00
Friendika 844b177791 birthday timezone is absolute 2011-01-22 03:21:15 -08:00
Tobias Diekershoff 96620520a8 wording in email template adjusted 2011-01-22 09:20:52 +01:00
olivierm 70db9369b4 A little more... 2011-01-21 21:41:15 +01:00
olivierm 555a4e2fd8 More translation, added FIXME where not completely satisfying. 2011-01-21 18:39:51 +01:00
olivierm 0bb7777bfe Translated more french 2011-01-21 18:24:14 +01:00
Tobias Diekershoff 3f847d5b0f variable name spelling mistake in template corrected 2011-01-21 14:55:03 +01:00
Tobias Diekershoff 61f0a0d903 more strings 2011-01-21 13:18:51 +01:00
Tobias Diekershoff 258c79ccd9 spelling ;-) 2011-01-21 13:01:19 +01:00
Tobias Diekershoff ac845a1d95 minor wordening 2011-01-21 12:59:51 +01:00
Tobias Diekershoff 991185404c minor wording correction 2011-01-21 12:54:07 +01:00
Tobias Diekershoff 734476c5e2 minor correction to profile_edit.tpl more strings 2011-01-21 12:46:33 +01:00
Tobias Diekershoff b23c941991 made this notification header consisten with the other 2011-01-21 12:34:25 +01:00
Tobias Diekershoff a2723f8206 minor thing with the strings 2011-01-21 12:19:57 +01:00
Tobias Diekershoff 6a87fe4a0f german translation of registrations-top.tpl 2011-01-21 12:15:43 +01:00
Tobias Diekershoff 55fb33d85d some more strings 2011-01-21 12:05:26 +01:00
Tobias Diekershoff c61defb2b0 german translation of install_db.tpl 2011-01-21 11:54:04 +01:00
Tobias Diekershoff ffdcbd798f german translation of jot.tpl 2011-01-21 11:48:42 +01:00
Tobias Diekershoff a3ef818d1d german translation of lostpass.tpl and lostpass_eml.tpl 2011-01-21 11:36:30 +01:00
Tobias Diekershoff c199309e7d german translation of netfriend.tpl 2011-01-21 11:12:50 +01:00
Tobias Diekershoff 31ccd924f4 german translation of passchanged_eml.tpl pagetypes.tpl 2011-01-21 11:10:20 +01:00
olivierm 6035f22caf More strings translated for french locale. 2011-01-21 11:08:12 +01:00
Tobias Diekershoff 5863199b8d german translation of the profile* files 2011-01-21 10:58:32 +01:00
olivierm e1c0b5c7c5 Started the french translation (up to the "TODO" comment in view/fr/strings.php) 2011-01-21 10:39:15 +01:00
Tobias Diekershoff 57a1731678 german translation of pwdreset.tpl 2011-01-21 10:27:23 +01:00
Tobias Diekershoff 38ede4f3be german translation of register-link.tpl 2011-01-21 10:24:18 +01:00
Tobias Diekershoff 41bba5534e german translation of register_open_eml.tpl 2011-01-21 10:23:10 +01:00
Tobias Diekershoff 10be4f6d29 german translation of register_verify_eml.tpl 2011-01-21 10:14:29 +01:00
Tobias Diekershoff d4496c5118 german translation of request_notify_eml.tpl 2011-01-21 10:03:51 +01:00
Tobias Diekershoff 5b0db3d228 german translation of wallwall_item.tpl 2011-01-21 09:59:13 +01:00
Tobias Diekershoff bd512ab60c Merge branch 'master' of git://github.com/friendika/friendika 2011-01-21 07:09:51 +01:00
fabrixxm 707b4eed6f Fixs to IT languages 2011-01-20 20:19:56 +01:00
Tobias Diekershoff ed37b1d166 german translation of settings_nick_set.tpl 2011-01-20 18:45:48 +01:00
Tobias Diekershoff b4049f67ea german translation of settings_nick_subdir.tpl 2011-01-20 18:21:32 +01:00
Tobias Diekershoff 723aca6109 german translation of settings_nick_unset.tpl 2011-01-20 18:15:12 +01:00
Tobias Diekershoff 76ed216aaa german translation of wall_item_drop.tpl 2011-01-20 18:01:04 +01:00
Tobias Diekershoff 787496b7c2 german translation of settings.tpl 2011-01-20 16:43:59 +01:00
Tobias Diekershoff 07db945921 german translation of wall_received_eml.tpl 2011-01-20 15:43:51 +01:00
Tobias Diekershoff a8b9b21915 Merge branch 'master' of git://github.com/friendika/friendika 2011-01-20 08:17:41 +01:00
Friendika b1d67c8d3c network view all item types by date 2011-01-19 17:56:36 -08:00
Tobias Diekershoff b43ec25955 german translation mail_received_eml.tpl 2011-01-19 16:37:59 +01:00
Tobias Diekershoff ea010de863 german translation of like.tpl 2011-01-19 16:33:42 +01:00
Tobias Diekershoff ba9e85261b german translation of jot-header.tpl 2011-01-19 16:27:28 +01:00
Tobias Diekershoff 387e1aefbc german translations of insecure_net.tpl intro_complete_eml.tpl and 
intros-top.tpl
 2011-01-19 16:21:41 +01:00
Tobias Diekershoff 5702782caa german translation of friend_complete_eml.tpl 2011-01-19 15:45:55 +01:00
Tobias Diekershoff fcf1f573e8 german translation of group_new.tpl 2011-01-19 15:33:23 +01:00
Tobias Diekershoff 990aafbfcf german translation of view/dev/group_edit.tpl 2011-01-19 15:32:19 +01:00
Tobias Diekershoff 8a17ce6da1 added 2011-01-19 15:31:50 +01:00
Tobias Diekershoff d8f9458663 Merge branch 'master' of git://github.com/friendika/friendika 2011-01-19 15:21:06 +01:00
Fabio Comuni ab72d86aa7 Small fixs to IT language 2011-01-19 14:48:30 +01:00
Friendika b40281802f personal title 2011-01-18 19:25:28 -08:00
Tobias Diekershoff 468c182405 german translation view/de/follow_notify_eml.tpl 2011-01-18 13:44:46 +01:00
Tobias Diekershoff 6c42edf351 german translation view/de/directory_header.tpl 2011-01-18 12:47:03 +01:00
Tobias Diekershoff 11d95896f2 german translation of view/de/dfrn_req_confirm.tpl 2011-01-18 12:46:13 +01:00
Tobias Diekershoff f7b0a4569d german translation of view/de/cropbody.tpl 2011-01-18 12:44:28 +01:00
Tobias Diekershoff fe00d451a7 german translation of view/de/contact_edit.tpl 2011-01-18 11:40:27 +01:00
Tobias Diekershoff 80e77516c8 german translation of cmnt_received_eml.tpl 2011-01-18 11:24:52 +01:00
Tobias Diekershoff 0c77263a85 update to view/en placed into de 2011-01-18 11:18:23 +01:00
Tobias Diekershoff 8b99779181 Merge branch 'master' of git://github.com/friendika/friendika 2011-01-18 11:05:18 +01:00
Fabio Comuni bb2130ca7f Mods to duepuntozero .shiny class 2011-01-17 11:45:06 +01:00
Friendika 2e0a3e0693 birthday notifications: missing div close 2011-01-16 17:56:26 -08:00
Friendika fa9e1a9abb apply date translation to birthday in profiles 2011-01-16 15:23:34 -08:00
Tobias Diekershoff b5c9f80919 some more German translation 2011-01-15 21:13:42 +01:00
Tobias Diekershoff 31d7973e7f some more German strings 2011-01-15 14:39:16 +01:00
Tobias Diekershoff abf976bb36 Merge branch 'master' of git://github.com/friendika/friendika 2011-01-15 08:55:19 +01:00
fabrixxm 061e6eb33b Updated IT language 2011-01-14 20:33:12 +01:00
Friendika a1c069ee02 compatibility: version discovery 2011-01-14 02:04:09 -08:00
Tobias Diekershoff a118f83ee2 initial stuff for the german translation 2011-01-14 10:28:19 +01:00
Friendika 5bfb0ba4c2 birthday notifications working 2011-01-13 20:28:33 -08:00
Friendika 9d6f3aa4dd add owner's birthday information to feed (if allowed to) 2011-01-12 21:04:49 -08:00
Friendika 2d80c601df string extraction 2011-01-12 12:44:22 -08:00
Friendika 6048d89fd2 moved notify counters (.nav-ajax) down to match new layout 2011-01-07 12:23:17 -08:00
fabrixxm 29f483c71c removed FreeSans font, changed .shiny background, fixed head area 2011-01-07 16:56:12 +01:00
Friendika 335abb6a09 darkness theme cleanup 2011-01-07 04:45:39 -08:00
Friendika 4d1e68e430 darkness: input fields were invisible 2011-01-07 04:38:30 -08:00
Friendika d1432fe7b5 more goldenrod stuff 2011-01-07 04:26:15 -08:00
Friendika d3a826947f fix goldenrod after recent changes 2011-01-07 04:23:41 -08:00
Friendika fd1abe1c54 undo freesans temporarily due to poor legibility. 2011-01-06 13:26:25 -08:00
fabrixxm 0d73897b3a Added shiny class to duepuntozero theme 2011-01-06 16:03:03 +01:00
fabrixxm c967f55bad make the name stand out another bit more, and load FreeSans font from site in css3-enabled browsers 2011-01-05 19:18:13 +01:00
Friendika b358e8afe2 make the name stand out just a bit more 2011-01-05 04:00:36 -08:00
Friendika 16d2682610 fix geolocation 2011-01-05 02:32:18 -08:00
fabrixxm 0df91fd9a2 Manage user registrations in REGISTER_APPROVE mode. 2011-01-04 14:46:08 +01:00
fabrixxm 2bf99df385 Updated IT strings 2011-01-04 13:04:23 +01:00
Friendika a51a1007a3 email check failed, translate wall_item template 2011-01-03 13:26:43 -08:00
Friendika 36b241c02b change activitystreams unfollow to stop-follow but also send out OStatus unfollow 2011-01-03 05:58:27 -08:00
fabrixxm 9ebd34b703 Fix secure cursor and aside position in duepuntozero theme 2011-01-03 09:49:50 +01:00
fabrixxm 0e45c4332a Fix to Italian language 2011-01-03 09:48:41 +01:00
fabrixxm 43283fd35f Merge branch 'friendika-master' 2011-01-03 09:45:13 +01:00
Friendika b3f39aa2b0 alt profiles not clickable 2011-01-02 14:30:17 -08:00