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

1022 Commits

Author SHA1 Message Date
Friendika 59d9070d13 suggestion template 2011-06-25 19:10:38 -07:00
Fabio Comuni e7737d2ea4 dispy: style profile tab 2011-06-23 12:36:36 +02:00
Fabio Comuni 95a933c9a2 dispy: update icons, style events 2011-06-23 12:13:04 +02:00
Fabio Comuni 5de7d0f12f add profile tabs to "photos", "events" and "notes". in dispy, show active tab. 2011-06-23 11:30:17 +02:00
Fabio Comuni 655f5c7b9f use "contacts/<id_contact>" url as subject id, as statusnet and twitter use urls like "domain/<id_user>". 
This seem to make StatusNet Desktop client work better.
 2011-06-21 12:00:52 +02:00
Fabio Comuni 7cd7a79807 remove duplicate tag in atom response 2011-06-21 11:44:26 +02:00
Fabio Comuni 296f1b0123 add users infos to rss and atom api responses 2011-06-21 11:41:16 +02:00
Friendika 55112cfdd0 item source 2011-06-20 19:08:40 -07:00
Friendika db336929cd add rate limit call so spaz will work 2011-06-20 17:16:13 -07:00
Friendika f256e31e4f Merge pull request #122 from tobiasd/master 
German language stuff
 2011-06-20 04:17:37 -07:00
Friendika b86ae9de7f use atom_time on atom entries 2011-06-20 01:38:26 -07:00
Tobias Diekershoff f0c5a1b21b typo and wording for the German language files 2011-06-20 09:47:42 +02:00
Friendika b56e00c7c5 api post sort of working - output status,user need to be swapped 2011-06-19 20:13:24 -07:00
Friendika c2dcff0d02 move profile privacy settings to the Privacy section of the Settings page 2011-06-19 16:47:03 -07:00
fabrixxm 33bafa62aa dispy code tag style 2011-06-19 12:17:13 +02:00
fabrixxm 4bc8ab6e7d Update dispy. Add admin link and styles, add help link, other fixes 2011-06-19 11:21:30 +02:00
fabrixxm c10e913a4b update admin style in loozah 2011-06-19 11:20:35 +02:00
fabrixxm 3b759585d2 fix banner in duepuntozero 2011-06-19 11:20:13 +02:00
bufalo1973 ccffd583d1 Added backslash to $name so it doesn't throws an error. 
Añadida una barra a $name para que no dé error.
 2011-06-18 14:01:49 -07:00
Friendika cf9f23fb74 Merge pull request #118 from fabrixxm/admin 
Admin work
 2011-06-18 00:17:36 -07:00
fabrixxm 4b633d54bb admin: fix last item date in users list, fix plugins details template 2011-06-18 08:52:51 +02:00
fabrixxm 23931ab719 Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings, add "plugin_admin" hook for global plugins settings. add settings to twitter connector as example. 2011-06-18 08:29:59 +02:00
Friendika 9e2db5d5a6 tooltip for selecting items 2011-06-17 23:06:42 -07:00
Friendika 787f079d13 improved UI for checked items to be deleted 2011-06-17 22:58:15 -07:00
Friendika fb0b22fb13 fix admin log viewer (will only read the last 5M of the log, and puts the text into a scrolling div) 2011-06-16 22:20:12 -07:00
Friendika bb73c0b9f3 Merge branch 'pull' 2011-06-16 15:29:04 -07:00
Friendika 6709beb2ac Merge pull request #117 from tobiasd/master 
german strings and green background for the greenzero theme
 2011-06-16 15:27:45 -07:00
Friendika b61a7158da Merge pull request #116 from fabrixxm/admin 
Admin pages
 2011-06-16 15:27:12 -07:00
Friendika 0f3292fefb revup 2011-06-16 15:26:39 -07:00
Tobias Diekershoff 6802911522 put the green back in the panel background 2011-06-16 17:22:03 +02:00
Tobias Diekershoff bca1dcf2d6 Merge branch 'master' of git://github.com/friendika/friendika 2011-06-16 15:30:51 +02:00
Fabio Comuni a652cd5095 admin styles to loozah. missing user admin template 2011-06-16 15:08:50 +02:00
Fabio Comuni ede011cc32 Admin users page. some fix to template processor. 2011-06-16 14:56:43 +02:00
Fabio Comuni 5f583fb8d6 Admin: register policy in site page, initial users page. Aside 'Users' link show pending registrations. 2011-06-16 12:05:35 +02:00
Friendika c92e6ed929 avoid race condition on delete checked items 2011-06-16 00:38:41 -07:00
Friendika e5b54e74ba delete selected items 2011-06-15 20:43:39 -07:00
Tobias Diekershoff dbf6ee6a05 Merge branch 'master' of git://github.com/friendika/friendika 2011-06-15 07:02:38 +02:00
Friendika fcdebc2324 event theming 2011-06-14 20:07:40 -07:00
Friendika 5105b3febc event calendar links, editing 2011-06-14 19:48:37 -07:00
Fabio Comuni b7dc9f8867 Update info comments in all plugins 2011-06-14 15:08:03 +02:00
Fabio Comuni 00e142e4f7 Load plugin info from plugin file. Show README.md or README from plugin dir in plugin details page 2011-06-14 14:21:43 +02:00
Fabio Comuni 283160901f update styles 2011-06-14 14:21:00 +02:00
Fabio Comuni 25d1637ec4 simple plugin details and log view in admin 2011-06-14 11:54:14 +02:00
Fabio Comuni b1184f3fde Merge remote-tracking branch 'friendika-master/master' into admin 2011-06-14 10:37:54 +02:00
Fabio Comuni 5882d8d022 Initial plugins admin page 2011-06-14 10:35:56 +02:00
Tobias Diekershoff d08b068031 Merge branch 'master' of git://github.com/friendika/friendika 2011-06-14 08:10:38 +02:00
Friendika fb92dbf5d6 link events + personal notes to profile tabs 2011-06-13 20:32:30 -07:00
Fabio Comuni ab27f1393e Admin site page 2011-06-13 18:03:06 +02:00
Fabio Comuni a1c59d6011 Fix it strings 2011-06-13 12:53:03 +02:00
Fabio Comuni 494288ab9f Add admin page in nav 2011-06-13 12:52:52 +02:00
Fabio Comuni 3364c2a2d8 Initial admin page 2011-06-13 12:52:29 +02:00
Tobias Diekershoff 4d3c6941ca Merge branch 'master' of git://github.com/friendika/friendika 2011-06-11 08:33:02 +02:00
Friendika d66056af9d reduce visibility of lang-select flag (duepuntozero) 2011-06-10 20:39:46 -07:00
Tobias Diekershoff 8390e8b19b Merge branch 'master' of git://github.com/friendika/friendika 2011-06-10 07:02:53 +02:00
Friendika b857a49bfe event publish 2011-06-09 21:23:45 -07:00
Tobias Diekershoff 7ffd0ee41a Merge branch 'master' of git://github.com/friendika/friendika 2011-06-09 10:20:47 +02:00
Friendika d371241e66 events 2011-06-09 00:58:45 -07:00
Friendika df8ac668b8 more calendar work, undo strict_privacy flag to use different approach 2011-06-08 21:06:02 -07:00
Tobias Diekershoff 9ef5cb1c38 Merge branch 'master' of git://github.com/friendika/friendika 2011-06-08 07:21:19 +02:00
Friendika 33fe26ecb0 more progress on events 2011-06-07 20:10:43 -07:00
Tobias Diekershoff e036434b8a Merge branch 'master' of git://github.com/friendika/friendika 2011-06-07 20:03:58 +02:00
fabrixxm 16446ab0d0 update it strings 2011-06-07 11:44:20 +02:00
Friendika 9f51233451 event listings 2011-06-06 20:17:36 -07:00
Fabio Comuni 89fc56723d Add 'attach' and 'language' icons and enable file upload in dispy template 2011-06-06 15:38:21 +02:00
Friendika edbad772ba add flag for experimental themes 2011-06-05 18:05:25 -07:00
Friendika c4cec593ba position language selector in dispy 2011-06-05 17:51:39 -07:00
Friendika 4284c6f9ee use icon for language selector instead of hotkey 2011-06-05 17:32:56 -07:00
Tobias Diekershoff bda839635c Update to the German language files 2011-06-01 18:34:49 +02:00
Tobias Diekershoff 2413a6b422 Merge branch 'master' of git://github.com/friendika/friendika 2011-06-01 07:56:27 +02:00
Friendika fc34641d4a improve colour balance and banner on html email notifications 2011-05-31 22:41:09 -07:00
Friendika fa986849c9 Brazilian (portugese) translation 2011-05-31 21:40:57 -07:00
Friendika b8c4d73377 show group affiliations in contact editor 2011-05-31 19:24:26 -07:00
Tobias Diekershoff 745d075397 Merge branch 'master' of git://github.com/friendika/friendika 2011-05-31 07:36:25 +02:00
Friendika 7fb9aa24fb bug #87 alert if email settings don't open mailbox, also display last email connect time 2011-05-29 21:20:50 -07:00
Tobias Diekershoff 087f79236e Merge branch 'master' of git://github.com/friendika/friendika 2011-05-30 06:19:59 +02:00
Friendika bddcc41518 Czech (cs) language 2011-05-29 20:36:21 -07:00
Tobias Diekershoff 770d1bb7a3 Merge branch 'master' of git://github.com/friendika/friendika 2011-05-28 10:37:33 +02:00
Friendika 341f853b04 search from network page 2011-05-26 17:47:33 -07:00
Tobias Diekershoff 5e01432c6f Merge branch 'master' of git://github.com/friendika/friendika 2011-05-26 08:20:27 +02:00
Friendika 61b730d567 cleanup content type icons 2011-05-25 20:01:53 -07:00
Friendika 8e8054bc80 position the attach icon in loozah 2011-05-25 15:54:02 -07:00
Friendika c0f529cf38 Merge pull request #111 from fabrixxm/dispy 
fix profile images and contact selector in group editor in dispy theme
 2011-05-25 15:48:02 -07:00
Tobias Diekershoff e9df9d22c0 typo 2011-05-25 19:51:36 +02:00
Tobias Diekershoff 697e3464ab German translations 2011-05-25 13:36:12 +02:00
Tobias Diekershoff 4a95b6361b new german strings 2011-05-25 13:34:57 +02:00
Friendika 2a679b1164 file attachments 2011-05-25 02:08:15 -07:00
Friendika de482058b8 fix attach icon 2011-05-24 23:01:24 -07:00
Friendika 73b4faca5c basic file upload/attach 2011-05-24 22:40:52 -07:00
Friendika eb152fdc24 more position tweaks on attach icons 2011-05-24 21:04:59 -07:00
Friendika 3239381447 better margins 2011-05-24 20:56:49 -07:00
Friendika 703ab6f5ee remove padding 2011-05-24 20:52:23 -07:00
Friendika 87de839974 attachment display 2011-05-24 20:41:29 -07:00
Friendika 4447739702 attachment icons 2011-05-24 20:03:30 -07:00
Friendika e3d1ef8ef7 ability to hide profile and wall from unknown people 2011-05-24 16:30:52 -07:00
Fabio Comuni 73040891f1 fix profile images and contact selector in group editor in dispy theme 2011-05-24 11:33:34 +02:00
Friendika 19ccd658eb Merge branch 'pull' 2011-05-23 18:18:01 -07:00
Fabio Comuni e1107b55c6 add info() function. Works like notice() but show messages in a div with class info-message. 
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
 2011-05-23 11:39:57 +02:00
fabrixxm 866940ab5d fix IT string.php 2011-05-23 09:13:35 +02:00
Friendika 42acd9462a set photo height,width as !important if changing defaults 2011-05-22 19:52:54 -07:00
Friendika ae317296d7 missed two refs 2011-05-22 19:45:29 -07:00
Friendika 36966c72c8 wall item photos use style instead of height, width 2011-05-22 19:40:36 -07:00
Chris Case 991885f1d4 improved standards compliance of some of the tags and fixed an issue which caused text to bump-over youtube video embeds 2011-05-22 19:18:58 -07:00
Chris Case 4cff911939 merged multipart email changes 2011-05-21 21:40:16 -07:00
Chris Case dfc05af73b email updates 2011-05-21 19:26:51 -07:00
Chris Case 11dd0c8571 html email updates 2011-05-21 19:23:56 -07:00
Friendika 681885a120 "notes" app 2011-05-20 01:15:02 -07:00
Friendika 9ab6055b24 textlen defined outside function 2011-05-19 20:41:40 -07:00
Friendika 20807ab8b4 dispy jot-header.tpl missing some code updates 2011-05-19 20:11:09 -07:00
Friendika a27b7fb28d more indicators of public visibility 2011-05-19 19:55:34 -07:00
Friendika f151565029 bug #73 - move 'view in context' and wall-item-outside-wrapper-end inside wall-item-outside-wrapper so all item content is updated with ajax. 2011-05-18 21:49:41 -07:00
Friendika 990d5e82a0 doc updates - connecting to services 2011-05-18 17:29:12 -07:00
Tobias Diekershoff c533370873 spelling fix 2011-05-17 16:13:50 +02:00
Friendika f9444c8be5 admin directory view 2011-05-16 18:52:27 -07:00
Friendika 8674d01432 provide textmode "micropro" (small profile display but without the photo) for better scalability of group selection tools when confronted with huge numbers of contacts 2011-05-12 18:55:28 -07:00
Friendika 0c51305c72 Merge pull request #99 from tobiasd/master 
updats to the DE strings
 2011-05-11 19:25:04 -07:00
Friendika 1ca9263c87 bug #66, identity address string malformed if line wraps 2011-05-11 05:23:45 -07:00
Friendika b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Tobias Diekershoff 7689d81d9a small changes to the new translations 2011-05-11 10:56:39 +02:00
Tobias Diekershoff 5609353fc3 updated the German translation 2011-05-11 10:49:07 +02:00
Friendika 5eea0d5ecb photo lockview not working, temp fix for po2php 2011-05-10 20:10:13 -07:00
Friendika c052d68828 don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. 2011-05-10 16:12:50 -07:00
Fabio Comuni 70fdba924e Update IT strings 2011-05-10 14:20:18 +02:00
Friendika 944f1a7f4c extra slashes in header 2011-05-10 02:18:39 -07:00
Friendika 26d748f6d8 Merge pull request #96 from fabrixxm/api 
Status.net Api
 2011-05-05 04:29:45 -07:00
Friendika b3fa03d3b4 Merge pull request #95 from fabrixxm/dispy 
Dispy
 2011-05-05 04:29:14 -07:00
Fabio Comuni b70a2dad33 Dispy theme works 2011-05-05 10:53:25 +02:00
Fabio Comuni b3a5fccc9d template for photo display 2011-05-05 10:53:03 +02:00
Friendika 6348e4e47b contact edit tool buttons a bit crowded 2011-05-04 22:18:36 -07:00
Friendika 59fd70e568 issues with private photos - hitting internal size limits 2011-05-04 02:20:44 -07:00
Friendika 07d4cf53ad Merge pull request #94 from fabrixxm/dispy. 
Dispy theme
 2011-05-02 15:43:27 -07:00
fabrixxm c003dbc4a4 remove unneeded file 2011-05-02 22:04:11 +02:00
fabrixxm d359b5088f Merge remote-tracking branch 'origin/dispy' into dispy 2011-05-02 22:00:17 +02:00
fabrixxm 1b01eebc1e Dispy theme works 2011-05-02 21:57:21 +02:00
Friendika 6c47f262cc warn if msg is visible to all 2011-05-01 19:50:00 -07:00
Fabio Comuni 2f83e134f9 Dispy: fix user menu order, alignment issues, new items counters not showing up, jot acl, contact edit, location display 2011-04-29 12:37:35 +02:00
Fabio Comuni dd053ebe22 fix icons in item toolbar and edit contact 2011-04-29 10:40:58 +02:00
fabrixxm f6984f9929 works on dispy theme 2011-04-28 19:32:35 +02:00
fabrixxm 9393e3321d Dispy theme 2011-04-28 19:01:46 +02:00
fabrixxm daa7dc983b Icons as CSS classes, hide net/home/mail/notify-update divs with no value 2011-04-28 19:01:35 +02:00
fabrixxm 976d1eaf43 API work 2011-04-27 17:46:23 +02:00
Fabio Comuni 41f6ccc039 More works on api 2011-04-21 17:03:31 +02:00
Friendika b93b04e4a1 macro typo 2011-04-20 06:06:29 -07:00
Friendika 3787e1e500 provide disclosure warning on private network page 2011-04-19 21:09:25 -07:00
Friendika a0179235d2 provide a way to disable mailbox integration 2011-04-18 20:20:04 -07:00
Friendika b84f49df10 Merge branch 'translateitems' of https://github.com/fabrixxm/friendika into fabrixxm-translateitems 2011-04-18 15:51:03 -07:00
Friendika 42613902ed sv update 2011-04-18 15:35:04 -07:00
Fabio Comuni ee16413935 Merge remote-tracking branch 'friendika-master/master' 2011-04-18 16:58:20 +02:00
Friendika b81eefbffb sv language had unquoted quotes in strings 2011-04-17 23:38:12 -07:00
Friendika 229eb9c681 Merge branch 'imap' 2011-04-17 23:28:39 -07:00
Friendika ab099e9102 email integration, cont. 2011-04-17 23:27:11 -07:00
Friendika c347a5d6c9 sv language update 2011-04-16 15:57:24 -07:00
Fabio Comuni 62dbfffe39 darkzero theme, dark variant of duepuntozero 2011-04-15 17:15:40 +02:00
Friendika d21144d0a3 spanish fix 2011-04-14 20:48:59 -07:00
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