Hauke Zuehl
|
cc7d849ce3
|
Merge remote branch 'upstream/master'
|
2012-06-16 19:49:04 +02:00 |
|
fermionic
|
950dacbbdd
|
Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-than-diaspora-does
Diaspora dont check more signatures than diaspora does
|
2012-06-16 09:49:19 -07:00 |
|
|
Zach Prezkuta
|
3132ed2979
|
more cleanup
|
2012-06-16 10:45:26 -06:00 |
|
|
Zach Prezkuta
|
577cfdd314
|
some cleanup of obsolete code
|
2012-06-16 10:41:25 -06:00 |
|
|
fermionic
|
bb6027b6b5
|
Merge pull request #337 from fermionic/fix-api_php-logging-typo
fix small typo for logging command in api.php
|
2012-06-16 09:33:15 -07:00 |
|
|
Zach Prezkuta
|
0ff86e28bb
|
fix small typo for logging command in api.php
|
2012-06-16 10:25:46 -06:00 |
|
|
Zach Prezkuta
|
0946c4a375
|
still need the original author information for comments and likes
|
2012-06-16 10:25:33 -06:00 |
|
|
Zach Prezkuta
|
09eb52810b
|
update signature checking for relayables
|
2012-06-16 10:25:32 -06:00 |
|
|
Hauke Zuehl
|
f9a40ccbde
|
Merge remote branch 'upstream/master'
|
2012-06-16 18:04:59 +02:00 |
|
|
Hauke Zuehl
|
1231dd72f0
|
Check if $rr exists
|
2012-06-16 15:07:23 +02:00 |
|
friendica
|
4faf0e609f
|
rev update
|
2012-06-16 03:35:45 -07:00 |
|
|
friendica
|
4c3598ce2f
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-15 06:15:59 -07:00 |
|
fabrixxm
|
10e99e9463
|
Merge pull request #335 from fabrixxm/master
The missing mod/network.php
|
2012-06-15 01:21:57 -07:00 |
|
|
fabrixxm
|
6416d09c71
|
the missing mod/network.php
|
2012-06-15 03:18:42 -04:00 |
|
|
friendica
|
ff45e11284
|
redundant log entry
|
2012-06-14 17:55:30 -07:00 |
|
|
friendica
|
ba0ea1e651
|
mod/network.php was lost
|
2012-06-14 17:46:58 -07:00 |
|
|
friendica
|
40e6d87d08
|
highlight the lost contact message
|
2012-06-14 17:41:24 -07:00 |
|
|
friendica
|
8c94fa23bf
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-14 17:39:17 -07:00 |
|
|
friendica
|
2efee75557
|
also mark for death if there isn't any xml to be found
|
2012-06-14 17:38:39 -07:00 |
|
|
friendica
|
267681844d
|
poll even if contact hasn't responded recently, so we can update the termination status
|
2012-06-14 17:27:07 -07:00 |
|
|
friendica
|
be090cc851
|
better handling of dead contacts
|
2012-06-14 16:56:46 -07:00 |
|
|
friendica
|
244d7f9a8f
|
Merge pull request #334 from fabrixxm/master
Fix bug 453 and small update to quattro theme
|
2012-06-14 16:00:50 -07:00 |
|
|
fabrixxm
|
f66ae301b8
|
network: fix bug #453
|
2012-06-14 10:04:13 -04:00 |
|
|
fabrixxm
|
2f5e891cd1
|
quattro theme: show uncollapsed comments on display page
|
2012-06-14 09:25:18 -04:00 |
|
|
friendica
|
e68e9ec5f4
|
Required for github/Windows
|
2012-06-14 18:39:48 +10:00 |
|
|
friendica
|
79e2ae3791
|
syntax on sql
|
2012-06-13 22:34:48 -07:00 |
|
|
friendica
|
4229debff8
|
ajax append placeholder, fix some html warnings
|
2012-06-13 21:40:02 -07:00 |
|
|
friendica
|
edeca6d815
|
remove php version restriction on archive widget
|
2012-06-13 20:59:19 -07:00 |
|
|
friendica
|
b0a0c1ef4d
|
couple of little fixes to enotify positional params
|
2012-06-13 20:03:18 -07:00 |
|
|
friendica
|
7d8b087f4a
|
fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them.
|
2012-06-13 19:59:20 -07:00 |
|
|
friendica
|
24bf4632af
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-13 16:25:57 -07:00 |
|
|
friendica
|
85876be48a
|
Merge https://github.com/fabrixxm/friendica into pull
Conflicts:
util/messages.po
|
2012-06-13 16:25:09 -07:00 |
|
|
friendica
|
36491462ba
|
Merge pull request #333 from Erkan-Yilmaz/master
missing bracket
|
2012-06-13 16:21:15 -07:00 |
|
|
friendica
|
d908c9dd71
|
disable archive widget for PHP < 5.3
|
2012-06-13 16:17:45 -07:00 |
|
Erkan Yilmaz
|
e8e1de3603
|
add missing bracket
|
2012-06-13 20:41:53 +02:00 |
|
|
fabrixxm
|
feab17bfea
|
enotify: fix stupid typo
|
2012-06-13 12:08:34 -04:00 |
|
|
fabrixxm
|
46cb8174fa
|
enotify: rework strings to more easy to translate
|
2012-06-13 11:55:21 -04:00 |
|
|
friendica
|
a424fecdae
|
this should catch any weirdness caused by being in different timezones and making your first post on the 31st of March
|
2012-06-12 22:52:34 -07:00 |
|
|
friendica
|
f8314d6bea
|
one-click change for manage module
|
2012-06-12 22:05:35 -07:00 |
|
|
friendica
|
bbdb8751e5
|
that was it
|
2012-06-12 21:39:39 -07:00 |
|
|
friendica
|
82ad881c85
|
think this will fix it
|
2012-06-12 21:38:10 -07:00 |
|
|
friendica
|
d955813f22
|
tracking another edge case
|
2012-06-12 21:34:28 -07:00 |
|
|
friendica
|
08af43f396
|
edge case
|
2012-06-12 21:30:17 -07:00 |
|
|
friendica
|
920ea2e1c7
|
archive widget
|
2012-06-12 20:46:30 -07:00 |
|
|
friendica
|
832d9eeaaf
|
more fixes
|
2012-06-12 16:17:34 -07:00 |
|
|
friendica
|
08b3126dae
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-12 02:48:00 -07:00 |
|
|
friendica
|
1dd52c20cf
|
move parens to proper place
|
2012-06-12 02:47:05 -07:00 |
|
Michael Vogel
|
a1c407e017
|
Removed "oauth/authorize" from the list of not implemented functions since it is implemented in "mod/api.php"
|
2012-06-12 12:39:28 +03:00 |
|
|
friendica
|
b6ff71acaa
|
survive bad/un-parseable input to datetime_convert
|
2012-06-12 02:06:29 -07:00 |
|
|
friendica
|
8eb81a99c6
|
fix default group for local follows
|
2012-06-12 01:13:09 -07:00 |
|