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
friendica
bfd123c59a
openid server
2015-03-11 01:03:14 -07:00
friendica
0014cf4ff2
skip trying to come up with an intelligent way to decide what photos should get a status post - leave it manual.
2015-03-11 00:21:57 -07:00
friendica
844b2ae587
cleanup of old delegation stuff
2015-03-10 20:19:17 -07:00
friendica
65ffd209d4
allow urls using the zot: or zots: URL schemes to exist without getting filtered away.
2015-03-10 19:43:15 -07:00
friendica
9d1df58759
sql optimisation for affinity searches. A new index was added which wasn't added retro-actively to existing DBs as an update. It isn't clear if this helps sites any more than just restricting the abook table to certain channel_id's is (and this field is already indexed).
2015-03-10 18:55:56 -07:00
friendica
ca3eb27505
first cut openid server. Mostly just getting it architecturally prepared - as there may be a few twists and turns ahead.
2015-03-10 18:29:42 -07:00
friendica
b0a78e5288
Merge https://github.com/friendica/red into pending_merge
2015-03-10 15:48:42 -07:00
friendica
5b35f1e6c4
Change logic of "don't create a status post for this photo upload" and turn it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync.
2015-03-10 15:43:15 -07:00
RedMatrix
d6494a7a5d
Merge pull request #923 from dawnbreak/master
...
Fix SQL query for removing orphan hooks.
2015-03-11 09:39:58 +11:00
Klaus Weidenbach
09d0401edb
Fix SQL query for removing orphan hooks.
...
initialize some variables before using them.
commented out some unused variables.
2015-03-10 23:20:05 +01:00
RedMatrix
57384b9f9f
Merge pull request #922 from dawnbreak/master
...
View upload photo button only if you have permission.
2015-03-11 09:10:28 +11:00
Klaus Weidenbach
946beb6191
View upload photo button only if you have permission.
...
Check if post_photos permission is available otherwise hide the photo
upload button.
Or should we show the button and just disable it with a title, about
missing permission to upload photos?
In comments we use the same icon, but just add [img] bb-code. Should we
provide this if no permission to upload photos. Do we need different
icons for [img] and photo upload buttons?
2015-03-10 21:51:14 +01:00
friendica
e0ba373147
Merge https://github.com/friendica/red into pending_merge
2015-03-10 12:23:51 -07:00
friendica
54a9fb1774
diaspora's spammy permission model seems to have leaked through our firehose. Don't let it.
2015-03-10 12:22:22 -07:00
Mario Vavti
637f0eba4f
collapse jot tools to submenu on small and extra small screens
2015-03-10 13:20:10 +01:00
friendica
3466547784
missing include
2015-03-10 02:27:10 -07:00
friendica
98dffd77ef
channel delegation
2015-03-10 02:23:14 -07:00
friendica
4237e8052e
buttons for admin_accounts + admin_channels
2015-03-09 20:40:02 -07:00
friendica
b2e33435f7
increase the cell padding (any jokes about padded cells will be ignored)
2015-03-09 20:00:20 -07:00
friendica
0134a41015
more work on queue optimisations
2015-03-09 19:57:35 -07:00
friendica
ef035a29bc
Merge https://github.com/friendica/red into pending_merge
2015-03-09 18:38:41 -07:00
friendica
c3d20cfba9
Bring simple editor formatting functions back to the main editor (bold, italic, underline, quote, code) so as to maintain parity and consistency with comments. Currently this will make the editor toolbar seem a bit cluttered but be aware that the second button group (attach and link tools) will be reduced to two buttons (attach and link) when the next phase of this work is completed. The third group of tools are optional features and will only be presented based on personal choice. Visual editors may need to disable, relocate, or redefine these buttons.
2015-03-09 18:32:51 -07:00
Habeas Codice
a611eed172
Whoops... should've actually checked the pg manual before merging #920 :-)
...
replace if(cond,val,val) with case when cond then val else val end, works on
both DBs
2015-03-09 17:54:14 -07:00
friendica
972780c3ce
whitespace
2015-03-09 16:28:06 -07:00
friendica
26a414fe4b
make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon
2015-03-09 16:27:12 -07:00
friendica
97df5f1fd1
Merge https://github.com/friendica/red into pending_merge
2015-03-09 15:24:25 -07:00
friendica
16bcca6aab
up the count of directory tags
2015-03-09 15:24:05 -07:00
Mario Vavti
73fdb760c1
Merge branch 'master' of https://github.com/friendica/red
2015-03-09 23:21:34 +01:00
Mario Vavti
1d59924f4d
make areYouSure alert also if default post perms change
2015-03-09 23:21:00 +01:00
friendica
4936beb259
Merge https://github.com/friendica/red into pending_merge
2015-03-09 15:20:55 -07:00
friendica
e7d3244276
Allow site to over-ride directory options. Bugger off.
2015-03-09 15:16:52 -07:00
Mario Vavti
00d7ea90a2
add transition effect for border-color
2015-03-09 16:52:37 +01:00
