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

3905 commits

Author SHA1 Message Date
Stefan Parviainen
c8666b9076 If entered event info is not valid, let user try again with the old info still there. Closes friendica/red#648 2014-10-21 18:28:47 +02:00
marijus
a03c3d5480 fix nav double dropdown 2014-10-21 13:43:14 +02:00
marijus
d02162ee83 minor correction and typo 2014-10-20 23:01:58 +02:00
marijus
c080c420ba not quite there yet but getting closer 2014-10-20 22:46:14 +02:00
marijus
11e8fe3085 more work on photos 2014-10-20 15:05:33 +02:00
friendica
e414ed7782 link tag closed prematurely 2014-10-19 21:34:31 -07:00
friendica
bae3029c63 merge madness 2014-10-19 16:12:05 -07:00
friendica
7bbe700f3f mark signature forgeries 2014-10-16 16:19:19 -07:00
Stefan Parviainen
e425def2a2 Merge branch 'master' of https://github.com/pafcu/red 2014-10-16 21:37:14 +02:00
Stefan Parviainen
6867a8a7f6 Login menu 2014-10-16 17:21:37 +02:00
friendica
ae9e1fa688 missing event permissions 2014-10-15 18:35:56 -07:00
marijus
04a254d94a some work on single photo view comments 2014-10-15 22:23:38 +02:00
marijus
a7aa4efc08 Merge branch 'master' of https://github.com/friendica/red 2014-10-13 12:52:41 +02:00
marijus
c41f314302 really fix connedit > collection > checkbox 2014-10-13 12:52:21 +02:00
friendica
a512d1a4aa tinymce still seems to be referenced. Can't quite get rid of it. 2014-10-13 03:15:03 -07:00
friendica
8d27482374 Merge https://github.com/friendica/red into pending_merge 2014-10-13 03:08:58 -07:00
friendica
7abaccaf7f bring back PM upload functionality and why oh why are we still loading tinymce? 2014-10-13 03:07:36 -07:00
marijus
8406046c5b fix connedit > collection > checkbox position also for webkit - this will need a better solution though 2014-10-13 11:58:49 +02:00
marijus
030175bde6 fix connedit > collection > checkbox position 2014-10-12 14:31:51 +02:00
Thomas Willingham
82232c6916 Show tag in siteinfo. Not useful for us, quite useful for admins. 2014-10-11 17:24:58 +01:00
Thomas Willingham
d196e71962 Also that doesn't work anymore - prettyPhoto relic 2014-10-11 15:48:30 +01:00
Thomas Willingham
2b472b2b48 Give Redbasic the -styled back 2014-10-11 15:45:00 +01:00
Thomas Willingham
d54d62b601 Merge branch 'master' of https://github.com/friendica/red 2014-10-11 15:42:52 +01:00
Thomas Willingham
d132646915 Unbreak webpages 2014-10-11 15:42:31 +01:00
Jeroen
2ddd022540 +1 2014-10-11 14:39:56 +00:00
marijus
f8aabd376b and more missing wrappers 2014-10-10 16:54:12 +02:00
marijus
d5ceb33f6d found more missing wrappers 2014-10-10 16:13:44 +02:00
marijus
92cc5673cc one more oups... 2014-10-10 16:01:14 +02:00
marijus
675f5caded oups... that was weired... 2014-10-10 15:57:10 +02:00
marijus
4e9bd8b8f0 This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme. 
adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet.
Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.
 2014-10-10 15:52:56 +02:00
Jeroen
053e606108 Merge branch 'master' of https://github.com/friendica/red 2014-10-10 13:37:09 +00:00
Jeroen
1dda775969 Good compromise I think. Remove display setting . Set the default (light) schema to = , so that other schemas can still use . 2014-10-10 13:35:16 +00:00
zottel
8fe0fbf6fe more updates to German strings plus email templates 2014-10-10 14:54:41 +02:00
zottel
2790d9f146 remove unused email template files 2014-10-10 11:42:46 +02:00
zottel
3a90d037f9 update to German strings 2014-10-10 09:41:14 +02:00
friendica
4634049549 allow (our own) ajax urls to pass through bbcode intact. 2014-10-09 20:59:33 -07:00
Jeroen
77fc267f73 Added the display setting for generic (other) content wrapper. Also did set the default a bit lighter. See if that's ok. 2014-10-09 20:55:44 +00:00
Jeroen
e06c3e5a91 Added and changed on some places div class generic-content-wrapper. And added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it. 2014-10-09 14:54:04 +00:00
marijus
d16d026e56 remove some cruft - revert if you find any regressions 2014-10-09 12:28:54 +02:00
marijus
156c317a0a fix css for [code] 2014-10-09 12:05:22 +02:00
marijus
a8df8165ea more css fixes 2014-10-09 11:21:13 +02:00
marijus
cd188cb70d css fixes 2014-10-09 10:53:30 +02:00
RedMatrix
5fa1753108 Merge pull request #622 from solstag/master 
update pt-br translation
 2014-10-09 08:53:58 +11:00
Jeroen
29faf955f6 Small fix so search field and search buttons fit well. 2014-10-08 13:17:56 +00:00
marijus
0dcbebba77 css fix 2014-10-08 15:09:31 +02:00
marijus
096fbdb31c make nav-pills a bit smaller in height 2014-10-08 13:18:17 +02:00
marijus
289f57f79e template for searchbox and some more work on saved searches 2014-10-08 12:36:26 +02:00
marijus
634c2ef8ce nav pills for apps aside 2014-10-08 10:07:19 +02:00
marijus
e05c0a8bc4 make author link bold again 2014-10-08 09:24:34 +02:00
marijus
e5d346cdc6 css fixes 2014-10-08 08:45:59 +02:00
friendica
2975c6dd43 stylish_select wants to attach itself to the root html element. Since it still has some serious issues, don't let it attach itself to anything. 2014-10-07 21:06:23 -07:00
friendica
fa75d43b81 add "stacked pills" to saved search term list (the delete icon is still a bit funky) 2014-10-07 20:31:15 -07:00
Jeroen
d94f6f7c53 Schema option for bgcolour and underline yes/no on hover for the left aside. 2014-10-07 22:52:44 +00:00
Jeroen
563163523d Schema option for making links bold again. https://redmatrix.nl/display/d09d1cd2dbc45866beb9c0d384c9dcefe799d1251e3394d12ddb2e34d2c26228@red.mariovavti.com 2014-10-07 21:48:42 +00:00
marijus
21eae4df9c porting more widgets to bs nav-pills 2014-10-07 18:11:36 +02:00
Alexandre Hannud Abdo
f8704f4105 update pt-br translation 2014-10-07 12:58:01 -03:00
marijus
bf01685463 remove this - some widgets still need to be converted to bs-pills though 2014-10-07 15:03:27 +02:00
marijus
d1dea61b79 take away some boldness, some css fixes and some photo work 2014-10-07 13:09:30 +02:00
Alexandre Hannud Abdo
55a937375d datetimepicker data-format now data-date-format 2014-10-07 02:47:06 -03:00
friendica
03bbbdaf10 shareable design elements 2014-10-06 17:47:17 -07:00
Alexandre Hannud Abdo
c528eef4b4 new version of moment.js to match datetimepicker 2014-10-06 11:55:37 -03:00
friendica
e2f45a76b1 remove the privacy macros in settings and connedit now that we have privacy roles attached to the channel. One can still use the advanced permission dialogues, but they shouldn't have a reason to if they created the channel with a suitable channel type - plus it's just a bunch of extra permissions settings to confuse people. 2014-10-03 04:54:27 -07:00
friendica
a177cd1bd4 more work on shared design elements 2014-10-03 04:05:05 -07:00
marijus
df70c2c9b6 more work on photos 2014-10-02 21:04:50 +02:00
friendica
cef570991a Merge https://github.com/friendica/red into pending_merge 2014-09-29 23:37:16 -07:00
Jeroen
0283720302 no spaces in file names as requested 2014-09-30 05:48:29 +00:00
friendica
5292e3a100 implement a "powered-by" but leave it turned off until somebody with a good eye for layout can figure out where best to put it. 2014-09-29 21:58:35 -07:00
Jeroen
43d2a8ceae ok, last commit so far on the simple schemas 2014-09-29 15:37:50 +00:00
Jeroen
6c4a54dbfd transp back 2014-09-29 15:20:04 +00:00
Jeroen
67035a5507 minor modification simple black on white schema. 2014-09-29 15:06:47 +00:00
Jeroen
d33b9e3a91 Added 3 new schemas, all named 'simple' in 3 variants. Please enjoy. 2014-09-29 14:23:26 +00:00
Paolo Tacconi
a30af47ed7 Italian strings updated 2014-09-29 10:01:34 +02:00
marijus
97c6ba77c7 some more work on photos 2014-09-28 23:14:49 +02:00
marijus
38605eefdd more css shifting 2014-09-27 15:41:49 +02:00
marijus
04e460c8f8 upload first but not inside another {{if}} 2014-09-26 19:34:39 +02:00
marijus
a7269e9d6e upload should be first 2014-09-26 19:28:28 +02:00
marijus
f652fbdf74 fix blockquote 2014-09-26 19:17:02 +02:00
marijus
574c4845b7 move some css to the right place 2014-09-26 12:34:22 +02:00
marijus
b948ab5955 some more work on photos - work in progress 2014-09-26 12:29:07 +02:00
friendica
1e7fbac6c1 doc updates, clean up buttons on PM edit template to match other edit buttons 2014-09-26 01:52:30 -07:00
friendica
d8c03526ed optionally include wall items (posts) in import/export 2014-09-25 20:21:23 -07:00
friendica
92c723d37c constrain viewsrc colorbox to 80% of the current page size. It gets messy scrolling to the right for days to find the close button. 2014-09-24 17:32:38 -07:00
Alexandre Hannud Abdo
aa59010885 update pt-br translation 2014-09-22 15:42:59 -03:00
Klaus Weidenbach
d2268a412d Don't link unknown likes. 
Likes/Dislikes of unknown channels have disabled links now.
Fixed intention a bit, romved a unused variable.
 2014-09-21 17:51:01 +02:00
friendica
22e6e691ca Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...". 2014-09-20 16:34:48 -07:00
marijus
9feb619bea update jg to latest preview release and try once more to really justify the whole gallery 2014-09-20 15:40:40 +02:00
friendica
1c56442818 Repeat after me - we always refer to our clientelle as 'members'. If your software calls you a "user" - get rid of it. 2014-09-19 23:35:16 -07:00
friendica
302483790c Merge https://github.com/friendica/red into pending_merge 2014-09-19 16:51:05 -07:00
friendica
cb434818f8 closing tag 2014-09-19 16:50:43 -07:00
Jeroen
6923557ecb Bit tweaking 2014-09-19 21:23:41 +00:00
Jeroen
017726f069 Another piece that didn't fit well in the dark schema. Hopefully this is the last. 2014-09-19 21:16:55 +00:00
Jeroen
de45f42f9f update nl.2 2014-09-19 20:43:43 +00:00
Jeroen
eedc0e50c1 update nl 2014-09-19 15:54:19 +00:00
friendica
87a6f25769 try to sort out walltowall translation for diaspora recipients 2014-09-19 02:22:24 -07:00
friendica
45df73d456 add stylish_select to new_channel page - but comment out until we can theme it. It needs a bit of theming to even work correctly. 2014-09-18 17:06:15 -07:00
friendica
d4759a5883 repeated content collapse on update from display page under rare conditions (when the conversation hasn't changed) 2014-09-18 16:32:05 -07:00
friendica
0deb592cb5 typo 2014-09-17 22:55:27 -07:00
friendica
8eb21cceb3 use 24-hour clock for non-American dates 2014-09-17 22:53:38 -07:00
friendica
22aa5aca14 add a spinner or two to the new channel page so folks have a clue that we're doing something in the background - trying to complete the nick field for them (and then check it before they submit). 2014-09-17 21:27:02 -07:00
friendica
51d9f0d97a channel permission roles 2014-09-17 21:16:15 -07:00
friendica
4014093572 implement permission roles - the backend should be done except for maybe a couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone. 2014-09-17 17:59:46 -07:00
Alexandre Hannud Abdo
5bdfc2f647 Fix name attribute of button elements so jquery '.submit()' doesn't break 
According to "Additional notes" in:

http://api.jquery.com/submit/

Not fixing buttons created with 'input' tags.
 2014-09-16 19:00:53 -03:00
marijus
b5bb2230eb this still has less issues 2014-09-16 14:18:03 +02:00
Thomas Willingham
d2a4b34c98 Trivial typo - concatenated string that should be. Doesn't really 
deserve it's own commit, but if I don't fix it now, nobody will notice for
another18 months.
 2014-09-16 00:55:41 +01:00
Jeroen
eaf3bd3326 See comments on commit 5ab85b0. Also fixed some bb typo's in docu index. 2014-09-15 15:35:40 +00:00
marijus
5ab85b076b heading font-size should not be tied to font-size for posts and comments 2014-09-15 10:39:38 +02:00
marijus
58aad83e5c this is probably better in most cases 2014-09-15 09:56:30 +02:00
Thomas Willingham
b5241c610f Deprecate site channel. The sys channel should be doing this. Will fix 
shortly.
 2014-09-15 00:06:51 +01:00
marijus
72bce40a9f tryout - some more adjustments 2014-09-14 22:37:03 +02:00
Jeroen
254dc0ec98 Made link post titles to source optional in display settings. Hopefully I did a right. 2014-09-14 12:39:11 +00:00
marijus
2728f5a104 tryout - fetch larger thumbnail if image gets streched over its size 2014-09-14 11:57:01 +02:00
marijus
dfc8430c8a cleanup after recent changes in mod photos 2014-09-13 16:33:20 +02:00
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
marijus
72c30ea444 Merge branch 'master' of https://github.com/friendica/red 2014-09-12 21:07:28 +02:00
marijus
bd2139d16a do not load next page if justifiedGallery() is not ready yet 2014-09-12 21:04:43 +02:00
Jeroen
11d3ef6176 This is even better. Adapts better to Red user settings. 2014-09-12 18:55:53 +00:00
Jeroen
59c537b06d H1-H6 simplified (less font sizes), rem 2014-09-12 18:41:35 +00:00
tuscanhobbit
2e8feaa919 IT localization updated 2014-09-12 14:26:05 +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
friendica
eae146d85d Revert "Revert "update nl - attempt 2"" 
This reverts commit 8e179aa734.
 2014-09-10 16:04:12 -07:00
friendica
8e179aa734 Revert "update nl - attempt 2" 
This reverts commit 4712b78e52.
 2014-09-10 16:02:25 -07:00
RedMatrix
13e7a8f123 Merge pull request #583 from git-marijus/master 
photo justification
 2014-09-11 08:46:58 +10:00
marijus
d825adf423 without this check we kill the directory autoload 2014-09-10 17:40:50 +02:00
marijus
c1c2214b47 photo justification 2014-09-10 17:10:39 +02:00
Jeroen
4712b78e52 update nl - attempt 2 2014-09-10 14:10:20 +00:00
Jeroen
81ae6f83f3 update nl 2014-09-10 14:05:12 +00: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
3c024ee446 Merge https://github.com/friendica/red into pending_merge 2014-09-07 17:19:32 -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
Jeroen
11b5ec7ec8 Added abook-changed background colour to dark schema 2014-09-07 21:46:20 +00:00
friendica
b6d1ff3d8f hook photos scroll to page down 2014-09-06 05:22:30 -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
d71e304b15 this improves the photos even more 2014-09-04 21:18:47 -07:00
friendica
50c137d152 constrain photos to a fixed block regardless of aspect ratio 2014-09-04 17:51:24 -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
Paolo T
d98bf1d33b Merge pull request #577 from tuscanhobbit/master 
Italian strings updated
 2014-09-01 16:06:56 +02:00
Paolo Tacconi
a1f85cda3e Italian strings updated 2014-09-01 16:03:30 +02:00