jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2166 commits 10 branches 58 tags 216 MiB
Commit graph

819 commits

Author SHA1 Message Date
Friendika
44c47f118c "profile locator/address" is now called "Identity Address" to reduce confusion 2011-04-14 20:37:42 -07:00
Friendika
b5ccb8e205 ensure host xrd is correct, even if installed in subpath 2011-04-14 19:43:00 -07:00
Friendika
e88cf38604 spanish translation update 2011-04-14 15:20:25 -07:00
Friendika
54368e3a0d initial spanish translation 2011-04-14 02:34:43 -07:00
Fabio Comuni
0afef6b17e arrays and simple conditional blocks in template, template for nav, load templates from themes 2011-04-14 09:22:38 +02:00
Friendika
df67793559 sync recent update to loozah theme 2011-04-13 21:26:39 -07:00
Friendika
974077c06c contact "repair/relocate URL" tool 2011-04-13 20:14:30 -07:00
Friendika
5198e039df better visibility of default post permissions 2011-04-13 17:11:24 -07:00
Friendika
17a7dae67d doco 2011-04-13 16:58:21 -07:00
Olivier Migeot
0c9c4c1714 Fixed plurals def 2011-04-13 14:49:44 +02:00
Olivier Migeot
e051fa3605 Merge remote branch 'mike/master' 2011-04-13 14:25:13 +02:00
Tobias Diekershoff
e28f0fe016 Typo and updates 2011-04-13 13:26:08 +02:00
Olivier Migeot
aa358b707c More french. 2011-04-13 10:04:34 +02:00
Friendika
4a514fa966 minor ui tweaks 2011-04-12 21:29:58 -07:00
Friendika
e8a0dd40b2 profile visibility editor 2011-04-12 21:21:33 -07:00
Friendika
b52fd6c2db Merge branch 'omigeot-master' 2011-04-12 15:18:54 -07:00
Friendika
5545c8ada9 cleanup 2011-04-12 05:37:26 -07:00
Olivier Migeot
cd491fc9a3 French translation updated to reflect the last templates conversion. 2011-04-12 13:55:48 +02:00
Olivier Migeot
85f709320b Merge remote branch 'mike/master' 2011-04-12 13:55:43 +02:00
Friendika
61915a524d first cut at group chooser UI 2011-04-12 01:31:55 -07:00
Friendika
6da84027af visual display of group members 2011-04-11 22:47:16 -07:00
Friendika
de8b381149 bug #44 wallwall in loozah issue after recent template fix 2011-04-11 18:52:29 -07:00
Friendika
68731a2c39 photo menu added to wallwall template 2011-04-11 16:00:13 -07:00
Friendika
2dc7882f74 more validation fixes 2011-04-10 23:03:50 -07:00
Friendika
a0956ee955 some w3c validation issues 2011-04-10 23:01:38 -07:00
Friendika
58508201a5 bug #37, ampersand + everything following in url is stripped when using link icon to share link 2011-04-10 03:36:12 -07:00
Friendika
0ddf84eb5a Merge branch 'fabrixxm-master' 2011-04-08 04:46:22 -07:00
Fabio Comuni
969cc6996a Fix a typo, updated IT strings 2011-04-08 12:35:42 +02:00
Friendika
b8479cc2f9 Merge branch 'opensearch' of https://github.com/fabrixxm/friendika into fabrixxm-opensearch 2011-04-08 01:52:01 -07:00
Fabio Comuni
1713ffb41c add opensearch support 2011-04-08 10:40:04 +02:00
Tobias Diekershoff
c4fe889713 Updates to the German strings 2011-04-08 10:36:58 +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
3a6dfb9862 Merge branch 'tobiasd-master' 2011-04-07 16:26:14 -07:00
Friendika
5d5a94c88a comment open/close anomolies in non-English languages 2011-04-07 16:19:46 -07:00
Tobias Diekershoff
9f03e871a2 some more German translations 2011-04-07 20:50:19 +02:00
Tobias Diekershoff
818af767f9 German translation updated 2011-04-07 20:17:30 +02:00
Olivier Migeot
294577a48b Quick fix. 2011-04-07 15:13:31 +02:00
Friendika
000efa6df0 Add some text suggesting that new folks add some basic profile information if they want to make any friends. 2011-04-06 23:38:40 -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
1bba63fb60 Merge branch 'erikl-master' 
Conflicts:
	view/sv/settings.tpl
 2011-04-04 15:46:33 -07:00
Friendika
a0d2747d52 Merge branch 'master' of https://github.com/erikl/friendika into erikl-master 2011-04-04 15:43:54 -07:00
erik
3e4e017ffd Edited view/sv/pagetypes.tpl via GitHub 2011-04-04 13:22:55 -07:00
erik
0de12cd297 Edited view/sv/strings.php via GitHub 2011-04-04 12:51:58 -07:00
Fabio Comuni
92156cd840 Merge remote-tracking branch 'friendika-master/master' into iconpopup 2011-04-04 09:31:12 +02:00
Fabio Comuni
b48e82d12a put popupmenu above all 2011-04-04 09:28:19 +02:00
erik
b2f6bf7c38 Edited view/sv/strings.php via GitHub 2011-04-03 06:01:56 -07:00
erik
89103c99ef Edited view/sv/strings.php via GitHub 2011-04-01 11:33:46 -07:00
Fabio Comuni
8fbc606616 popup styles to loozah theme 2011-03-31 17:02:13 +02:00
Fabio Comuni
fe67c346e5 Moved popup logic in boot.php, added 'item_photo_menu' hook 2011-03-31 16:52:51 +02:00
Friendika
08032e0453 change language dynamically - bound to F8 key 2011-03-31 04:57:31 -07:00
Fabio Comuni
3f94721d62 first work 2011-03-30 17:10:14 +02:00
Olivier Migeot
ddf13d8c97 Some corrections to PO workflow, and integrated latest templates "stringization" for french. 2011-03-30 16:46:22 +02:00
Friendika
4aa60a7aaf oexchange 2011-03-29 21:59:28 -07:00
Friendika
8357c064ae remove obsolete template 2011-03-29 19:23:02 -07:00
Friendika
066bdca30d optionally set article title 2011-03-29 18:57:26 -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
erik
2f48135b71 Edited view/sv/settings.tpl via GitHub 2011-03-29 11:42:04 -07:00
erik
80e3241bc1 Edited view/sv/profile_edit.tpl via GitHub 2011-03-29 11:24:07 -07:00
erik
47169d71fd Edited view/sv/settings.tpl via GitHub 2011-03-29 11:19:49 -07:00
erik
a406534c00 Edited view/sv/register_open_eml.tpl via GitHub 2011-03-29 11:10:25 -07:00
fabrixxm
341a6f90ec Updated IT strings 2011-03-29 18:05:24 +02:00
fabrixxm
6631bc64d3 Merge remote-tracking branch 'friendika/master' 2011-03-29 18:00:19 +02:00
Friendika
6a280c321d small wording change 2011-03-28 18:06:36 -07:00
fabrixxm
2a23147042 Updated IT strings 2011-03-28 21:19:27 +02:00
Olivier Migeot
3b709a074a French translation considered done, yet not fully tested. 2011-03-28 19:59:16 +02:00
Olivier Migeot
581349de59 Some more templates for french translation 2011-03-28 14:31:57 +02:00
Olivier Migeot
10d44f2bb9 More french templates (except emails, everything should be ok now) 2011-03-28 13:59:05 +02:00
Olivier Migeot
c8fb1008f5 Some more templates translated to french. 2011-03-28 13:50:56 +02:00
Olivier Migeot
da546588db Merge remote branch 'mike/master' 2011-03-28 12:11:10 +02:00
Friendika
1f6c6c466a author collapse: close off before pagination 2011-03-28 00:49:20 -07:00
erik
4068a21b37 Edited view/sv/register_verify_eml.tpl via GitHub 2011-03-26 03:11:41 -07:00
erik
17b4f9f8a7 Edited view/sv/register_verify_eml.tpl via GitHub 2011-03-26 03:09:00 -07:00
Tobias Diekershoff
9808b0378d fixed wrong colors for links 2011-03-25 13:03:30 +01:00
Friendika
067626380d Merge branch 'erikl-master' 
Conflicts:
	view/sv/insecure_net.tpl
	view/sv/jot-header.tpl
	view/sv/msg-header.tpl
	view/sv/profile_edit.tpl
	view/sv/profile_tabs.tpl
	view/sv/strings.php
 2011-03-24 04:36:53 -07:00
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