This website requires JavaScript.
fe1dc1bf98
named anchors on display page
2012-06-04 04:28:20 -07:00
b13c6ea9ad
quattro: added editor buttons to comments
2012-06-04 11:49:16 +02:00
12474e3c2e
Merge branch 'master' of git://github.com/friendica/friendica
2012-06-04 12:04:17 +05:30
0353410cd4
Merge remote branch 'upstream/master'
2012-06-04 08:09:15 +02:00
5de91c2a7c
API: Only repeat items if there is a content
2012-06-04 08:08:45 +02:00
ca105f1c66
quattro: cleanup the less file
2012-06-04 07:17:23 +02:00
4d9ab1d775
Merge pull request #324 from simonlnu/master
2012-06-03 15:11:13 -07:00
34f210bc2d
fix mini photo-menu bug
2012-06-03 18:10:04 -04:00
8d4c77fc43
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-06-03 18:03:20 -04:00
9f4b897261
Merge https://github.com/friendica/friendica into pull
2012-06-03 14:48:28 -07:00
0b657aa235
rev update
2012-06-03 14:47:53 -07:00
a66baf2918
Merge pull request #323 from fermionic/add-relayable-retraction-support-for-diaspora
2012-06-03 14:47:04 -07:00
2a01ae8149
database updates
2012-06-03 14:52:42 -06:00
9920fb39e5
Debugged implementation of Diaspora relayable_retractions
2012-06-03 14:32:17 -06:00
06263f72a8
cleanup and logging
2012-06-03 11:12:16 -06:00
cde0de965f
first shot at getting like/unlike functions to work consistently
2012-06-02 23:56:42 -06:00
77962aa79d
Fix bugs in the retraction code
2012-06-02 16:11:31 -06:00
b000088ded
prepare to implement database update
2012-06-01 09:07:51 -06:00
c0af6dbb1a
Implement relaying of relayable_retractions
2012-05-31 19:40:12 -06:00
1fe1ac022f
Support relayable_retractions that are relayed to us by the top-level post owner
2012-05-25 18:26:09 -06:00
959b264c44
quattro: admin panel styling and 1st buttons for addon/theme overview
2012-06-03 22:32:42 +02:00
2741ce67f8
privacy settings: make submit button translateable
2012-06-03 17:38:05 +02:00
283524d990
DE: update to the strings
2012-06-03 17:33:28 +02:00
6fbeafc843
prv messages: make submit translateable
2012-06-03 17:16:29 +02:00
70c4ab6875
Merge remote branch 'upstream/master'
2012-06-03 14:21:51 +02:00
598a2563e8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-06-03 04:59:07 -04:00
daa4f5213f
zrl's when visiting public photos at the source site
2012-06-03 01:53:11 -07:00
97576e3e33
doco
2012-06-02 23:22:02 -07:00
ee42c3be94
cleanup
2012-06-02 23:17:49 -07:00
82cf664920
turn "follow" into a function
2012-06-02 23:12:20 -07:00
d27c6de84e
add hometown to profiles
2012-06-02 20:58:20 -07:00
3d39e6e594
bug #439 - remove web port number from notification email "from" address
2012-06-02 18:23:54 -07:00
4978ee12d1
webfinger profile linker
2012-06-02 18:05:23 -07:00
608d424b0b
"howlong" added to marital status.
2012-06-02 02:30:26 -07:00
29bdf432f0
fewer "bob smith to bob smith via wall-to-wall".
2012-06-02 00:40:38 -07:00
c0b74b18fe
Merge pull request #321 from beardy-unixer/master
2012-06-01 21:48:23 -07:00
8503a0e4cc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-06-01 23:13:24 -04:00
df2fdf08dd
Merge remote branch 'upstream/master'
2012-06-02 02:37:20 +02:00
0165d5dd2c
registration issue after re-factor
2012-06-01 15:42:13 -07:00
7a5c85f628
[quote=somebody] was appearing as an extended spoiler tag.
2012-06-01 23:31:07 +01:00
974935e921
Merge pull request #320 from fabrixxm/master
2012-06-01 02:53:42 -07:00
1d1c50f6e3
install: fix bug #436 and small typo Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url().
2012-06-01 03:31:24 -04:00
bad66a1154
Merge remote branch 'friendica/master'
2012-06-01 03:10:57 -04:00
08b335cac0
Merge remote branch 'upstream/master'
2012-06-01 08:31:38 +02:00
b1dacd6d83
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-31 23:22:19 -04:00
93bc29a711
turn registration code into a standalone function for re-use
2012-05-31 19:06:17 -07:00
598fc1ae21
Merge pull request #319 from fermionic/fix-diaspora-parent-query
2012-05-31 18:59:45 -07:00
d5116689af
query using both id and parent
2012-05-31 19:45:58 -06:00
20fdbda25e
Merge remote branch 'upstream/master'
2012-05-31 08:43:14 +02:00
f0cf0ebb48
prevent email from leaking in feeds
2012-05-30 19:11:01 -07:00
15c023a218
y didn't i think of this b4?
2012-05-30 17:22:51 -07:00
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
friendica
Tobias Diekershoff
Vasudev Kamath
Michael Vogel
Simon
Simon L'nu
Zach Prezkuta
zottel
Thomas Willingham
root
Tobias Hößl