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 |
|
|
Friendika
|
de8d9ab66d
|
revup
|
2011-03-23 14:31:02 -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
|
620d7bd770
|
upd8 readme
|
2011-03-23 05:33:41 -07:00 |
|
|
Friendika
|
f0b791fe9a
|
upd8 readme
|
2011-03-23 05:30:44 -07:00 |
|
|
Friendika
|
85e227151b
|
use correct mime type for json
|
2011-03-22 16:52:14 -07:00 |
|
|
Friendika
|
e0202d82a1
|
add fulltext index on keywords, missed some directory localisations
|
2011-03-22 16:34:12 -07:00 |
|
|
Friendika
|
8f31935b7d
|
items back in personal data download, chunked this time
|
2011-03-22 16:19:00 -07: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 |
|