1
0
Fork 0
Commit graph

1806 commits

Author SHA1 Message Date
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
Friendika
91588934d2 revup 2011-04-04 15:43:22 -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
Friendika
742bdd3054 make photo menu work better on remote profile logins 2011-04-04 05:52:59 -07:00
Friendika
9f804b936a remote profile photo menu fix 2011-04-04 03:31:47 -07:00
Friendika
4922fddff9 Merge branch 'fabrixxm-iconpopup' 2011-04-04 03:05:43 -07:00
Friendika
5a62d022a2 Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup 2011-04-04 03:05:30 -07:00
Friendika
933de1769c item_photo_menu to display page 2011-04-04 02:54:09 -07:00
Fabio Comuni
7bfd0e2c48 show "edit contact" and "sent PM" only to local user 2011-04-04 11:52:30 +02:00
Friendika
94881c15d3 missed merge conflict tag 2011-04-04 01:26:04 -07:00
Friendika
379af25215 Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup
Conflicts:
	mod/dfrn_poll.php
2011-04-04 01:22:05 -07:00
Friendika
b5bcf44354 profile not set 2011-04-04 01:18:28 -07:00
Fabio Comuni
890753e5b5 add popupmenu links to status, profile and photos if contact is in dfrn 2011-04-04 09:51:20 +02:00
Fabio Comuni
afa0d8ff70 fix profile redirect url in dfrn_poll 2011-04-04 09:50:25 +02: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
Friendika
9b50b0e16f Public exposure warning on affected network group pages. config-able so a plugin can shut it up. 2011-04-03 20:41:40 -07:00
erik
b2f6bf7c38 Edited view/sv/strings.php via GitHub 2011-04-03 06:01:56 -07:00
Friendika
b500da74b6 user language storage 2011-04-01 14:49:15 -07:00
Friendika
4b356e59ec allow other destinations according to protocol 2011-04-01 14:39:09 -07:00
erik
89103c99ef Edited view/sv/strings.php via GitHub 2011-04-01 11:33:46 -07:00
Friendika
e33b6e0b5a redirect to symbolic rather than absolute URL locations 2011-04-01 00:59:10 -07:00
Fabio Comuni
454c4d0b70 \"View profile\" send to user profile page and not to tab. 2011-04-01 09:04:55 +02:00
Fabio Comuni
b59c504b16 fix typo 2011-04-01 09:00:53 +02:00
Friendika
d728961cbf translateable time formats (PM & birthdays) 2011-03-31 14:46:16 -07:00
Fabio Comuni
8fbc606616 popup styles to loozah theme 2011-03-31 17:02:13 +02:00
Fabio Comuni
29878d9c26 url \"/message/new/<id>\" preselect contact <id> in \"To\" select box 2011-03-31 16:54:06 +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
Friendika
75ad3219e6 remote deletion - check contact-id 2011-03-30 17:50:18 -07:00
Friendika
89e81862ec bug #29 - commas not linkified 2011-03-30 16:18:59 -07:00
Friendika
0fe997490d dfrn remote profile protocol revision 2011-03-30 15:04:18 -07:00
Friendika
f5d782f5c5 Merge branch 'omigeot-master' 2011-03-30 14:33:04 -07:00
Friendika
78058c0a19 revup 2011-03-30 14:31:56 -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
Fabio Comuni
9acccb2b90 Merge remote-tracking branch 'friendika-master/master' 2011-03-30 16:05:43 +02:00
Fabio Comuni
05d9035aaa Merge remote-tracking branch 'origin/master' 2011-03-30 16:05:19 +02:00
Friendika
18da7efa27 undo last commit 2011-03-30 05:22:25 -07:00
Friendika
89df2b19ce increase suhosin $_GET length limit 2011-03-30 05:10:22 -07:00
Friendika
04cd865cc9 placeholder arg in dfrn conversations 2011-03-30 04:20:40 -07:00
Friendika
f198c5cff8 secure profile failure 2011-03-30 04:07:47 -07: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
8f547283c0 update comment count as new comments come in 2011-03-29 18:20:52 -07:00
Friendika
a41b4c6e67 cleanup untracked files 2011-03-29 17:46:40 -07:00
Friendika
f1db34eebc more templates gone 2011-03-29 17:19:12 -07:00