friendica
df6d54c64e
Merge branch 'master' into pocorate
2015-01-29 15:21:19 -08:00
Christian Vogeley
f81df92ef8
Add allowed and not allowed emails to the UI in the
...
admin menu
2015-01-29 20:27:35 +01:00
RedSwede
06291c6f42
non-tested fix for issue 847
2015-01-29 16:22:14 +01:00
friendica
fd0b6c967f
Merge branch 'master' into pocorate
2015-01-29 00:28:23 -08:00
friendica
a496036066
local_user => local_channel
2015-01-28 20:56:04 -08:00
friendica
da842da683
Merge branch 'master' into pocorate
2015-01-28 16:06:36 -08:00
marijus
f455036905
show shared button only to local user
2015-01-28 09:49:36 +01:00
friendica
f0b900057a
first cut at direntry template, right now just provide a mockup with a slider and rating count to look at.
2015-01-27 16:51:13 -08:00
marijus
17c684e123
tpl and css cleanup
2015-01-27 19:33:30 +01:00
marijus
65aa6cf708
move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme
2015-01-27 19:00:16 +01:00
friendica
505d530d28
we also don't need a profile selector when editing our default permissions.
2015-01-25 14:32:00 -08:00
friendica
03412e8a58
don't hide the scary stuff when editing self permissions.
2015-01-25 14:28:48 -08:00
friendica
0125e9d288
Hide all the scary decision making stuff that sends intellectually challenged beings into siezures and brain melt-downs and online freak-outs.
2015-01-25 14:06:57 -08:00
friendica
b3370243e8
move connection approval checkbox to top of page (above the sliders) - instead of being in between rating and rating text.
2015-01-25 12:35:57 -08:00
marijus
e874376268
this will require more fixing in include/enotify
2015-01-23 02:09:28 +01:00
friendica
b946ac63a1
couple of hubloc manager issues
2015-01-21 19:09:12 -08:00
marijus
43326a26b7
css fixes - hopefully
2015-01-20 22:19:51 +01:00
marijus
5ee815b2fa
satisfy the floated images
2015-01-20 21:10:41 +01:00
marijus
1c2d956d7f
basic proof of concept file activity support - will send activity via the filestorage module and via attach_delete()
2015-01-18 14:44:58 +01:00
friendica
dfe31dc3b7
more heavy lifting on poco rep
2015-01-15 19:05:42 -08:00
friendica
597b07e8cc
poco rating - add a test module for pulling out ratings
2015-01-15 17:32:41 -08:00
friendica
e7932d97a2
editing stuff for poco reputation
2015-01-15 16:37:47 -08:00
friendica
1c9299ed42
more backend work on poco rating
2015-01-15 14:05:18 -08:00
friendica
e528483d81
hide friends broken, add parameter for item search by verb
2015-01-13 14:42:54 -08:00
friendica
580c30f516
another attempt to explain default permissions on connedit page
2015-01-11 21:18:29 -08:00
Stefan Parviainen
4e3aadc38a
Rename some stuff related to autocomplete
2015-01-07 18:57:16 +01:00
Stefan Parviainen
b320b8cbf3
Replace fancybox with colorbox
2015-01-05 19:49:20 +01:00
Stefan Parviainen
128b0008ee
Replace jslider with jRange
2015-01-05 18:30:12 +01:00
Stefan Parviainen
c14dc699ae
Fix initEditor on non-wall pages
2015-01-05 00:28:42 +01:00
Stefan Parviainen
57809f20a4
Sorting of autocomplete
2015-01-04 14:23:23 +01:00
Stefan Parviainen
386f361855
Autocmplete suggestions for non-local users, also suggest from visited channel's connections
2015-01-04 12:54:23 +01:00
friendica
9433a0ddc8
Merge https://github.com/friendica/red into pending_merge
2015-01-04 00:48:17 -08:00
friendica
028dff44cc
remove hard-coded url to caterva.eu from events code.
2015-01-04 00:47:44 -08:00
marijus
0779e3ae53
provide some info for buttons
2015-01-03 13:42:05 +01:00
friendica
31648d65c8
some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved.
2015-01-02 19:20:52 -08:00
Stefan Parviainen
42773a1122
Reworked switch to also display text
2015-01-02 18:14:23 +01:00
RedMatrix
e7081db19b
Merge pull request #807 from pafcu/dblclicknewevent
...
Double click on day in calendar creates new event starting that day
2015-01-02 12:11:08 +11:00
RedMatrix
817b54688e
Merge pull request #805 from pafcu/moretpl
...
Move some HTML out to templates
2015-01-02 12:10:50 +11:00
Stefan Parviainen
1c2dc97a4a
Double click on day in calendar creats new event starting that day
2015-01-01 18:19:17 +01:00
Stefan Parviainen
85e76773a0
Use grouped select field for role selection
2015-01-01 15:54:16 +01:00
Stefan Parviainen
686b6ee118
Use grouped select field for timezone selection
2015-01-01 14:44:50 +01:00
Stefan Parviainen
ef94747e5e
Add field template for grouped selects
2015-01-01 14:36:17 +01:00
Stefan Parviainen
ef6680f7ad
Possibly make switches work on IE8 (untested)
2015-01-01 11:33:00 +01:00
Stefan Parviainen
70f0019905
Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic
2015-01-01 10:08:20 +01:00
RedMatrix
b7d758fed0
Merge pull request #795 from pafcu/tplcleanup
...
Remove some old, unused templates
2014-12-31 10:22:12 +11:00
RedMatrix
4a82967639
Merge pull request #791 from pafcu/notifications
...
Improved notifications
2014-12-31 10:21:38 +11:00
marijus
4edc9a696b
design fixes for photos, files and random fixes
2014-12-30 21:04:48 +01:00
Stefan Parviainen
e6a3ea2c95
Make showing wall posts, intros and private messages under Notices optional
2014-12-30 15:27:33 +01:00
Stefan Parviainen
12e6d98659
Remove some old, unused templates
2014-12-30 14:11:27 +01:00
marijus
6cbbe854d5
css fixes
2014-12-30 12:12:55 +01:00
RedMatrix
619733e297
Merge pull request #789 from pafcu/chanman
...
Don't show current channel separately in channel manager, highlight it i...
2014-12-30 08:57:37 +11:00
marijus
f2bfdf0c76
some work on cloud actionspanel and minor cleanup
2014-12-29 22:45:07 +01:00
Stefan Parviainen
e69e59d260
Don't show current channel separately in channel manager, highlight it instead
2014-12-29 22:07:40 +01:00
Thomas Willingham
a70e42edac
Remove link to hubloc status in admin panel. This is a potentially useful tool,
...
but plain doesn't work at the moment.
2014-12-29 14:47:41 +00:00
RedMatrix
7b98a6fcb0
Merge pull request #772 from pafcu/chanman
...
Some work on the channel manager
2014-12-29 09:29:12 +11:00
marijus
fa23439b9c
more files css fixes
2014-12-28 20:46:16 +01:00
marijus
1ab23061df
files css fixes
2014-12-28 20:34:12 +01:00
marijus
801ab709ad
more work on files
2014-12-28 18:16:27 +01:00
Stefan Parviainen
40a327b68f
Allow quick access to mail and connections from Channel Manager
2014-12-27 14:06:09 +01:00
Stefan Parviainen
6a679d26ce
Fix #771 , add tooltips to mail and intros count in channel manager, always show counts (even when 0, makes it easier to understand what the icons are)
2014-12-27 13:36:05 +01:00
marijus
0cb0c2b1bf
more work on files
2014-12-27 10:10:56 +01:00
Stefan Parviainen
fa65d31f3f
Move app icon centering to style.css
2014-12-22 23:09:10 +01:00
Stefan Parviainen
c819c276f0
Remove unused apps.tpl
2014-12-22 19:05:16 +01:00
Stefan Parviainen
37534d110c
Center app names
2014-12-22 18:53:13 +01:00
friendica
d3830aea96
provide last successful poll run time (using relative time) in siteinfo so that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly.
2014-12-21 18:40:25 -08:00
RedMatrix
c732b72a0d
Merge pull request #757 from git-marijus/master
...
files: make mod/filestorage.php load via ajax and some design work. work...
2014-12-22 09:45:33 +11:00
marijus
be1891c058
fix button visibility
2014-12-21 21:48:10 +01:00
marijus
02328bfdbe
forgot to git add files
2014-12-21 20:27:43 +01:00
marijus
27d786c979
files: make mod/filestorage.php load via ajax and some design work. work in progress...
2014-12-21 20:11:30 +01:00
Stefan Parviainen
aa73259a47
Fancy categories input with bootstrap-tagsinput
2014-12-21 12:42:07 +01:00
friendica
6d8214f96b
provide link to help for channel permission roles when creating a channel
2014-12-19 01:48:47 -08:00
friendica
f113984d69
essentials for creating a "block-style" list-mode page such as one might have for a pinterest-style layout. Just load view/theme/redbasic/css/blockmode.css after redbasic PCSS - you're done. We may need some other indicator besides the number of comments to indicate "click here to see the rest of the article", but we're a bit short on space so maybe a view icon will work.
2014-12-16 23:40:52 -08:00
friendica
2fcbb9c4b3
fix some directory anomolies
2014-12-16 18:33:16 -08:00
friendica
07e747ed0e
add divmore to directory entries
2014-12-16 17:29:16 -08:00
friendica
7bee4e5997
build a channel based thread viewing link when in list_mode and when using the channel module, which will disable list_mode (this was checked in yesterday) for the benefit of viewing threads with the correct identities and comment permissions instead of relying on the semi-random uid chosen by mod/display when viewed by an authenticated remote_user().
2014-12-16 14:12:40 -08:00
friendica
2e990743e7
Merge https://github.com/friendica/red into pending_merge
2014-12-15 14:37:57 -08:00
friendica
f28103d595
wall tags
2014-12-15 14:37:31 -08:00
Thomas Willingham
c6d0695edf
Issue #743
2014-12-15 19:32:28 +00:00
Thomas Willingham
049f08e6ad
Merge pull request #744 from pafcu/searchhelp
...
Add hint on how to use search box
2014-12-15 14:53:25 +00:00
Stefan Parviainen
ce88f0ab6a
Add hint on how to use search box
2014-12-14 18:40:59 +01:00
Stefan Parviainen
0f169a1427
Add extra class to verified item icon
2014-12-14 12:25:08 +01:00
Thomas Willingham
76fdfb7ef5
Merge pull request #738 from pafcu/moreids
...
Add some ids to nav elements
2014-12-13 16:40:13 +00:00
Thomas Willingham
5fac8e80de
Issue #739
2014-12-13 15:00:00 +00:00
Stefan Parviainen
513efc8928
Add some ids to nav elements
2014-12-12 16:27:45 +01:00
marijus
960c35bad3
move profile css to mod_profile and minoor fixes
2014-12-11 11:44:46 +01:00
marijus
b86c4156fc
some work on profile page - mostly whitespace
2014-12-10 22:13:44 +01:00
marijus
cc365513ed
adjustment to clear browser location button only if use browser location option is set
2014-12-09 15:22:53 +01:00
marijus
242713ebef
show clear browser location button only if use browser location option is set and minor css fixes
2014-12-09 15:09:19 +01:00
Stefan Parviainen
e233e386b8
Group comment editor icons
2014-12-08 22:46:30 +01:00
Stefan Parviainen
d65ad03aec
Put some spacing between share types and other buttons in jot
2014-12-08 22:37:02 +01:00
Thomas Willingham
934172c2fc
Merge pull request #724 from pafcu/suggestionsindir
...
Show suggestions in directory
2014-12-08 13:34:56 +00:00
Thomas Willingham
99b5bef68e
Merge pull request #723 from pafcu/diropts
...
Directory sorting as a dropdown, forum filter as checkbox, option to sor...
2014-12-08 13:31:34 +00:00
Stefan Parviainen
c8818d8349
Suggestions in dir redux. Suggestions are now showed in directory if suggest=1 parameter is given to directory.
2014-12-07 13:40:21 +01:00
Stefan Parviainen
83ea120ac9
Revert "Revert "Directory shows channel suggestions by default""
...
This reverts commit bfde28f28e
2014-12-07 13:40:21 +01:00
Stefan Parviainen
647311db3e
Directory sorting as a dropdown, forum filter as checkbox, option to sort oldest first
2014-12-07 12:31:12 +01:00
Thomas Willingham
460d379e7e
Don't allow affinity of 0 in connedit.
2014-12-02 00:59:20 +00:00
friendica
3bb0ef8a82
Make events export track the current calendar. Turn it and 'new event' into buttons
2014-11-24 20:40:00 -08:00
friendica
756abd6678
add event export (this month) to event UI
2014-11-24 02:50:14 -08:00
friendica
79e5c2456b
add link to search forums in the directory
2014-11-23 18:54:33 -08:00
friendica
7fec939c23
couple of fixes:
...
- significantly increase the content availability on the discover channel
- fix the button group on the blog/list mode which made the border on a single comment button a bit wonky
2014-11-19 14:41:24 -08:00
friendica
3224848bad
turn the "adult photo flagging" (which prevents a particularly flagged photo from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody.
2014-11-18 19:02:28 -08:00
friendica
11f0b45a90
blog mode - turn the comment link into a button and group with the likes/dislikes
2014-11-18 16:58:36 -08:00
friendica
38d50cabd4
private mail buttons
2014-11-18 15:13:37 -08:00
RedMatrix
bfde28f28e
Revert "Directory shows channel suggestions by default"
2014-11-19 09:15:24 +11:00
RedMatrix
3917880673
Merge pull request #702 from pafcu/master
...
Directory shows channel suggestions by default
2014-11-19 09:06:36 +11:00
Stefan Parviainen
e0ab1e24e4
Directory shows channel suggestions by default
2014-11-18 19:42:13 +01:00
friendica
1d96e165e0
undo disabled submit buttons now that ACL is initialised when page loaded
2014-11-18 00:24:32 -08:00
friendica
db3015e34e
allow members to set the per-item "show more" height (separately for network and matrix, display and search are system pages and therefore set at 400)
2014-11-17 23:48:03 -08:00
friendica
064b48fa71
Merge https://github.com/friendica/red into pending_merge
2014-11-17 15:27:18 -08:00
friendica
c0ad4763b3
add unseen count and way to mark unseen to list mode. Also fix automatic mark of unseen so as to work with list mode.
2014-11-17 15:18:06 -08:00
RedMatrix
5aba2e82df
Merge pull request #695 from pafcu/master
...
Switch to a better datetime picker widget
2014-11-18 08:33:04 +11:00
Stefan Parviainen
e190adc589
Use new date selector for item expiry
2014-11-17 16:51:46 +01:00
friendica
acc8c69242
when in list mode, make the max height half of the normal height before 'divgrow' kicks in.
2014-11-16 19:33:58 -08:00
friendica
18cedf4def
blog/list mode display settings
2014-11-16 16:48:35 -08:00
friendica
cbaee76dd9
"list mode" (forum and blog mode, no comments or comment boxes displayed on the summary page)
2014-11-16 16:19:24 -08:00
friendica
3d55c9da86
buttonify some design elements that had not yet been buttonified
2014-11-13 18:51:30 -08:00
Habeas Codice
ac27db22c1
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
2014-11-13 13:06:31 -08:00
Habeas Codice
1a5a5c7edb
PostgreSQL support initial commit
...
There were 11 main types of changes:
- UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but
it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just
copied from Friendica. All of these instances, the LIMIT 1 was simply removed.
- Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit
integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice
to boot). Proper explicit boolean conversions were added. New queries should use proper conventions.
- MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_
func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There
were no true toggles (XOR). New queries should refrain from using XOR when not necessary.
- There are several fields which the schema has marked as NOT NULL, but the inserts don't specify
them. The reason this works is because mysql totally ignores the constraint and adds an empty text
default automatically. Again, non-compliant, obviously. In these cases a default of empty text was
added.
- Several statements rely on a non-standard MySQL feature
(http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html ). These queries can all be rewritten
to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run
a zillion times faster, even on MySQL.
- A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG,
UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_
- INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes
around the value -- assist functions added in the dba_
- NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such
thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are
handled in Zot/item packets automagically by quoting all dates with dbescdate().
- char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the
code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works
better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype
for all text fields in the postgres schema. varchar was used in a couple of places where it actually
seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code
actually validates data, new bugs might come out from under the rug.
- postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted.
bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function
was added to handle this transparently.
- postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax.
Statements were updated to be standard.
These changes require corresponding changes in the coding standards. Please review those before
adding any code going forward.
Still on my TODO list:
- remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting
- Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 12:21:58 -08:00
friendica
306f5d9cbe
let's try this without a timeout
2014-11-13 01:04:26 -08:00
marijus
1ed144b83c
make search and advanced search use the same input form
2014-11-12 10:27:13 +01:00
friendica
4b9ec6645b
cleanup
2014-11-11 20:44:43 -08:00
friendica
3fa003b5a8
add some subtle delineation to directory entries, remove forced link on homepage element (SECURITY)
2014-11-11 15:13:18 -08:00
marijus
d145ef2021
some work on directory widgets
2014-11-11 23:09:55 +01:00
friendica
0a84b45793
Merge https://github.com/friendica/red into pending_merge
2014-11-10 19:22:23 -08:00
friendica
d432f4ccd5
issue #683 - don't linkify homepage field without validating
2014-11-10 19:20:23 -08:00
RedMatrix
ecdfa0b96d
Merge pull request #686 from beardy-unixer/master
...
Add a new theme flag - library. Not directly available to be used itsel...
2014-11-11 13:40:03 +11:00
friendica
5619902776
indicate public forums in directory results (there will be some [possibly considerable] lag time before existing forums are correctly tagged).
2014-11-10 17:44:02 -08:00
Thomas Willingham
9ddf49c661
Add a new theme flag - library. Not directly available to be used itself but
...
installed as a lib for other themes. Like SDL, or GTK.
Get rid of mobility - it's better done with Comanche and schemas.
Describe themes instead of restricting them. Mobile themes can be used as
the desktop theme and vice-versa. This deals with the problem of "but my
device is something inbetween".
Presently not exposed to members.
2014-11-10 19:34:39 +00:00
friendica
2e695d1da2
menu page cleanup
2014-11-09 17:39:54 -08:00
RedMatrix
3730abb13a
Merge pull request #681 from pafcu/master
...
New layout for directory
2014-11-09 16:08:22 +11:00
Stefan Parviainen
28f3d7be5a
New layout for directory
2014-11-09 00:18:26 +01:00
friendica
7a8842f443
Merge https://github.com/friendica/red into pending_merge
2014-11-08 13:15:52 -08:00
friendica
adb5cec0d2
add acl loading fix to menu-item edits
2014-11-08 13:14:08 -08:00
marijus
862f0ff29a
prevent posting before acl got populated since this will disregard the default acl setting and the post will be visible to the default audience without warning. the chance that this happens is quite small while writing a post but can easily happen on eg editing photos (maybe just tick a checkbox and press submit). the acl and submit buttons are disabled by default and will be activated as soon as acl is populated.
2014-11-08 21:55:44 +01:00
Stefan Parviainen
b5fad9feef
Fix merge conflict
2014-11-08 20:53:41 +01:00
Stefan Parviainen
1a8fc73b57
Fix highlighting of login button
2014-11-08 20:06:08 +01:00
marijus
2cfe0f1545
provide lockstate for photo edit
2014-11-07 12:13:38 +01:00
friendica
1fbd1a79c7
Provide a way to mark photos as adult and hide them from the default album view. Still need a button or setting to enable "unsafe viewing". This has no effect anywhere but in the album views. They can still be viewed by flipping through the individual photos with 'prev' and 'next'. We probably need a comprehensive strategy for how to deal with n-s-f-w photos in albums so consider this a band-aid which requires additional work and integration with other facilities which access these photos. It is entirely optional.
2014-11-06 17:27:28 -08:00
friendica
038e7c8923
crude skeleton for location manager and the UI sucks but at least it's on a webpage and you don't have to do it by hand.
2014-11-05 18:39:10 -08:00
RedMatrix
9c9c18b4a6
Merge pull request #674 from pafcu/master
...
Fix duplicate element id
2014-11-06 06:48:06 +11:00
Stefan Parviainen
1a445a17d8
Fix duplicate element id
2014-11-05 17:19:46 +01:00
friendica
1896855c85
minor adjustments to make the form work as designed
2014-11-04 17:38:49 -08:00
friendica
d5d6158973
ok heads up - potentially destabilising change. I've tried to sort out all the default connection permissions for those who don't have a predefined (or therefore have a "custom") permissions role. Unfortunately this includes most people that were using this software more than a month ago. The real changes are that the SELF address book entry no longer holds "auto-permissions" but instead holds your "default permissions" (if you have a pre-defined role, the defaults will be pulled from the role table).
...
The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes.
What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected.
With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
2014-11-04 17:11:02 -08:00
friendica
ba7f1bb8ee
configurable visual alerts/notifications
2014-11-04 15:24:24 -08:00
marijus
73e645fe3d
class > id mixup
2014-11-04 09:35:39 +01:00
marijus
ba73b60177
missing </div>
2014-11-04 09:29:11 +01:00
friendica
fdb9b9d52e
Merge https://github.com/friendica/red into pending_merge
2014-11-03 14:51:28 -08:00
friendica
a6d8c3193a
various UI issues related to having an enormous number of entries in the posted_date selector including years/months that had no posts
2014-11-03 14:49:03 -08:00
marijus
1d923d2b0d
one </div> to much and css fixes
2014-11-03 12:54:17 +01:00
marijus
2f85d12a6c
if deleting a photo go away to album
2014-11-03 10:46:57 +01:00
