Commit graph

5643 commits

Author SHA1 Message Date
Michael Vogel 8202355df9 Disabled logging of SQL statements 2012-05-29 16:16:37 +02:00
Michael Vogel 68757f2504 Merge remote branch 'upstream/master' 2012-05-29 16:09:26 +02:00
friendica 2eafa9a475 ability to only expire contacts, not self 2012-05-29 01:14:53 -07:00
friendica 0241bd1fbf Provide backend option to only expire other peoples' conversations. 2012-05-28 23:24:10 -07:00
friendica 2dc7e53435 more theme cleanup 2012-05-28 19:17:06 -07:00
friendica 10a057b979 Merge https://github.com/friendica/friendica into pull 2012-05-28 16:52:19 -07:00
friendica f033c9a4ae rev update 2012-05-28 16:51:52 -07:00
Simon 51c2ef0efb Merge pull request #315 from simonlnu/master
fixed font-size/line-height stuffs
2012-05-28 16:26:24 -07:00
Simon L'nu cb259098dd fixed font-size/line-height stuffs
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-28 19:25:10 -04:00
Simon L'nu 91c1a2943b Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  slackr - tone down the shadows a smidgin
  add plugin hooks to gender, sexpref, and marital selectors
  birthday in november,december bug
  rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by.
  handle multiple underscores in D* links

* master:
2012-05-28 16:49:12 -04:00
friendica 6962989e52 slackr - tone down the shadows a smidgin 2012-05-27 23:02:25 -07:00
friendica ff0291c876 add plugin hooks to gender, sexpref, and marital selectors 2012-05-27 22:35:01 -07:00
friendica b752acd089 birthday in november,december bug 2012-05-27 21:36:20 -07:00
friendica 2bd1004587 rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. 2012-05-27 21:01:58 -07:00
friendica 08941d4285 handle multiple underscores in D* links 2012-05-26 23:46:42 -07:00
Simon L'nu 24f5e6b3f3 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  more ssl policy stuff
  allow force ssl on notifications

* master:
2012-05-26 19:39:34 -04:00
friendica 5a7363b248 more ssl policy stuff 2012-05-26 16:21:48 -07:00
friendica 73c61b6f96 allow force ssl on notifications 2012-05-26 16:11:51 -07:00
Michael Vogel a08232fa95 Merge branch 'master' of github.com:annando/friendica 2012-05-26 15:42:23 +02:00
Michael Vogel 7f19d39b14 Doing negative caching for config values, special logfile for database optmisations 2012-05-26 15:41:23 +02:00
Michael 817fc37f41 Merge branch 'master' of github.com:annando/friendica
Conflicts:
	mod/network.php
2012-05-26 12:06:19 +02:00
Michael 7b3c02057d Merge remote branch 'upstream/master' 2012-05-26 11:59:19 +02:00
Michael Vogel a5dc41ab13 Saved searches now can search for tags as well 2012-05-26 11:51:48 +02:00
Simon L'nu 040d1467f3 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  missing entries on personal tab after sql text search optimise
  bug #434 - default group placement not working after accepting dfrn friend request
  fix wall_uploaded photo permissions on group post by member
  improve location change notifications
  keep private FB stuff out of personal notes
  rev update
  DE update to strings and templates

* master:
2012-05-26 01:23:17 -04:00
friendica f5290a5a10 missing entries on personal tab after sql text search optimise 2012-05-25 18:29:06 -07:00
Michael Vogel a612b10b2a Deactivating the test output in db engine 2012-05-26 03:23:18 +02:00
Michael Vogel 4951210508 Speed optimisation by enabling the posibility of the MySQL fulltext engine 2012-05-26 03:21:07 +02:00
friendica bb4712b171 bug #434 - default group placement not working after accepting dfrn friend request 2012-05-25 18:06:51 -07:00
friendica 0ef8ccf11b fix wall_uploaded photo permissions on group post by member 2012-05-25 17:42:35 -07:00
friendica 27c903a8d0 improve location change notifications 2012-05-25 15:56:18 -07:00
friendica fafd41f4bf keep private FB stuff out of personal notes 2012-05-25 14:36:17 -07:00
Michael Vogel a71e3134bf Merge remote branch 'upstream/master' 2012-05-25 16:19:10 +02:00
friendica d1345e5054 Merge https://github.com/friendica/friendica into pull 2012-05-25 00:43:09 -07:00
friendica abb9fecf09 rev update 2012-05-25 00:42:38 -07:00
Tobias Diekershoff 07535692dc DE update to strings and templates 2012-05-25 06:04:33 +02:00
Simon L'nu 25547cb21f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  fix small js error when user not logged in
  install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect

* master:
2012-05-24 19:30:41 -04:00
Simon 5bc0cfa067 Merge pull request #313 from fabrixxm/master
install wizard: fix php executable path
2012-05-24 16:30:22 -07:00
Simon e54b649c98 Merge pull request #314 from simonlnu/master
update dark a bit. i messed up some buttons
2012-05-24 16:29:29 -07:00
Simon L'nu 2a32917e3a update dark a bit. i messed up some buttons
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-24 19:28:12 -04:00
Simon L'nu 3c15336984 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  slackr: improve interactivity
  slackr: hide calendar when posting
  more theme stuff

* master:
2012-05-24 05:28:40 -04:00
root 60df67b9e3 fix small js error when user not logged in 2012-05-24 04:29:33 -04:00
root a5b8339a75 install wizard: fix php executable path
- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect
2012-05-24 04:21:33 -04:00
friendica f0ddcb979b slackr: improve interactivity 2012-05-23 23:29:45 -07:00
friendica 6c78d42050 slackr: hide calendar when posting 2012-05-23 18:20:24 -07:00
friendica 5d06e0060d Merge https://github.com/friendica/friendica into pull 2012-05-23 16:58:58 -07:00
friendica 60723702f1 more theme stuff 2012-05-23 16:58:31 -07:00
Simon fee3f7a872 Merge pull request #312 from simonlnu/master
a few more fixes
2012-05-23 16:27:34 -07:00
Simon L'nu 16f9d7fd35 clean up and more fixing
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 19:22:07 -04:00
Simon L'nu 30b658c429 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  slackr - better highlighting of current selections
  slackr - knock the sharp edges off the events calendar
  rev update

* master:
2012-05-23 19:20:24 -04:00
friendica 19bf0aa283 slackr - better highlighting of current selections 2012-05-23 16:16:59 -07:00