Commit graph

502 commits

Author SHA1 Message Date
Friendika
26cc2e02fe Merge branch 'fabrixxm-master'
Conflicts:
	boot.php
2011-01-28 18:50:20 -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
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
05350082fa Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed 2011-01-26 13:59:20 -08:00
Fabio Comuni
4a2c0fcc36 Add 'jot_tool' hook, plugins can add tool icons. 2011-01-26 16:17:28 +01:00
Friendika
c7ace10ffb dissolve relationship (new protocol) working 2011-01-26 02:32:00 -08:00
Friendika
abbd498a8b whitespace only 2011-01-26 00:19:54 -08:00
Friendika
bb5ad77e2a smilies on new item view 2011-01-25 05:26:12 -08:00
Friendika
5a7ff660c4 "unfriend" protocol 2011-01-25 03:57:10 -08:00
Friendika
08d6fe5ae7 allow RSS for feed contacts, but no comments 2011-01-24 19:36:20 -08:00
Friendika
f5674558ca propagate name changes to 'self' contact record 2011-01-24 18:18:47 -08:00
fabrixxm
e9251499dd Added proc_run() and modified all occurrence of proc_close(proc_open()) to use proc_run() 2011-01-24 22:00:02 +01:00
Friendika
163e614a3b don't translate CR-LF 2011-01-24 03:08:20 -08:00
Friendika
205a2b8930 owner's sparkle link, sometimes not author's - on display page 2011-01-23 21:26:09 -08:00
Friendika
5be98e3ec8 following random feeds 2011-01-23 20:09:34 -08:00
Friendika
00d2b58358 fix a few issues with code blocks, ignore tags within blocks, fold multi-line blocks to one, also turn html br into two LFs. 2011-01-23 16:29:30 -08:00
Friendika
1460fc0d71 add cc-license text to all content pages 2011-01-23 14:56:14 -08:00
Friendika
950e5f6693 given a tag @foo, don't also link/replace words like food in msg body 2011-01-23 13:49:21 -08:00
Friendika
f278d17910 wrong verb in dislike activity body 2011-01-22 03:59:13 -08:00
Friendika
a80ab19483 typo 2011-01-22 02:51:31 -08:00
Friendika
c0a0710f97 incorrect item owner on like/dislike activity body when remote-auth profile 2011-01-21 12:20:05 -08:00
Friendika
d347026094 don't urlencode $_GET vars 2011-01-21 05:21:13 -08:00
Friendika
aeb585fee1 profile edit hooks 2011-01-20 15:30:45 -08:00
Friendika
623ae24109 per fabrix, except do the login "on page" 2011-01-20 14:25:44 -08:00
fabrixxm
28ebbe38d6 Netwok page redirect to login page if not local_user 2011-01-20 20:19:20 +01:00
Friendika
2ffe0d0b1d do a better job of comparing same URLs. 2011-01-19 19:51:34 -08:00
Friendika
d59585d89d fix context links 2011-01-19 18:31:04 -08:00
Friendika
b1d67c8d3c network view all item types by date 2011-01-19 17:56:36 -08:00
Friendika
e7c5f9e7de undo sql change in f9f018ef08 (02-DEC-2010), not relevant and incorrect 2011-01-19 14:19:40 -08:00
Friendika
3da2b24951 list network page (parent items) by creation date thx:fabrix 2011-01-18 19:41:30 -08:00
Friendika
b40281802f personal title 2011-01-18 19:25:28 -08:00
Friendika
3811923c14 put birthday reminders on default network page, add smileys to private mail 2011-01-16 16:40:09 -08:00
Friendika
f4ebd2a213 Don't send conversation slaps, only immediate replies. Redundant and flawed. 2011-01-16 14:58:07 -08:00
Friendika
e7ae4ad3fa cannot pass null by reference 2011-01-14 14:56:13 -08:00
Friendika
5bfb0ba4c2 birthday notifications working 2011-01-13 20:28:33 -08:00
Friendika
b0a03c328f Merge branch 'dev' 2011-01-13 02:07:57 -08:00
Friendika
5559893293 event and birthday data structures 2011-01-13 02:01:00 -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
1c7dc1879c removed function was still referenced 2011-01-11 14:05:40 -08:00
Friendika
2a269e0c18 use default system theme for system pages 2011-01-07 04:33:34 -08:00
Friendika
0147520e90 add contact edit hooks 2011-01-07 03:15:52 -08:00
Friendika
ffbdad7041 friend request homecoming - ensure login redirects back to confirmation page,
prune old introductions that remain blocked over 30 minutes.
2011-01-07 02:57:26 -08:00
Friendika
502d59089b schema typo 2011-01-06 23:41:14 -08:00
Friendika
fd1abe1c54 undo freesans temporarily due to poor legibility. 2011-01-06 13:26:25 -08:00
Friendika
95ec0767d8 plugin settings were getting changed 2011-01-05 13:10:47 -08:00