friendica
4212a1f589
start on some db_table doco
2015-03-15 18:49:44 -07:00
friendica
d7a6dae3cb
Merge https://github.com/friendica/red into pending_merge
2015-03-15 16:51:35 -07:00
RedMatrix
e780dada83
Merge pull request #931 from dawnbreak/master
...
Some JavaScript cleanups.
2015-03-16 10:51:15 +11:00
friendica
6da40fc559
mod_id: load profile so the sidebar profile will work
2015-03-15 16:48:45 -07:00
Klaus Weidenbach
864116805b
Documentation and remove duplicate code.
...
Add a bit Doxygen documentation and remove some duplicate code from
account.php.
2015-03-16 00:20:14 +01:00
friendica
92470eb0f2
Show profile on openid server page
2015-03-15 16:15:10 -07:00
Klaus Weidenbach
792e475a78
Some JavaScript cleanups.
...
Adding some missing and remove some unnecessary semicolons.
Change some comparing operators.
Changed access to objects with dot operator.
2015-03-15 23:56:32 +01:00
friendica
4e457723c9
Merge https://github.com/friendica/red into pending_merge
2015-03-15 15:37:53 -07:00
friendica
6537a65053
mysql schema typo, do the install check for store before chcking smarty, as that is where the dir is created, change install doc to point to install/schema_xxxxx.sql instead of database.sql
2015-03-15 15:36:01 -07:00
Mario Vavti
fdcbb61bcb
assure that badges will be displayed as circles no matter what font is used and if there is only one digit inside. move css to its proper place
2015-03-14 12:37:48 +01:00
friendica
cc2c7bbcd8
revert the revert - that is working. My test was bad.
2015-03-14 01:03:37 -07:00
friendica
88167718ba
revert and rethink
2015-03-14 00:51:16 -07:00
friendica
b76cdf82d2
create terms for Diaspora mention tags - which in Diaspora are handled differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause.
2015-03-13 19:24:17 -07:00
RedMatrix
27e92ff277
Merge pull request #929 from zzottel/master
...
fix posts not showing up in network if author is not in connections
2015-03-14 10:58:00 +11:00
RedMatrix
f823e2e2ed
Merge pull request #928 from dawnbreak/docu
...
Some documentation, fix chatroom service class lookup.
2015-03-14 10:43:22 +11:00
zottel
e732fbe8e8
fix posts not showing up in network if author is not in connections
2015-03-14 00:22:47 +01:00
Klaus Weidenbach
80816a7195
Some documentation, fix chatroom service class lookup.
...
Add some Doxygen documentation and fixing a service class lookup for
chatroom_create().
2015-03-14 00:10:06 +01:00
friendica
7d5efe88e0
use local_channel() connnections to match the abook against when joining the abook on the discover tab.
2015-03-13 15:39:19 -07:00
friendica
4fb7d4f58a
make nav badges big enough to be clickable on small touch devices
2015-03-13 15:23:15 -07:00
friendica
f458c29a2b
invoke tgroup_check() on diaspora posts/comments in case the recipient is a forum with channel_w_stream permissions restricted.
2015-03-13 14:48:44 -07:00
friendica
ce33eca4b2
update to-do list
2015-03-13 01:22:32 -07:00
friendica
c412e6e640
revert that
2015-03-12 20:51:36 -07:00
friendica
93caead072
try to allow translation of ax regs
2015-03-12 20:43:53 -07:00
friendica
d60cb14c2f
support a fair number of the common AX regs
2015-03-12 20:05:43 -07:00
friendica
9dc9442644
Merge https://github.com/friendica/red into pending_merge
2015-03-12 18:49:28 -07:00
friendica
f2d84608af
Add some AX vars to openid server.
2015-03-12 18:48:32 -07:00
RedMatrix
52f7d1d068
Merge pull request #927 from dawnbreak/master
...
Some cleanups and a bugfix.
2015-03-13 11:39:14 +11:00
Klaus Weidenbach
124b17dcf4
Some cleanups.
...
Fixed dbesc_identifier(), but it is not used yet.
Corrected some other variable names and variable initialization before
using them.
2015-03-13 00:36:32 +01:00
friendica
02a58dc5b0
more JS=1 weirdness
2015-03-12 16:20:29 -07:00
friendica
1d05f922f8
reduce the occurrence of duplicated notice() messages
2015-03-12 16:16:29 -07:00
friendica
f507a5cd5a
prepare for demise of google code
2015-03-12 16:05:56 -07:00
friendica
71f2a797cb
try and add some regs
2015-03-12 15:19:54 -07:00
Klaus
fc84c81f64
Merge pull request #926 from dawnbreak/master
...
Fix JavaScript problems on channels where you are not allowed to upload ...
2015-03-12 23:14:51 +01:00
Klaus Weidenbach
c6162c4c88
Fix JavaScript problems on channels where you are not allowed to upload photos.
...
Add some try...catch blocks around JavaScript that throws errors.
This commit should fix the current problems that were introduced by an
earlier commit.
2015-03-12 22:57:00 +01:00
Mario Vavti
d11bec6f58
add generic_addon_settings template and minor fixes
2015-03-12 22:22:52 +01:00
Mario Vavti
0905180385
Merge branch 'master' of https://github.com/friendica/red
2015-03-12 10:20:21 +01:00
Mario Vavti
8113ee1c4a
some work on feature/addon settings
2015-03-12 10:19:56 +01:00
Habeas Codice
1578c49976
substr() is a mysql alias for substring(). substring() is in the SQL standard and is supported by both
...
databases.
2015-03-12 00:28:49 -07:00
friendica
76fedfe1f8
openid stuff
2015-03-11 21:49:29 -07:00
friendica
64ae17aa6a
Merge branch 'master' into openid
2015-03-11 19:35:23 -07:00
friendica
b3a9a6c802
remove the now redundant audio/video buttons and label the editor text style buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.
2015-03-11 18:56:28 -07:00
RedMatrix
48f99c9a60
Merge pull request #925 from unary/fixinsert
...
add missing %d for abook_closeness
2015-03-12 12:14:28 +11:00
friendica
d80088f6f6
make embeds bookmarkable
2015-03-11 18:12:04 -07:00
friendica
1b3fee05e6
turn parse_url into the definitive url attaching mechanism
2015-03-11 18:04:43 -07:00
Michael Johnston
4e98a70e66
add missing %d for abook_closeness
2015-03-11 20:56:40 -04:00
friendica
d6ce32ef78
parse_url changes for oembed/zvideo/etc.
2015-03-11 17:31:15 -07:00
friendica
848274bb30
Merge https://github.com/friendica/red into pending_merge
2015-03-11 15:12:21 -07:00
friendica
35fc14d6ab
don't relay diaspora comments to sys channel
2015-03-11 15:11:57 -07:00
Mario Vavti
115f9a4e45
update sample-nginx.conf redirect to check for args
2015-03-11 21:31:50 +01:00
friendica
a40c19d19d
Merge branch 'master' into openid
2015-03-11 01:03:30 -07:00
