Commit graph

6253 commits

Author SHA1 Message Date
friendica
b7e2f802d8 revert an optimisation that was wrong 2012-06-11 21:50:10 -07:00
friendica
6c1914e6bc date search backend to mod/network 2012-06-11 21:07:53 -07:00
friendica
30295926b9 make sure default timezone is set in external processes 2012-06-11 19:52:46 -07:00
friendica
24e85c95b6 date based profile wall filter - backend 2012-06-11 19:36:04 -07:00
friendica
75104416e0 reduce reverted edits due to edit arriving before original 2012-06-11 18:14:49 -07:00
friendica
09f74be14c variable confusion in poller, don't allow negative page offsets 2012-06-11 17:24:16 -07:00
friendica
3b9c3d886d sheesh 2012-06-11 16:21:27 -07:00
Vasudev Kamath
11974b4d94 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-11 20:47:11 +05:30
friendica
afa8815411 bug #447 - make followed feeds private 2012-06-11 05:28:08 -07:00
friendica
0ac3f5fc1c Merge pull request #330 from fabrixxm/savenetworktab
network view: rembember last tab selected by user
2012-06-11 03:44:47 -07:00
fabrixxm
a21db51a58 network view: rembember last tab selected by user 2012-06-11 05:38:30 -04:00
friendica
4f9fb37925 rev update 2012-06-10 16:31:00 -07:00
friendica
64b4bbd65d Merge https://github.com/friendica/friendica into pull 2012-06-10 01:00:16 -07:00
friendica
ff8d159698 rev update 2012-06-10 00:59:36 -07:00
Simon
810b1a5d6e Merge pull request #329 from simonlnu/master
minor template update
2012-06-09 15:08:13 -07:00
Simon L'nu
1605bcd901 minor template update
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-09 18:07:19 -04:00
Simon L'nu
62e9047b8d Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: (21 commits)
  more logging on pubsub callbacks
  provide ability to autofriend ostatus accounts
  ostatus hub subscription issues
  better events-reminder theming
  png support for embedded private photos
  rev update
  png support: update database.sql, fix some typos, fix tinymce image browser
  Add support for PNG images with alpha
  fix a random profile error message
  events: fix select events query select events that starts before display start date and/or ends after display end date.
  more logging on subscribe_to_hub
  admin page untranslated strings, remove empty list element for update
  A few corrections in German translations.
  rev update
  set minchars to 2 for PM lookups too
  set minchars to 2 for contacts search
  contacts search autocomplete
  add email probe logging, limit typo check to main addon files and skip additional support files
  rev update
  named anchors on display page
  ...
2012-06-08 23:58:46 -04:00
friendica
ea4515aca9 more logging on pubsub callbacks 2012-06-08 01:15:53 -07:00
friendica
0820865265 provide ability to autofriend ostatus accounts 2012-06-07 20:20:13 -07:00
friendica
da7773a259 ostatus hub subscription issues 2012-06-07 19:53:39 -07:00
friendica
52d90674ea better events-reminder theming 2012-06-07 18:08:15 -07:00
friendica
ba2452a076 png support for embedded private photos 2012-06-07 16:02:56 -07:00
friendica
67d8afb9d1 Merge https://github.com/friendica/friendica into pull 2012-06-07 15:48:04 -07:00
friendica
c4aeb57fcd rev update 2012-06-07 15:46:07 -07:00
friendica
f4a80fcf24 Merge pull request #328 from fabrixxm/master
PNG with alpha channel
2012-06-07 15:44:56 -07:00
Fabio Comuni
2438c6e45d png support: update database.sql, fix some typos, fix tinymce image browser 2012-06-07 20:17:31 +02:00
fabrixxm
fcf8f301e5 Merge pull request #327 from fabrixxm/master
events: fix select events query
2012-06-07 08:43:55 -07:00
Fabio Comuni
7cc8c369cb Add support for PNG images with alpha 2012-06-07 17:42:13 +02:00
fabrixxm
1d832618a4 fix a random profile error message 2012-06-07 08:49:33 -04:00
fabrixxm
757037c3bf events: fix select events query
select events that starts before display start date and/or ends
after display end date.
2012-06-07 08:28:10 -04:00
friendica
6477c24919 more logging on subscribe_to_hub 2012-06-06 23:10:32 -07:00
friendica
d2e86bdabc Merge https://github.com/friendica/friendica into pull 2012-06-06 22:29:35 -07:00
friendica
3b49035636 admin page untranslated strings, remove empty list element for update 2012-06-06 22:28:30 -07:00
zzottel
6158fcf7be Merge pull request #326 from zzottel/master
German translations
2012-06-06 16:45:57 -07:00
zottel
6a95d483c7 A few corrections in German translations. 2012-06-07 01:43:32 +02:00
zottel
3b5b216cad Merge remote branch 'upstream/master' 2012-06-07 01:07:33 +02:00
friendica
dd001e32f4 rev update 2012-06-06 16:02:10 -07:00
zottel
2a83ebf77f Merge remote branch 'upstream/master' 2012-06-06 08:08:09 +02:00
friendica
6c3ab225f7 set minchars to 2 for PM lookups too 2012-06-05 20:49:56 -07:00
friendica
6f41594634 set minchars to 2 for contacts search 2012-06-05 20:47:26 -07:00
friendica
49732114d7 contacts search autocomplete 2012-06-05 20:33:11 -07:00
friendica
5389efffa9 add email probe logging, limit typo check to main addon files and skip additional support files 2012-06-05 19:28:04 -07:00
friendica
ae08d2c49b Merge https://github.com/friendica/friendica into pull 2012-06-05 17:59:49 -07:00
friendica
7cc7a14380 rev update 2012-06-05 17:59:12 -07:00
friendica
d873ceb719 Merge pull request #325 from annando/master
API: Repeating items only when there is content
2012-06-05 17:58:56 -07:00
Simon L'nu
5bb4a5912b Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  DE: update for the strings
  quattro: added editor buttons to comments
  quattro: cleanup the less file

* master:
2012-06-05 12:46:42 -04:00
Tobias Diekershoff
c7b1b4b752 DE: update for the strings 2012-06-05 11:42:57 +02:00
zottel
ef6446288b Merge remote branch 'upstream/master' 2012-06-05 08:20:41 +02:00
Vasudev Kamath
079fdecff1 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-04 19:59:23 +05:30
friendica
fe1dc1bf98 named anchors on display page 2012-06-04 04:28:20 -07:00