clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,669 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

5669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
friendica 598fc1ae21 Merge pull request #319 from fermionic/fix-diaspora-parent-query 
query using both `id` and `parent`
 2012-05-31 18:59:45 -07:00
Zach Prezkuta d5116689af query using both id and parent 2012-05-31 19:45:58 -06:00
friendica f0cf0ebb48 prevent email from leaking in feeds 2012-05-30 19:11:01 -07:00
friendica 15c023a218 y didn't i think of this b4? 2012-05-30 17:22:51 -07:00
friendica 1180919c89 some zero theming on settings page 2012-05-30 16:30:51 -07:00
friendica ebc4a05164 missing delimiter 2012-05-30 15:56:11 -07:00
friendica 26db26d13a Merge https://github.com/friendica/friendica into pull 2012-05-30 15:53:48 -07:00
friendica bdcb8d27dd transition to beta for private forums 2012-05-30 15:52:17 -07:00
friendica 069361f946 rev update 2012-05-30 15:50:30 -07:00
Thomas Willingham 3e226a665c Friendicaland - you can't 'live' on a demo server. 2012-05-30 17:41:31 +01:00
friendica 7d77cfef56 Create a "potential default group" called "Friends" on registration. 2012-05-30 04:20:01 -07:00
friendica e5a988f0b5 fix private photos that also have a size specification 2012-05-30 01:52:58 -07:00
friendica 88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica b6fe837a64 hide private group if desired 2012-05-29 18:43:56 -07:00
friendica c58b0b9cbb prvgroup should see intros 2012-05-29 18:24:44 -07:00
friendica 52995e0b1f private group fix 2012-05-29 18:14:21 -07:00
friendica 514c994e6a possible sql injection in search 2012-05-29 17:14:35 -07:00
friendica 21d79e787e Merge https://github.com/friendica/friendica into pull 
Conflicts:
	mod/search.php
 2012-05-29 16:50:42 -07:00
friendica 419cf91aae bugfixes: private photo embeds and search for strings with % 2012-05-29 16:44:02 -07:00
Simon 43c185ce04 Merge pull request #316 from annando/master 
Speed improvements
 2012-05-29 13:13:10 -07:00
Simon 39927e3dc5 Merge pull request #317 from CatoTH/master 
Events: additional hooks, and a bugfix
 2012-05-29 13:10:52 -07:00
Simon d5cc81d217 Merge pull request #318 from simonlnu/master 
fix toolbar; more size dynamicism
 2012-05-29 13:09:55 -07:00
Simon L'nu dd666e93d8 fix toolbar. more size dynamicism 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-29 16:09:02 -04:00
Simon L'nu 5edc6735b7 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  ability to only expire contacts, not self
  Provide backend option to only expire other peoples' conversations.
  more theme cleanup
  rev update

* master:
 2012-05-29 15:06:22 -04:00
Tobias Hößl dfef0ec84d Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning 2012-05-29 19:03:30 +00:00
Michael Vogel c707cba4c8 MySQL-Fulltext search option is disabled by default 2012-05-29 16:30:12 +02:00
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