Commit graph

6183 commits

Author SHA1 Message Date
friendica
749ae9b297 filter the protocol specifier in bbcode links. 2012-07-17 18:33:04 -07:00
friendica
884454f7ed Merge https://github.com/friendica/friendica into pull 2012-07-16 17:04:23 -07:00
friendica
e477683987 rev update 2012-07-16 17:03:23 -07:00
friendica
7be921594b Merge pull request #399 from mschmitt/master
Esperanto at 100% again
2012-07-16 15:38:06 -07:00
Martin Schmitt
eae6e665c0 Esperanto -> 100% 2012-07-16 22:33:23 +02:00
friendica
f440d76200 recover from datetime parse issues, inspired by https://github.com/friendica/friendica/pull/396 2012-07-15 21:00:11 -07:00
friendica
02d88e7cbe name mixup in wall-to-wall hovertips 2012-07-15 20:56:09 -07:00
friendica
210fe188b2 missing param 2012-07-15 17:07:53 -07:00
friendica
c4643df01b Merge https://github.com/friendica/friendica into pull 2012-07-15 14:23:43 -07:00
friendica
3408a56dd3 rev update 2012-07-15 14:22:45 -07:00
Simon
426b436610 Merge pull request #397 from simonlnu/master
re-add the sparkle stuff
2012-07-15 09:05:54 -07:00
Simon L'nu
021f0829e6 re-add the sparkle stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-15 12:03:53 -04:00
friendica
8767eedaac sql fix - this should work a bit better 2012-07-14 20:38:30 -07:00
friendica
79b5520e77 sql errors on profile page 2012-07-14 20:28:17 -07:00
friendica
c87d3cb86f rev update 2012-07-14 14:16:24 -07:00
friendica
e7acdffaf9 Merge pull request #395 from unary/altpager
add alt_pager function, add ability to use new pager logic on network, p...
2012-07-14 14:10:57 -07:00
Michael Johnston
717fd8539b add alt_pager function, add ability to use new pager logic on network, profile, community, and search. 2012-07-14 14:21:58 -04:00
friendica
7fc1bae515 Merge pull request #394 from unary/community-pagination
fix pagination on community page
2012-07-14 00:28:39 -07:00
Michael Johnston
476b86e1a2 fix pagination on community page 2012-07-14 00:46:41 -04:00
friendica
8b6942c572 don't use language detection if < php 5.3 2012-07-13 15:38:02 -07:00
friendica
10915b8feb Merge https://github.com/friendica/friendica into pull 2012-07-13 14:57:08 -07:00
friendica
bbb022f564 rev update 2012-07-13 13:52:23 -07:00
Simon
a153621f71 Merge pull request #393 from fermionic/live-updates-for-unlikes
allow live updates for unlikes and undislikes
2012-07-13 12:40:57 -07:00
Zach Prezkuta
88711deceb allow live updates for unlikes and undislikes 2012-07-13 09:09:01 -06:00
friendica
15cae001d9 move plink sparkles to the right html element in dispy 2012-07-13 04:22:42 -07:00
Simon
c3fc5ddae6 Merge pull request #392 from simonlnu/master
add doctitle thingy, and update cursor
2012-07-13 01:35:55 -07:00
Simon L'nu
10ce535cac add doctitle thingy, and update cursor
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-13 04:35:16 -04:00
Simon
a6de34605d Merge pull request #391 from simonlnu/master
add some sparkle ;)
2012-07-12 23:38:58 -07:00
Simon L'nu
d08a97bb9f add some sparkle ;)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-13 02:37:45 -04:00
friendica
f30b694ae4 Merge pull request #389 from fermionic/diaspora-likes-on-comments
make likes on comments work with Diaspora, fix some small bugs
2012-07-12 22:52:00 -07:00
friendica
7b4accec81 Merge pull request #390 from fermionic/diaspora-fixed-mangled-text
focus preg_replace to prevent it from catching too much
2012-07-12 22:51:20 -07:00
friendica
644b18eb2c Merge https://github.com/friendica/friendica into pull 2012-07-12 22:49:50 -07:00
Zach Prezkuta
f92338d79b make likes on comments work with Diaspora, some small bugs 2012-07-12 23:14:39 -06:00
Zach Prezkuta
92db5e5ec2 focus preg_replace to prevent it from catching too much 2012-07-12 23:14:29 -06:00
friendica
7f7e2c5de0 add plink to profile notifications 2012-07-12 16:12:37 -07:00
friendica
ce5ca967c1 rev update 2012-07-12 16:11:43 -07:00
Thomas Willingham
bd08a6b565 Add sparkle cursor to Quattro/Vier/TestBubble 2012-07-12 19:21:21 +01:00
friendica
9a299920eb language detection - result is stored in item['postopts'] 2012-07-11 22:45:14 -07:00
friendica
085b589468 add some sparkle to plinks 2012-07-11 21:04:08 -07:00
friendica
24ea480276 rev update 2012-07-11 17:55:39 -07:00
friendica
86cb638637 notification issue on wall-to-wall posts 2012-07-11 02:58:57 -07:00
friendica
3076f838f6 Merge https://github.com/friendica/friendica into pull 2012-07-10 20:33:28 -07:00
fermionic
bb817cb76d Merge pull request #388 from fermionic/diaspora-signature-small-cleanup
small cleanup
2012-07-10 18:30:55 -07:00
Zach Prezkuta
fc6f7daf38 small cleanup 2012-07-10 19:28:38 -06:00
friendica
12255dded5 rev update 2012-07-10 18:05:13 -07:00
friendica
1fda9e9365 rev update 2012-07-10 01:06:11 -07:00
fermionic
2096a5782e Merge pull request #387 from fermionic/diaspora-slight-signature-bug
missed a couple of variable names when I redid comment and like code
2012-07-09 19:38:16 -07:00
Zach Prezkuta
d89b4cea64 missed a couple of variable names when I redid comment and like code 2012-07-09 20:36:25 -06:00
friendica
61ff2ecab2 Merge pull request #385 from fermionic/peculiar-queue-hangup
Prevent long delays in Diaspora delivery
2012-07-09 15:47:55 -07:00
Zach Prezkuta
00eb000e36 don't check for was_recently_delayed in diaspora_transmit during a queue run 2012-07-09 09:39:09 -06:00