b000088ded
prepare to implement database update
2012-06-03 14:53:30 -06:00
c0af6dbb1a
Implement relaying of relayable_retractions
...
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
1fe1ac022f
Support relayable_retractions that are relayed to us by the top-level post owner
2012-06-03 14:53:29 -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'
...
* remotes/upstream/master:
zrl's when visiting public photos at the source site
doco
cleanup
turn "follow" into a function
add hometown to profiles
bug #439 - remove web port number from notification email "from" address
webfinger profile linker
"howlong" added to marital status.
fewer "bob smith to bob smith via wall-to-wall".
[quote=somebody] was appearing as an extended spoiler tag.
* 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
...
BB code [quote=somebody] fix.
2012-06-01 21:48:23 -07:00
8503a0e4cc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
registration issue after re-factor
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().
admin: remove update link in admin menu
* 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
...
Fix bug 436, fix small typo, and incomplete feature removal
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'
...
* remotes/upstream/master:
turn registration code into a standalone function for re-use
query using both `id` and `parent`
prevent email from leaking in feeds
y didn't i think of this b4?
some zero theming on settings page
missing delimiter
transition to beta for private forums
rev update
Friendicaland - you can't 'live' on a demo server.
Create a "potential default group" called "Friends" on registration.
fix private photos that also have a size specification
private group tests, cont.
hide private group if desired
prvgroup should see intros
private group fix
possible sql injection in search
bugfixes: private photo embeds and search for strings with %
* 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
...
query using both `id` and `parent`
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
...
Conflicts:
mod/search.php
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
Zach Prezkuta