Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 15:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11895 commits 7 branches 30 tags 160 MiB
Commit graph

855 commits

Author SHA1 Message Date
RedMatrix
415be29261 Merge pull request #592 from jeroenpraat/master 
Issue #590: Linked conversation titles to source.
 2014-09-13 19:24:01 +10:00
marijus
61ce524a33 define justifiedGalleryActive in head.tpl to not break other pages autoload 2014-09-12 21:32:53 +02:00
jeroenpraat
d4e7a71d1e Issue #590: Linked conversation titles to source. 
If a theme wants to have it different, it can always copy this .tpl file to ../theme/tpl/. I didn't commit this directly, because it's a little bit controversial. But I like it!
 2014-09-12 21:21:16 +02:00
friendica
1b3196862d issue #588 can't add feeds to collections using connedit page group sidebar widget 2014-09-11 02:19:21 -07:00
marijus
3caee72aee another day another concept - hope this works better 2014-09-11 10:41:11 +02:00
marijus
8835f646ae Revert "Revert "Merge pull request #583 from git-marijus/master"" 
This reverts commit 08638f3ec8.
 2014-09-11 10:35:19 +02:00
friendica
5b774e26ca make sure we add the file 2014-09-10 23:09:54 -07:00
friendica
4c8036f530 endless scroll on connections page 2014-09-10 23:08:24 -07:00
friendica
6ab21b3d4f make verify_email the default for new installs (at least English installs), and provide a setting on the admin page for it. 2014-09-10 17:42:13 -07:00
friendica
08638f3ec8 Revert "Merge pull request #583 from git-marijus/master" 
autoload broken - even after clearing cache and retrying.

This reverts commit 13e7a8f123, reversing
changes made to 4712b78e52.
 2014-09-10 16:09:01 -07:00
marijus
c1c2214b47 photo justification 2014-09-10 17:10:39 +02:00
friendica
b1254a71bc wrap photo albums (albums and top level) in a div id=photo-album-contents 2014-09-08 16:28:02 -07:00
friendica
ed847a91f6 add categories to events 2014-09-07 22:14:28 -07:00
friendica
4faeebddb2 Diaspora actually puts the account full name into the "nickname" field of the vcard. They don't put the nickname into the vcard at all. One wonders why even have a nickname field since the fullname is already presented in the next line. This hasn't caused us a problem with Friendica because I'm guessing nobody actually uses this line, though the number of class tags on it makes it seem somewhat important. 2014-09-07 17:13:44 -07:00
friendica
28b75b028d ajax work 2014-09-06 00:37:15 -07:00
friendica
dd7d0c4156 more work on the event edit form 2014-09-05 01:58:27 -07:00
friendica
92e4448993 put a date and time picker on events 2014-09-04 22:30:12 -07:00
friendica
75d0f6329c outbound feed issue 2014-09-03 01:09:28 -07:00
Thomas Willingham
6d7897a955 Don't forget the ifs. Now we just need to write some blurb, find some 
images, add a link, and decide what to do with non-earned badges...basically
all of it.
 2014-09-02 02:37:23 +01:00
Thomas Willingham
ab031664fa Move achievements on, but just a tad. 2014-09-02 02:34:04 +01:00
friendica
5e5c6c9000 consistency: the diaspora post plugin uses "diaspora_enable". The protocol driver uses "diaspora_enabled" with a 'd'. They got mixed up in a couple of places. 2014-08-28 03:33:19 -07:00
friendica
2d210db1b8 ability to create/edit/delete custom profile field definitions - read the source. Currently the created entries aren't added to the allowed fields arrays, but this can be done by hand until that bit is made available. Only choice for input type at the moment is 'text' or a text input, not a textarea. Multiple choice will be added later. 2014-08-27 22:01:02 -07:00
friendica
bbcf0be16a Admin setting for Diaspora Protocol enable. We may want to have this also at a channel level since there are privacy issues and quirks and trade-offs. 2014-08-27 18:19:56 -07:00
RedMatrix
45e8419bce Merge pull request #574 from tuscanhobbit/master 
Notifications links load on the same window(tab)
 2014-08-27 18:15:42 +10:00
tuscanhobbit
c4a2409778 notifications open in the same window(tab) 2014-08-27 09:35:17 +02:00
marijus
2df4c44de5 make vcard and contact block widget look-alike 2014-08-27 00:59:07 +02:00
friendica
c99d89e441 get rid of template "auto generated" warnings 2014-08-25 22:58:30 -07:00
friendica
6e99848043 more diaspora stuff - most of the basic bits are there except queueing and physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs 2014-08-25 22:43:44 -07:00
friendica
df634f9853 notifications/system not marking all notifications seen 2014-08-25 20:55:37 -07:00
friendica
72a766432d missing template file 2014-08-21 20:45:15 -07:00
friendica
e524835463 the rest of the diaspora local discovery stuff 2014-08-21 20:31:55 -07:00
friendica
921799b045 make the old personal xrd interface (old webfinger) work again 2014-08-21 17:42:19 -07:00
friendica
831714f0f0 profile edit - missing visibility and drop link on non-default profiles, re-arrange order of replacing red#matrix smilie so it works correctly, accept a post with body content of '0' which was interpreted by x() as nothing (was treated as integer). 2014-08-21 16:46:24 -07:00
friendica
a59a6fbd90 abook-edit-me class lost during some edit - we need this to reset the permission fields 2014-08-21 01:41:15 -07:00
friendica
b4aed12129 extensible profiles - add the input form elements. Still needs styling and we're not yet storing the results. And right now we're ignoring the type and only doing type=string. Oh yeah - and I split off starting the second delivery chain into its own function in tag_deliver since it was largely duplicate code. 2014-08-20 23:01:25 -07:00
friendica
a6829f7dcb move Friendica photo migrator to addons, bring back a few XML scraping functions that we're going to require (unfortunately) 2014-08-20 17:15:13 -07:00
friendica
f7895d322e provide admin option for allowing rss/atom feed connections. Need to do this now before the feature is complete so that public sites don't get borked. We also will need a service class for this. 2014-08-20 16:10:57 -07:00
friendica
b3d450626e provide an overt indication that a post/comment was edited. 2014-08-18 22:44:03 -07:00
friendica
b522ab13cb nav channel selection 2014-08-18 20:03:48 -07:00
Christian Vogeley
54fe09f466 Add account deletion to the UI 2014-08-16 16:28:07 +02:00
RedMatrix
f4229dbc3f Merge pull request #561 from cvogeley/master 
Some work on account deletion
 2014-08-15 09:58:43 +10:00
Christian Vogeley
fc94a638cd Some work on account deletion 2014-08-14 20:17:57 +02:00
friendica
1d6f494936 some work on extended profile fields 2014-08-13 22:22:52 -07:00
marijus
bc85f7d6e3 provide an expert option to opt out from user zoom on mobile devices 2014-08-13 15:32:15 +02:00
friendica
50da5bd389 Friendica photo import tool. This will bring in all your photos from the chosen Friendica account and import them into Red. Note that profile photos will also be imported, but will not be scaled for profiles, nor will they be attached to any profiles. They will appear however in your Profile Photos album. Photos that had any access restrictions in Friendica will be made private to only you. Comments and likes, captions, and tags are not transferred, only the actual photos. You will only be able to do this once. If something goes wrong but any photos were imported, a pconfig called frphotos.complete will be set and you'll have to remove it to start over. If you should remove this to start over, we also check each photo and will not over-write a photo you already brought over. 2014-08-12 18:08:31 -07:00
Jeroen
bec565cdc3 Some more buttons. Not ready yet. Changed in private message -submit- to -send-. Confusing in other language(s). 2014-08-09 01:18:31 +00:00
friendica
a7d95108d0 cleanup some text where we said "public" or "visible to anybody on the internet" when that isn't necessarily true. 2014-08-07 18:22:50 -07:00
Jeroen
d2a7b5babe Reworked the options on the profile edit page. In one words: buttons. Hope you liked it. Revert or fix if not. Also reworked the channels manage page a bit, because channel names where not readable with larger fonts. Not perfect yet, but now readable and I think better aligned. Also revert/fix if not good. 2014-08-06 21:49:30 +00:00
friendica
0b30f08fae minor stuff 2014-08-05 22:08:12 -07:00
friendica
dc98e6c0e9 scrolling directory 2014-08-05 21:48:13 -07:00
friendica
004eaacc73 channel manage page - notification indicators 2014-08-04 17:24:26 -07:00
friendica
00fc23bf4e issue #551 provide import/export of profiles (if this feature is enabled) 2014-08-04 16:48:40 -07:00
friendica
e0d338f102 always provide 'name' on profile edit page (and profile name), regardless of any other allowed fields. 2014-08-03 17:29:23 -07:00
friendica
44ee18b810 Let site admin choose what profile fields to support. 2014-08-02 23:28:51 -07:00
friendica
ae82df4399 Merge https://github.com/friendica/red into pending_merge 2014-08-02 14:57:13 -07:00
friendica
85032a1fa3 db tables for extensible profile fields 2014-08-02 14:56:17 -07:00
Jeroen
32f09b5fc2 Update nl. Added a link from the edit profile page to the edit visibility page. 2014-08-01 17:45:18 +00:00
friendica
ff8351437e make the profile minimal by default. Use features to enable the advanced form. 2014-08-01 01:24:03 -07:00
friendica
60e7837f00 implement the new friend activity post which has been missing for some time now 2014-07-29 19:26:17 -07:00
Jeroen
ca5992fade Stupid Bluefish 2014-07-29 19:14:01 +00:00
Jeroen
994b6b5258 As talked about earlier: set body font size to 0.8rem and post/comment font size to 1.0rem. This respects the user's browser font settings. Please comment if this changes the font sizes to much. There are some other font sizes that need to be changed to a scalable size (like btn-xs), but they don't have a priority. First see if this works. - Also made it possible for users to zoom on smart devices. - Small update to Redable. Aside is now disabled on almost all tablets in portrait mode. 2014-07-29 19:09:07 +00:00
Jeroen
2e6dd91599 14px>12pt as agreed on 075fc67277 - Also fixed empty delete button showing up for channels without edit photo rights. 2014-07-28 12:42:43 +00:00
friendica
1cc83dcaca style the photo like buttons 2014-07-27 19:56:06 -07:00
friendica
34cc4cdc60 clear floats on photo page (footer content appearing on right of page instead of bottom) 2014-07-27 17:24:09 -07:00
Jeroen
075fc67277 Improved photo view page. Added a delete button, stylized other button and rearangend divs a but. I even made a javascript function (copied is the right word). I changed the application (non-posts) font size (temporary) to 14px, same as button (btn) font size. I like to change all font sizes to 1.0rem (posts) and 0.8rem (application) in the near future, but I will test that first on my hub. 2014-07-27 21:44:34 +00:00
friendica
52fa84135c wrong label on icon 2014-07-25 01:13:08 -07:00
friendica
18f5890cb1 make profile edit pencil stand out a bit on darker backgrounds 2014-07-24 22:29:03 -07:00
friendica
5dcd0654d4 always provide a profile edit entry in the nav usermenu 2014-07-24 21:29:07 -07:00
friendica
1a6973a670 cherry pick pull request #544 2014-07-24 19:07:04 -07:00
mycocham
936f596af4 French Translations 2014-07-24 19:23:03 -04:00
friendica
8dc3446be4 when telling somebody that permissions have changed but not yet submitted, give them a submit button *right there* so they don't have to look for it. 2014-07-22 20:20:01 -07:00
friendica
bfe4bdc30b make mod_like interactive if requested 2014-07-17 18:20:12 -07:00
friendica
7c40a41e1b more event display formatting 2014-07-07 01:42:46 -07:00
friendica
0764b78da3 event render improvements 2014-07-06 23:13:17 -07:00
friendica
c7086b77fd move code out of templates - not sure how this even worked. 2014-07-03 00:58:49 -07:00
RedMatrix
bb4ece672a Merge pull request #521 from tuscanhobbit/master 
Changed the lock icon behaviour
 2014-07-01 09:19:08 +10:00
Paolo Tacconi
78c25cf2f0 Changed the lock icon behaviour 2014-06-30 17:10:42 +02:00
RedMatrix
0926c2d849 Merge pull request #516 from dawnbreak/master 
Fixed a wrong timestamp update when adding a file.
 2014-06-30 09:19:52 +10:00
Christian Vogeley
eb41b0ba7c Remove Remove Account link from account settings 
because it doesn’t remove the account. Move channel removal link to
channel page
 2014-06-29 22:19:45 +02:00
Klaus Weidenbach
322091cd12 Fixed some more timestamp bugs in RedDAV. 
Fixed an SQL-query in RedFile::put(), where parameters where in wrong order.
 2014-06-29 17:49:46 +02:00
RedMatrix
e228c2ed32 Merge pull request #513 from dawnbreak/master 
Some documentation for include/reddav.php and a new tpl-file.
 2014-06-29 10:16:51 +10:00
RedMatrix
f29f8a1b40 Merge pull request #514 from tuscanhobbit/master 
Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl
 2014-06-29 10:15:55 +10:00
Klaus Weidenbach
f49b74c5f6 Some documentation for include/reddav.php and a new tpl-file. 
Documented include/reddav.php a bit more to understand what it is
about to try to clean up some parts. Still a lot to be done here.
I put serveral @todo markers that need to be checked.

Moved some more HTML to template file.

Changed getETag() return format according to documentation. (ETag MUST
be surrounded by double-quotes)
 2014-06-29 01:17:06 +02:00
tuscanhobbit
dfe45342f6 Checkboxes were not aligned in connedit, added a table 2014-06-28 23:14:34 +02:00
Klaus Weidenbach
45dde16f3e Templified cloud's directory listing. 
Moved HTML for the directory listing from include/reddav.php to it's
own template file.
Still need to clean it up bit more, but should be useable already.
 2014-06-26 02:01:53 +02:00
Klaus Weidenbach
a6403905ef Set backlink to the parent folder, not cloud's root. 
If you edit a file and click on the backlink you always returned to
the root folder of your cloud. This patch sets the correct parent
folder as backlink.
Bit messy, but looks like it works.
 2014-06-24 21:05:00 +02:00
tuscanhobbit
cc4001fce7 Fixes to links and forward URLs in filestorage 2014-06-24 12:05:11 +02:00
friendica
0cfcb02311 ability to like things 2014-06-23 05:19:28 -07:00
friendica
c4c1c37bd3 profile likes 2014-06-22 22:16:26 -07:00
friendica
3078eeaa69 give the admin a link to view channels from the channel admin page 2014-06-22 17:33:31 -07:00
Klaus Weidenbach
2504d4c2a2 Add HTML5 datalist to edit photo album field. 
This patch provides a datalist for the edit photo album field.
This makes it easier to move a picture to another existing folder in
the way that it provides a list of all available albums as values for
the album field.
 2014-06-22 01:33:13 +02:00
Klaus
78fd496638 correct a tiny syntax error 
there was a space missing between two values
 2014-06-22 00:58:53 +02:00
friendica
5a0e135679 stylistic improvements to the suggestions page 2014-06-18 18:57:01 -07:00
friendica
8b66329a8f add photo count to photo album list 2014-06-17 20:45:53 -07:00
marijus
0b4e1715de move hide-comments to center and change its appearence a little 2014-06-15 16:00:27 +02:00
marijus
b9256eed30 unclutter menues a little 2014-06-14 15:31:36 +02:00
friendica
13ba9ef003 merge the app menus 2014-06-10 21:21:50 -07:00
friendica
059ccae278 remote install app (untested) 2014-06-10 16:34:21 -07:00
marijus
fed8b6b566 move new comment open/close js functions to core so they can be used by other themes 2014-06-05 17:53:06 +02:00
friendica
424f23858e add an icon to connect actions 2014-06-03 22:30:05 -07:00
friendica
17e575e1eb don't show app editing options to non-authenticated folks 2014-06-01 22:15:21 -07:00
friendica
832cbbec15 testing new event code 2014-05-29 21:25:19 -07:00
friendica
22ed5b1d03 newevent: front end functions 2014-05-29 20:09:21 -07:00
marijus
c0e1139a46 some fixes and cleanup 2014-05-27 16:44:18 +02:00
marijus
83ffad4b9d fix one more bootstrap override regression 2014-05-26 22:34:43 +02:00
23n
88bedec56c divide autodate from item.app 2014-05-26 18:50:54 +02:00
friendica
810515f1a1 auto-highlight app embed code on click 2014-05-25 22:42:07 -07:00
friendica
f7d99ed7ff fix the intermittent theme preview 2014-05-25 18:24:27 -07:00
marijus
2bdecdce17 for some reason this is also needed to make it work reliable in webkit browsers 2014-05-24 19:16:11 +02:00
marijus
5b0db721f8 should be redbasic not red 2014-05-24 18:00:44 +02:00
marijus
bf88720fae possible fix for empty commentbox colapsing on tool-button click 2014-05-24 17:50:09 +02:00
friendica
059b6cd411 add randprof app and do away with the universally hated chanview-iframe mode. It's gone. Please do not try and bring it back. We are not Diaspora and we have no desire to be like them. ("And they're all made out of ticky-tacky and they all look just the same"). Our profiles do not have to look the same and they won't anyway. We don't have to sugar coat the fact that some of the content in the matrix doesn't look like the rest of the content in the matrix. 2014-05-23 15:30:22 -07:00
friendica
751fda9704 more app work 2014-05-21 20:54:09 -07:00
friendica
d17768d4e7 change app dropdown to point to apps module (changes nav template). Important: Plugins using the app-menu hook will no longer be accessible from there and may require re-writing to plug into the system apps page. Also filter apps in items from the language detector to avoid false triggers from the base64 content. 2014-05-21 17:23:34 -07:00
friendica
77ca117218 make it possible to edit/delete apps via /apps/personal/edit 2014-05-21 01:55:32 -07:00
friendica
5d9f924642 more app work 2014-05-20 22:25:36 -07:00
friendica
cad481d94f unfinished work for creating app 2014-05-20 21:22:19 -07:00
friendica
fc0967b84b most of the remaining apps basic infrastructure except a form to create the things. Don't let this fool you - there is still a lot of work, but there isn't a whole lot of work to create a demo; in fact you can demo it now. 2014-05-20 18:08:49 -07:00
marijus
1aa7f3136f the js seems to interfere with something else... comment out for now... 2014-05-20 19:16:05 +02:00
marijus
c530a7a936 some work on comment_item.tpl 2014-05-20 17:33:06 +02:00
friendica
6d01707a72 more app backend work 2014-05-19 16:49:11 -07:00
marijus
89b8bc07ac implement modal for more then 10 likes/dislikes 2014-05-18 09:14:21 +02:00
friendica
659714956c add hover tips - except we need a way to translate the things 2014-05-15 20:58:26 -07:00
friendica
2fdc13e91d some sidebar content (doesn't yet do anything) 2014-05-15 20:20:20 -07:00
friendica
077b97eac4 the app menu takes form 2014-05-15 19:54:37 -07:00
friendica
8b233723c5 clear the jot-nets float 2014-05-14 20:49:33 -07:00
friendica
a4869394f4 allow jgrowl 'close all' message to be translated 2014-05-13 17:59:47 -07:00
friendica
045d23a27c Merge https://github.com/friendica/red into pending_merge 2014-05-11 17:38:22 -07:00
friendica
b5372f8152 button styling mitemlist 2014-05-11 17:37:54 -07:00
root
d1e0479f58 Removed some unnecessary changes. 2014-05-10 11:35:16 -07:00
root
ed5cebd3d6 Made code changes to serve higher resolution images in displays with high pixel density. 2014-05-10 11:15:27 -07:00
root
80796c78f5 Merge branch 'master' of https://github.com/chriswinstead/red 2014-05-10 10:55:50 -07:00
friendica
b854e58a7b issue #452 2014-05-09 15:24:54 -07:00
friendica
6d56c9b603 better button theming on oauth connected apps page 2014-05-09 01:53:03 -07:00
marijus
56eb9e75cc Merge branch 'master' of https://github.com/friendica/red 2014-05-09 07:39:27 +02:00
friendica
831b18cf28 move the event "unknown finish time" checkbox up so it actually precedes entering the finish time. 
TODO: we should probably disable the finish time selector with jquery if this is checked.
 2014-05-08 21:22:07 -07:00
friendica
22b79207f9 event form hard-wired tinymce=on, made selectable 2014-05-08 19:59:26 -07:00
marijus
6e397240a3 add some more bs fu 2014-05-08 13:53:27 +02:00
marijus
8144498803 like indicator rewrite 2014-05-08 13:44:43 +02:00
root
711719ce0c Made some changes to img tags to enforce max-width everywhere, and to the page headers to allow user scaling. 2014-05-07 12:01:12 -07:00
friendica
94b2ac6abb put permissions dialog inside the form element - should fix issue #444 2014-05-05 16:03:38 -07:00
jeroenpraat
d93df86298 Fixed some wrapping problems when the user has set a larger font size. And some UI love for the file permissions page (as requested by Mike ;) and changed the position of the file properties link on the cloud page. 2014-05-05 13:54:56 +00:00
friendica
806f1f0fa1 UI for deleting chatrooms 2014-05-04 20:30:52 -07:00
Christian Vogeley
f7c77c7821 Add link to system notifications page 
to mark notifications seen
 2014-05-04 18:17:11 +02:00
Christian Vogeley
b2e0b6f11d system notifications mark seen link 2014-05-04 17:28:43 +02:00
marijus
4975d5f7c1 fix search_item.tpl 2014-05-03 18:42:02 +02:00
friendica
56125f8c46 shift login box on small screens 2014-05-01 20:14:51 -07:00
friendica
a8322ba1f6 Merge https://github.com/friendica/red into pending_merge 2014-05-01 17:56:03 -07:00
friendica
b666aca5c3 bring the posted-date selector widget up to date. There are no longer two different styles. 2014-05-01 17:54:12 -07:00
Olaf Conradi
cfad83084a Also for notifications. 2014-05-02 02:40:04 +02:00