This website requires JavaScript.
1180919c89
some zero theming on settings page
2012-05-30 16:30:51 -07:00
ebc4a05164
missing delimiter
2012-05-30 15:56:11 -07:00
26db26d13a
Merge https://github.com/friendica/friendica into pull
2012-05-30 15:53:48 -07:00
bdcb8d27dd
transition to beta for private forums
2012-05-30 15:52:17 -07:00
069361f946
rev update
2012-05-30 15:50:30 -07:00
3e226a665c
Friendicaland - you can't 'live' on a demo server.
2012-05-30 17:41:31 +01:00
7d77cfef56
Create a "potential default group" called "Friends" on registration.
2012-05-30 04:20:01 -07:00
24b58af689
Merge remote branch 'upstream/master'
2012-05-30 11:08:02 +02:00
e5a988f0b5
fix private photos that also have a size specification
2012-05-30 01:52:58 -07:00
88a0d6a1d5
private group tests, cont.
2012-05-29 22:57:15 -07:00
b6fe837a64
hide private group if desired
2012-05-29 18:43:56 -07:00
c58b0b9cbb
prvgroup should see intros
2012-05-29 18:24:44 -07:00
52995e0b1f
private group fix
2012-05-29 18:14:21 -07:00
514c994e6a
possible sql injection in search
2012-05-29 17:14:35 -07:00
21d79e787e
Merge https://github.com/friendica/friendica into pull
2012-05-29 16:50:42 -07:00
419cf91aae
bugfixes: private photo embeds and search for strings with %
2012-05-29 16:44:02 -07:00
04119d31e5
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-29 16:13:27 -04:00
43c185ce04
Merge pull request #316 from annando/master
2012-05-29 13:13:10 -07:00
39927e3dc5
Merge pull request #317 from CatoTH/master
2012-05-29 13:10:52 -07:00
d5cc81d217
Merge pull request #318 from simonlnu/master
2012-05-29 13:09:55 -07:00
dd666e93d8
fix toolbar. more size dynamicism
2012-05-29 16:09:02 -04:00
5edc6735b7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-29 15:06:22 -04:00
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
c707cba4c8
MySQL-Fulltext search option is disabled by default
2012-05-29 16:30:12 +02:00
8202355df9
Disabled logging of SQL statements
2012-05-29 16:16:37 +02:00
68757f2504
Merge remote branch 'upstream/master'
2012-05-29 16:09:26 +02:00
2eafa9a475
ability to only expire contacts, not self
2012-05-29 01:14:53 -07:00
0241bd1fbf
Provide backend option to only expire other peoples' conversations.
2012-05-28 23:24:10 -07:00
2dc7e53435
more theme cleanup
2012-05-28 19:17:06 -07:00
10a057b979
Merge https://github.com/friendica/friendica into pull
2012-05-28 16:52:19 -07:00
f033c9a4ae
rev update
2012-05-28 16:51:52 -07:00
51c2ef0efb
Merge pull request #315 from simonlnu/master
2012-05-28 16:26:24 -07:00
cb259098dd
fixed font-size/line-height stuffs
2012-05-28 19:25:10 -04:00
91c1a2943b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-28 16:49:12 -04:00
6962989e52
slackr - tone down the shadows a smidgin
2012-05-27 23:02:25 -07:00
ff0291c876
add plugin hooks to gender, sexpref, and marital selectors
2012-05-27 22:35:01 -07:00
b752acd089
birthday in november,december bug
2012-05-27 21:36:20 -07:00
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
08941d4285
handle multiple underscores in D* links
2012-05-26 23:46:42 -07:00
24f5e6b3f3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-26 19:39:34 -04:00
5a7363b248
more ssl policy stuff
2012-05-26 16:21:48 -07:00
73c61b6f96
allow force ssl on notifications
2012-05-26 16:11:51 -07:00
a08232fa95
Merge branch 'master' of github.com:annando/friendica
2012-05-26 15:42:23 +02:00
7f19d39b14
Doing negative caching for config values, special logfile for database optmisations
2012-05-26 15:41:23 +02:00
817fc37f41
Merge branch 'master' of github.com:annando/friendica
2012-05-26 12:06:19 +02:00
7b3c02057d
Merge remote branch 'upstream/master'
2012-05-26 11:59:19 +02:00
a5dc41ab13
Saved searches now can search for tags as well
2012-05-26 11:51:48 +02:00
040d1467f3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-26 01:23:17 -04:00
f5290a5a10
missing entries on personal tab after sql text search optimise
2012-05-25 18:29:06 -07:00
a612b10b2a
Deactivating the test output in db engine
2012-05-26 03:23:18 +02:00
4951210508
Speed optimisation by enabling the posibility of the MySQL fulltext engine
2012-05-26 03:21:07 +02:00
bb4712b171
bug #434 - default group placement not working after accepting dfrn friend request
2012-05-25 18:06:51 -07:00
0ef8ccf11b
fix wall_uploaded photo permissions on group post by member
2012-05-25 17:42:35 -07:00
27c903a8d0
improve location change notifications
2012-05-25 15:56:18 -07:00
fafd41f4bf
keep private FB stuff out of personal notes
2012-05-25 14:36:17 -07:00
36d6018c11
Merge remote branch 'upstream/master'
2012-05-25 21:05:42 +02:00
a71e3134bf
Merge remote branch 'upstream/master'
2012-05-25 16:19:10 +02:00
d1345e5054
Merge https://github.com/friendica/friendica into pull
2012-05-25 00:43:09 -07:00
abb9fecf09
rev update
2012-05-25 00:42:38 -07:00
88d5d9684a
admin: remove update link in admin menu
2012-05-25 03:05:07 -04:00
07535692dc
DE update to strings and templates
2012-05-25 06:04:33 +02:00
25547cb21f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-24 19:30:41 -04:00
5bc0cfa067
Merge pull request #313 from fabrixxm/master
2012-05-24 16:30:22 -07:00
e54b649c98
Merge pull request #314 from simonlnu/master
2012-05-24 16:29:29 -07:00
2a32917e3a
update dark a bit. i messed up some buttons
2012-05-24 19:28:12 -04:00
3c15336984
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-24 05:28:40 -04:00
60df67b9e3
fix small js error when user not logged in
2012-05-24 04:29:33 -04:00
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
f0ddcb979b
slackr: improve interactivity
2012-05-23 23:29:45 -07:00
6c78d42050
slackr: hide calendar when posting
2012-05-23 18:20:24 -07:00
5d06e0060d
Merge https://github.com/friendica/friendica into pull
2012-05-23 16:58:58 -07:00
60723702f1
more theme stuff
2012-05-23 16:58:31 -07:00
fee3f7a872
Merge pull request #312 from simonlnu/master
2012-05-23 16:27:34 -07:00
16f9d7fd35
clean up and more fixing
2012-05-23 19:22:07 -04:00
30b658c429
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-23 19:20:24 -04:00
19bf0aa283
slackr - better highlighting of current selections
2012-05-23 16:16:59 -07:00
5b7865f8f9
slackr - knock the sharp edges off the events calendar
2012-05-23 15:55:09 -07:00
8bc8be1f87
Merge https://github.com/friendica/friendica into pull
2012-05-23 15:46:49 -07:00
6bcfda6d53
rev update
2012-05-23 15:46:04 -07:00
1d56ec3c7a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-23 18:10:40 -04:00
5acd0a1c32
Merge pull request #309 from fabrixxm/master
2012-05-23 15:10:24 -07:00
8cec510b73
Merge pull request #311 from simonlnu/master
2012-05-23 15:08:43 -07:00
5198260e3a
clean up and make nice the dispy photo edit stuff
2012-05-23 18:06:49 -04:00
fb50727f8d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-23 18:04:23 -04:00
da67269468
Merge pull request #310 from simonlnu/master
2012-05-23 13:05:10 -07:00
789063da39
add a placeholder attribute on search-text; dispy fixes
2012-05-23 15:58:22 -04:00
3aa516ccab
Merge remote branch 'upstream/master'
2012-05-23 18:25:58 +02:00
325343a492
Update install wizard - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section
2012-05-23 07:38:31 -04:00
bd12902d7b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-23 05:03:05 -04:00
61dba985c1
photo rotation
2012-05-23 01:01:04 -07:00
8ffb65ceef
event calendar theming
2012-05-22 22:34:35 -07:00
86a38cca24
import quattro event reminder
2012-05-22 22:06:52 -07:00
af495879af
mark bubbles unsupported
2012-05-22 21:54:19 -07:00
3ac7c4e859
keep FB out of private notes
2012-05-22 21:20:31 -07:00
0da20ec9ef
Merge https://github.com/friendica/friendica into pull
2012-05-22 18:06:34 -07:00
b43b680802
clear submanage, etc from session on logout
2012-05-22 18:05:58 -07:00
e56af0e09e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-22 19:49:03 -04:00
e70573f34c
if identity (uid) changes - reload any other open browser windows on next ping.
2012-05-22 16:01:07 -07:00
b962559570
Oops - but lets commit the right revision, sorry. There's a spare line in the last one.
2012-05-22 19:19:36 +01:00
18983bb932
Fix darkzero/ns BB icon background colours.
2012-05-22 19:14:58 +01:00
friendica
Thomas Willingham
zottel
Simon L'nu
Simon
Tobias Hößl
Michael Vogel
root
Tobias Diekershoff