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

4409 commits

Author SHA1 Message Date
Paolo Tacconi
2eaf86b575 Italian translation 2014-12-01 16:22:11 +01:00
marijus
f5734582cd Merge branch 'master' of https://github.com/friendica/red 2014-11-29 20:50:00 +01:00
marijus
7be6afd733 readd link_colour again 2014-11-29 20:49:22 +01:00
Jeroen
698e6f00fc update nl (typo) 2014-11-29 18:53:20 +00:00
Jeroen
306cb33a4a update nl 2014-11-29 18:51:07 +00:00
Thomas Willingham
43c2305ad2 Merge pull request #715 from f03el/master 
Update Swedish strings
 2014-11-29 18:21:59 +00:00
marijus
3855be4910 bootstrap-3.3.1 and minor css fixes 2014-11-29 14:33:36 +01:00
Erik Lundin
545d816093 Update Swedish strings 2014-11-29 11:45:17 +01:00
Erik Lundin
a6c9f64e4d Update Swedish strings 2014-11-25 20:38:00 +01:00
Erik Lundin
6081972cb1 Update Swedish strings 2014-11-25 20:33:52 +01: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
e9ba2ba600 theme the observer tags so they stick out like a sore thumb. Too much bad juju. 2014-11-24 18:02:36 -08:00
RedMatrix
c856b1d8d0 Merge pull request #707 from HaakonME/master 
Updated Norwegian bokmål translation
 2014-11-25 06:46:00 +11:00
Paolo Tacconi
c3c5f9a0fb Italian translation 2014-11-24 14:38:23 +01:00
Jeroen
5b7124f0da and update Dutch 2014-11-24 13:05:31 +00:00
zzottel
54efbb6c7f Merge pull request #708 from zzottel/master 
German update
 2014-11-24 12:00:59 +01:00
zottel
becb6bf226 update to German strings 2014-11-24 11:58:47 +01: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
Haakon Meland Eriksen
1f613350a5 Updated Norwegian bokmål translation 2014-11-23 12:20:27 +01:00
Erik Lundin
57dcdd4cf9 Update Swedish translations 2014-11-22 22:11:43 +01:00
friendica
e74a3926fe yet another option for the homepage 2014-11-20 17:38:41 -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
Stefan Parviainen
c1b8608940 Switch to a better datetime picker widget 2014-11-16 13:56:45 +01:00
friendica
3d55c9da86 buttonify some design elements that had not yet been buttonified 2014-11-13 18:51:30 -08:00
friendica
b5da015789 put timeout code in place but don't turn it on. 2014-11-13 15:34:35 -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
Jeroen
109cb93663 update nl 2014-11-13 16:27:33 +00:00
friendica
306f5d9cbe let's try this without a timeout 2014-11-13 01:04:26 -08:00
friendica
800e457290 populate initial ACL before the ajax loader gets called, just in case the form is submitted before it completes. Related to issue #615 2014-11-12 18:35:33 -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
marijus
f72035ec93 tie the narrow nav-pills to .widget instead of aside 2014-11-11 21:09:05 +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
friendica
0b4575a40b class is a reserved word 2014-11-10 14:23:06 -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
89aea08182 Highlight badge on hover 2014-11-08 20:30:33 +01:00
Stefan Parviainen
1a8fc73b57 Fix highlighting of login button 2014-11-08 20:06:08 +01:00
zottel
a22ba7629b update to German strings 2014-11-07 22:19:17 +01:00
marijus
2cfe0f1545 provide lockstate for photo edit 2014-11-07 12:13:38 +01:00
Olivier van Helden (hal)
13fd91d6f5 fix nbsp tag typoes in french translation 2014-11-07 05:14:01 +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
marijus
b16ee29cc3 release the navbar in landscape mode on small devices 2014-11-05 10:32:30 +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
ca1df08d92 posted-date-selector - spacing was slightly off in dropdown entries 2014-11-03 16:57:30 -08: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
marijus
8cfe8a5f25 css fixes 2014-11-02 19:36:28 +01:00
marijus
dc5e05d334 even more photos work 2014-11-01 23:55:36 +01:00
marijus
30281b161c close the eventual open tool if the other opens 2014-11-01 20:30:13 +01:00
marijus
5d151b9886 do not reload page for photo upload 2014-10-31 20:25:43 +01:00
Thomas Willingham
5d1bb1b685 Smarty3 now lives in store 2014-10-31 16:09:46 +00:00
marijus
2982212797 more work on photo upload 2014-10-31 14:33:41 +01:00
marijus
4495a30b88 removing this was not a good idea... 2014-10-30 18:55:24 +01:00
marijus
0ff4d9015b some work on photo upload 2014-10-30 14:10:55 +01:00
marijus
ec8bab7784 change the way tagrm works to allow tag removal on the fly 2014-10-28 11:56:00 +01:00
friendica
9cc76cb33d several unrelated things - auto_follow wasn't working for new accounts, error returned in private mention to a collection, and added auto-completion to photo tags; though it only matches people so the hover text is now wrong. Also made the photo edit form XHTML (XML) compliant. 2014-10-27 19:23:40 -07:00
marijus
d192bcad65 do not reload page for edit album and some minor cleanup 2014-10-27 21:31:54 +01:00
Jeroen
eec0a67dde update nl + Terms of Service more prominent in the help files. 2014-10-27 15:05:59 +00:00
friendica
655c3e1b47 put privacy role selector in settings page. Change visibility of various permissions items accordingly. 2014-10-26 19:32:12 -07:00
marijus
f2ccd37c8b wrong vars in template 2014-10-26 21:50:20 +01:00
marijus
6497e78956 some work on photos like/dislike 2014-10-25 15:23:20 +02:00
friendica
1a9b8d4f0c don't offer forum (@name+) completion in comments, since it won't do anything. 2014-10-23 22:00:16 -07:00
Jeroen
bfdf5fd15c upd nl 2 2014-10-23 15:15:28 +00:00
Jeroen
da98c7c534 upd nl 2014-10-23 14:06:46 +00:00
zottel
53ee9f664f update to German strings 2014-10-23 13:59:49 +02:00
RedMatrix
3fb0354a55 Merge pull request #655 from pafcu/master 
Better handling of incorrect info entered in event
 2014-10-22 12:02:22 +11:00
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
Paolo Tacconi
f2d959e1aa Italian strings updated 2014-09-01 14:47:38 +02:00
Jeroen
3e8f9e8b62 update nl + Friendica>RedMatrix in two text files 2014-08-30 14:07:38 +00:00
marijus
9945cc7129 minor css fixes and cleanup 2014-08-28 23:05:47 +02: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
marijus
c703d83350 add background color to widgets 2014-08-26 22:35:00 +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
Jeroen
b11e9fe03c fix nl 2014-08-23 20:13:23 +00:00
Jeroen
ceabf2d488 Minor adjustment photo view + update nl (at 100\%\!) 2014-08-23 17:01:19 +00:00
Jeroen
a328fc4865 fix nl 2014-08-22 21:42:33 +00: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
Jeroen
341892a7af fix nl 2014-08-19 21:48:49 +00:00
Jeroen
9f400229a7 Update nl 2014-08-19 20:22:15 +00: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
friendica
de1198ccfe Merge https://github.com/friendica/red into pending_merge 2014-08-17 17:49:25 -07:00
friendica
82eb265a20 add collections widget to connections page - and some more work on realms 2014-08-17 17:48:41 -07:00
Paolo T
1ddbd44fb0 Merge pull request #567 from tuscanhobbit/master 
IT: strings updated
 2014-08-17 19:35:16 +02:00
tuscanhobbit
3b979dd2a9 IT: strings updated 2014-08-17 19:32:44 +02:00
RedMatrixCanada
8c366154c3 French Transalations - UPDATED 2014-08-16 20:52:59 -04:00
RedMatrix
e4620179ac Merge pull request #564 from cvogeley/master 
Add account deletion to the UI
 2014-08-17 08:33:13 +10:00
Christian Vogeley
54fe09f466 Add account deletion to the UI 2014-08-16 16:28:07 +02:00
jeroenpraat
b88e1e9862 .btn.xs > 0.75rem (let's keep that as the min. scalable font size) 2014-08-15 14:00:51 +02:00
jeroenpraat
c96b18359f .btn-xs 0.65 > 0.7rem 2014-08-15 13:17:38 +02:00
RedMatrix
f4229dbc3f Merge pull request #561 from cvogeley/master 
Some work on account deletion
 2014-08-15 09:58:43 +10:00
Jeroen
c1b89b413a Added some missing translation strings. Fixed to scalable for a few font sizes. 2014-08-14 20:02:05 +00:00
Christian Vogeley
fc94a638cd Some work on account deletion 2014-08-14 20:17:57 +02:00
Jeroen
1badf53229 update nl 2014-08-14 14:59:02 +00:00
friendica
1d6f494936 some work on extended profile fields 2014-08-13 22:22:52 -07:00
marijus
4a938db398 this is better cross-browser support 2014-08-13 17:37:41 +02:00
marijus
92e5f31428 tweak .comment-edit-text-empty to correlate with the new default app font-size 2014-08-13 16:56:31 +02: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
zottel
948b76232f update to German translations 2014-08-11 11:48:02 +02: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
zottel
d91eee759f update to German translations 2014-08-08 16:46:29 +02: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
friendica
f475317dba extra room for long names on mod_manage - stylise the forbidden sign a wee bit 2014-08-06 22:47:52 -07:00
Jeroen
1fcb4d88a4 max-width for small screens 2014-08-06 23:03:14 +00: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
Jeroen
47d496eee3 update nl 2014-08-06 14:15:55 +00:00
friendica
b6c4dcb1be try to link this to page down as well 2014-08-05 22:20:22 -07:00
friendica
0b30f08fae minor stuff 2014-08-05 22:08:12 -07:00
friendica
9a0a613307 that went badly 2014-08-05 22:01:47 -07:00
friendica
74377bd4b4 a bit of cleanup on directory autoscroll 2014-08-05 21:57:46 -07:00
friendica
dc98e6c0e9 scrolling directory 2014-08-05 21:48:13 -07:00
friendica
1f415d9830 add en-gb and en-au ('en-us' aka 'en' is the default language now so watch out for words like colour and centralise and please use the US variants in translatable strings) 2014-08-05 20:09:01 -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
464b2b6570 allow the PageDown key to trigger auto scroll - so if you use this key to page through the content you'll never reach the end (until you run out of content). 2014-08-03 16:32:30 -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
Paolo T
f40e315cb9 Merge pull request #550 from tuscanhobbit/master 
IT: updated strings
 2014-08-01 12:27:24 +02:00
Paolo Tacconi
e2ff843a80 IT: updated strings 2014-08-01 12:19:42 +02:00
friendica
6dd3a170a7 Merge https://github.com/friendica/red into pending_merge 2014-08-01 01:25:25 -07:00
friendica
ff8351437e make the profile minimal by default. Use features to enable the advanced form. 2014-08-01 01:24:03 -07:00
Jeroen
d126d02c65 Merge branch 'master' of https://github.com/friendica/red 2014-07-31 12:51:09 +00:00
Jeroen
c4e82772c0 Font sizes (temporary?) scaled down a bit. See 994b6b5258 2014-07-31 12:46:43 +00:00
friendica
56bbf58338 Merge https://github.com/friendica/red into pending_merge 2014-07-31 02:35:16 -07:00
friendica
0e57b6cc8c convert application strings to en-US 2014-07-31 02:33:34 -07:00
Jeroen
28e0e64643 nl: better translation hometown 2014-07-30 23:40:40 +00:00
Jeroen
316ee2febe update/upgrade nl 2014-07-30 22:41:37 +00: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
34d0490732 re-align the "remember me" button on login page after bootstrap update 2014-07-27 17:34:54 -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
4f90070e5e Merge https://github.com/friendica/red into pending_merge 2014-07-25 01:13:54 -07:00
friendica
52fa84135c wrong label on icon 2014-07-25 01:13:08 -07:00
marijus
9938f0c52b Merge branch 'master' of https://github.com/friendica/red 2014-07-25 09:42:50 +02:00
marijus
9c40ee9e60 fixes #545 2014-07-25 09:42:10 +02: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
marijus
9001406346 update to bootstrap-3.2 and minor css adjustments 2014-07-24 13:51:06 +02:00
friendica
ee75efd951 Merge branch 'master' of https://github.com/mrjive/red into mrjive-master 
Conflicts:
	view/it/messages.po
 2014-07-23 16:46:02 -07:00
mrjive
aa6d61d3b1 Just a small typo 
Fixed a small typo (and also to try if I'm doing right)
 2014-07-24 00:29:36 +02:00
Jeroen
02a4dac39b Merge branch 'master' of https://github.com/friendica/red 2014-07-23 13:03:12 +00:00
Jeroen
06470cd114 update nl 2014-07-23 13:02:14 +00:00
friendica
5c6a251213 some backend JS support for an endless scroll directory 2014-07-22 22:15:34 -07: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
tuscanhobbit
7b8edeaead IT: updated strings 2014-07-19 11:47:48 +02:00
friendica
b19176169c provide a specific permission for liking profiles (reuse the obsolete bookmark permission), also remove the unused 'unconnected contacts' view for now. 2014-07-17 20:54:30 -07:00
friendica
bfe4bdc30b make mod_like interactive if requested 2014-07-17 18:20:12 -07:00
Jeroen
010d4071ad Introducing page template Redable (sic). A template for making it easier to read long texts on a wide range of devices. Using rem and em for font sizes and region widths. Regions: aside, content, right_aside and footer. Advised to only use the middle content region as much as possible (but left and right can be used for indexes if you like). Based on the default template. Maybe later I will add some alternative css's. 2014-07-16 18:09:46 +00:00
jeroenpraat
07070b0a20 small fix nl 2014-07-09 19:04:21 +00: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
jeroenpraat
dcf4bf595c nl 100%git status 2014-07-06 18:32:03 +00:00
friendica
5ed9444bee some initial work towards email address verification 2014-07-03 18:29:32 -07:00
jeroenpraat
0f5cd7d7fa fix nl 2014-07-03 22:36:58 +00:00
friendica
c7086b77fd move code out of templates - not sure how this even worked. 2014-07-03 00:58:49 -07:00
jeroenpraat
1cbec39af8 Red Matrix default instead of global default. Is more clear. Update nl to 99%. Update util/messages.po 2014-07-02 13:26:44 +00:00
jeroenpraat
06935e96eb Merge branch 'master' of https://github.com/friendica/red 2014-07-02 13:20:08 +00:00
jeroenpraat
42c9a67dee Changed Default to Light (global default). So if hub owners want to change the default, they don't get two defaults. Please revert when not needed/wanted. 2014-07-02 13:13:29 +00:00
Paolo T
647ca2ee43 Merge pull request #525 from tuscanhobbit/master 
IT: strings updated
 2014-07-02 11:47:58 +02:00
Paolo Tacconi
fea5bfe388 IT: strings updated 2014-07-02 11:46:23 +02:00
friendica
7a082394c3 minor adjustments 2014-07-01 22:02:36 -07:00
jeroenpraat
c5123b59cc fix 1 error in nl that somehow sneaked in 2014-07-01 23:09:18 +00:00
jeroenpraat
9c40071509 update/approve nl to 98%git status 2014-07-01 22:59:03 +00:00
jeroenpraat
502b30e768 update nl 2014-07-01 15:46:05 +00:00
RedMatrix
406740479a Merge pull request #520 from pixelroot/master 
Updated Russian translation
 2014-07-01 09:19:24 +10:00
RedMatrix
bb4ece672a Merge pull request #521 from tuscanhobbit/master 
Changed the lock icon behaviour
 2014-07-01 09:19:08 +10:00
jeroenpraat
2f56472f0c update nl 2014-06-30 20:30:06 +00:00
Paolo Tacconi
78c25cf2f0 Changed the lock icon behaviour 2014-06-30 17:10:42 +02:00
pixelroot
cadcd45e89 Updated Russian translation 2014-06-30 14:18:02 +02:00
jeroenpraat
52adbb6504 update nl 2014-06-29 23:26:04 +00: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
Paolo T
628f121804 Merge pull request #515 from tuscanhobbit/master 
IT:updated strings
 2014-06-29 12:43:24 +02:00
tuscanhobbit
98324cb277 IT:updated strings 2014-06-29 12:41:19 +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
friendica
253f2cde9f Merge https://github.com/friendica/red into pending_merge 2014-06-26 17:19:15 -07:00
friendica
6d05d502e3 still trying to sort out the liveupdate issues. This was getting overly complicated with all the different ways we've tried to fix this issue so let's step back and simplify it a bit. 2014-06-26 17:17:24 -07:00
jeroenpraat
aeab6431d2 update nl 2014-06-27 00:13:22 +00:00
marijus
c6cae8e0c2 make it a div to prevent extra borders in some browsers after click 2014-06-26 19:08:16 +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
friendica
ecd472b7bb Merge https://github.com/friendica/red into pending_merge 2014-06-24 17:27:35 -07:00
friendica
6848a5f9a7 Events show up as notifications about a week in advance so you know they're coming. But let's put an indicator next to the notification count when there's an event that is actually happening today -- so you don't have to look at the calendar or notification detail every day for a week to figure out if the day has finally arrived yet. 2014-06-24 17:23:58 -07:00
RedMatrix
44abcd83b3 Merge pull request #506 from dawnbreak/master 
Set backlink to the parent folder, not cloud's root.
 2014-06-25 08:38:54 +10:00
RedMatrix
fa1dc7aba2 Merge pull request #504 from HaakonME/master 
Updated Norwegian bokmål translation
 2014-06-25 08:37:48 +10: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
Haakon Meland Eriksen
19bc9b53c9 Updated Norwegian bokmål translation 2014-06-24 19:47:14 +02:00
tuscanhobbit
b8e8adcd51 IT: updated strings & fixed readme img link 2014-06-24 16:28:44 +02:00
tuscanhobbit
cc4001fce7 Fixes to links and forward URLs in filestorage 2014-06-24 12:05:11 +02:00
RedMatrix
498d98395a Merge pull request #501 from pixelroot/master 
modified:   view/ru/messages.po
 2014-06-24 10:06:06 +10:00
friendica
181623030b move the reset of "in_progress" to after the page and structures have completed updating 2014-06-23 16:55:52 -07:00
friendica
0cfcb02311 ability to like things 2014-06-23 05:19:28 -07:00
pixelroot
9c94504156 modified: view/ru/messages.po 
modified:   view/ru/strings.php
 2014-06-23 08:42:45 +02:00
friendica
c4c1c37bd3 profile likes 2014-06-22 22:16:26 -07:00
friendica
535aa28526 Merge https://github.com/friendica/red into pending_merge 2014-06-22 17:34:27 -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
Paolo T
1c432e4c49 Merge pull request #500 from tuscanhobbit/master 
IT: strings updated
 2014-06-22 19:55:31 +02:00
tuscanhobbit
35494c9e27 IT: strings updated 2014-06-22 19:54:07 +02: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
Alexandre Hannud Abdo
b20887995a Implements a new permission level PERMS_PENDING 
With this a user can allow some action to any user which connects
to them, even before they've connected back.

Ref.
https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com

Also some code cleanup and an alternative logic for handling
notifications of permission changes in zot.php.

This assumes that private posts are still restricted to people in
your addressbook. Regardless of your global permissions, a
pending channel won't get private posts, even if the post
only has a deny clause not matching the pending channel.
 2014-06-19 15:13:32 -03:00
friendica
224a2b9ddf put viewsrc back in a lightbox 2014-06-18 20:33:28 -07:00
friendica
5a0e135679 stylistic improvements to the suggestions page 2014-06-18 18:57:01 -07:00
friendica
80d84206ed now we should be able to remove the function check. Revert if live updates or page loads go weird. I've tested, but it went weird on me last time I tried this a week or so ago so I'm crossing fingers. 2014-06-18 15:53:26 -07:00
friendica
8b66329a8f add photo count to photo album list 2014-06-17 20:45:53 -07:00
jeroenpraat
b7f9a70be7 Update nl / Dark schema: Some minor, but important fixes 2014-06-16 22:55:29 +00:00
marijus
4b1625dd16 animate show/hide comments 2014-06-16 20:51:00 +02:00
jeroenpraat
b18d48b01b update nl 2014-06-16 17:47:06 +00:00
friendica
02825f597f remove overflow property on banner 2014-06-16 01:32:23 -07:00
Paolo T
e2a0778e08 Merge pull request #495 from tuscanhobbit/master 
IT: updated strings
 2014-06-15 20:53:00 +02:00
tuscanhobbit
c566668d7e IT: updated strings 2014-06-15 20:51:35 +02:00
marijus
0b4e1715de move hide-comments to center and change its appearence a little 2014-06-15 16:00:27 +02:00
friendica
794cded66e Merge https://github.com/friendica/red into pending_merge 2014-06-14 15:13:53 -07:00
friendica
3714bdfc54 Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master 2014-06-14 15:12:16 -07:00
marijus
b9256eed30 unclutter menues a little 2014-06-14 15:31:36 +02:00
pixelroot
aea19a5b3a modified: view/ru/strings.php 2014-06-14 15:14:07 +02:00
pixelroot
7f4516d747 modified: .htaccess 
modified:   view/ru/strings.php
 2014-06-14 14:34:17 +02:00
RedMatrix
9ac236d57d Merge pull request #491 from pixelroot/master 
modified:   view/ru/messages.po
 2014-06-14 21:49:58 +10:00
pixelroot
6a307f0db1 modified: view/ru/messages.po 
modified:   view/ru/strings.php
 2014-06-14 10:20:57 +02:00
RedMatrix
651f8c3dba Merge pull request #489 from pixelroot/master 
modified:   view/ru/messages.po
 2014-06-14 17:35:39 +10:00
pixelroot
39418fc35b modified: view/ru/messages.po 
modified:   view/ru/strings.php
 2014-06-14 09:25:01 +02:00
friendica
b5ea259666 try to force the update mode to fix the "starting up browser, quickly loads page 2 at the beginning" bug 2014-06-13 05:38:00 -07:00
RedMatrix
0c51aae768 Merge pull request #486 from pixelroot/master 
modified:   view/ru/messages.po
 2014-06-13 09:30:35 +10:00
Alexandre Hannud Abdo
01a0fec2c7 update pt-br translation 2014-06-12 13:02:54 -03:00
pixelroot
0d33b03633 modified: view/ru/messages.po 
modified:   view/ru/strings.php
 2014-06-12 16:30:58 +02:00
marijus
b05eca295b Merge branch 'master' of https://github.com/friendica/red 2014-06-12 15:23:59 +02:00
marijus
822358adca add hover effect to expand/collaps 2014-06-12 15:23:48 +02:00
jeroenpraat
3e20a0d784 update nl / dark schema: fixed prev/next buttons connections page and directory / same css layout for those buttons 2014-06-11 14:32:57 +00:00
marijus
4a4281448f move expand/collapse to the center 2014-06-11 10:04:51 +02:00
jeroenpraat
de31ba5432 update nl 2014-06-11 07:09:35 +00:00
friendica
13ba9ef003 merge the app menus 2014-06-10 21:21:50 -07:00
friendica
40c03c642e Merge https://github.com/friendica/red into pending_merge 2014-06-10 16:34:52 -07:00
friendica
059ccae278 remote install app (untested) 2014-06-10 16:34:21 -07:00
jeroenpraat
31d19efd1f update nl - there was an odd syntax error in strings.php 2014-06-10 21:39:59 +00:00
jeroenpraat
c5c57b865f Update nl 2014-06-10 21:26:17 +00:00
jeroenpraat
31dce02701 Update nl 2014-06-10 21:23:46 +00:00
jeroenpraat
c802a6cd71 update nl 2014-06-09 18:26:40 +00:00
jeroenpraat
3e04e2313d update nl 2014-06-09 18:24:52 +00:00
jeroenpraat
d919464493 update nl 2014-06-09 18:12:16 +00:00
Paolo T
89c2b99c16 Merge pull request #481 from tuscanhobbit/master 
IT: updated strings
 2014-06-06 19:38:37 +02:00
tuscanhobbit
dd873ae6dd IT: updated strings 2014-06-06 19:34:24 +02:00
jeroenpraat
359814eee7 Merge branch 'master' of https://github.com/friendica/red 2014-06-05 20:48:03 +00: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
jeroenpraat
6ccf6455c4 Merge branch 'master' of https://github.com/friendica/red 2014-06-05 14:00:05 +00:00
marijus
48f856e84c we probably want a seperate namespace to not disable all click events in document 2014-06-05 11:21:02 +02:00
marijus
4c9d8fd79d possible fix for 2nd comment collapsing 2014-06-05 11:02:27 +02:00
Alexandre Hannud Abdo
06088a2877 update pt-br translation 2014-06-05 04:13:33 -03:00
jeroenpraat
d9688e5ab3 Merge branch 'master' of https://github.com/friendica/red 2014-06-04 14:00:08 +00:00
friendica
424f23858e add an icon to connect actions 2014-06-03 22:30:05 -07:00
jeroenpraat
5869836180 expand/collapse is also used for comments, so removing 'post'. 2014-06-03 15:42:13 +00:00
jeroenpraat
ad378cbe07 Updated strings for show entire post and show less to expand and collapse. See last few comments from me and Mario at https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl 2014-06-03 12:14:51 +00:00
jeroenpraat
b4e7d7f7c0 Updated to [+] show more, [+] show more comments, etc. See https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl 2014-06-03 05:12:00 +00:00
jeroenpraat
9ea8169240 Update nl before doing something new 2014-06-02 20:17:17 +00:00
jeroenpraat
c452aab0e5 Update nl 2014-06-02 15:18:31 +00:00
jeroenpraat
004b8ec311 Update nl 2014-06-02 15:08:31 +00:00
friendica
17e575e1eb don't show app editing options to non-authenticated folks 2014-06-01 22:15:21 -07:00
jeroenpraat
894b8e4b15 idem 2014-06-01 21:25:59 +00:00
jeroenpraat
2632ac80bb Minor adjustment to Dutch translation 2014-06-01 21:16:46 +00:00
jeroenpraat
db4321f8ea New language: Dutch! Nederlands! (messages.po: 69% translated) 2014-06-01 21:10:02 +00:00
Paolo T
f650fb6268 Merge pull request #475 from tuscanhobbit/master 
IT: updated strings
 2014-05-30 11:45:05 +02:00
Paolo Tacconi
f753a14997 IT: updated strings 2014-05-30 11:43:29 +02: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
friendica
dabf82bbb7 Merge https://github.com/friendica/red into pending_merge 2014-05-27 16:50:53 -07:00
friendica
b17f923abb give the cloud file list a bit of padding 2014-05-27 16:49:47 -07:00
marijus
c0e1139a46 some fixes and cleanup 2014-05-27 16:44:18 +02:00
marijus
c61da303dd fix one more bootstrap override regression - addendum 2014-05-26 22:40:33 +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
marijus
f6ee43c883 Collapsed textareas are like buttons. They should not grow/shrink in size if app font-size changes. 2014-05-26 11:32:58 +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
da523fcfac app basic style 2014-05-24 03:28:25 -07: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
Alexandre Hannud Abdo
dca11210bd update pt-br translation 2014-05-23 07:56:19 -03:00
friendica
345f784f67 fix search to use in app 2014-05-22 21:24:41 -07:00
Paolo T
8e2771cbd4 Merge pull request #469 from tuscanhobbit/master 
IT: strings fixed
 2014-05-22 14:22:19 +02:00
Paolo Tacconi
b7390f8849 IT: strings fixed 2014-05-22 14:20:24 +02:00
Paolo T
031d73ea20 Merge pull request #468 from tuscanhobbit/master 
IT: updated strings
 2014-05-22 14:03:17 +02:00
Paolo Tacconi
bc31e89eb0 IT: updated strings 2014-05-22 14:00:10 +02: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
RedMatrix
3e75f9cbb1 Merge pull request #464 from solstag/master 
Bunch of translation work
 2014-05-21 19:24:24 +10:00
friendica
77ca117218 make it possible to edit/delete apps via /apps/personal/edit 2014-05-21 01:55:32 -07:00
Alexandre Hannud Abdo
ac8400ac0c Update pt-br translation. 2014-05-21 05:03:21 -03: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
jeroenpraat
eab440d321 Dark schema: Minor minor edit 2014-05-17 18:57:56 +00:00
Paolo T
8562143034 Merge pull request #462 from tuscanhobbit/master 
IT: strings updated
 2014-05-17 11:27:42 +02:00
tuscanhobbit
2d91268b5d IT: strings updated 2014-05-17 11:25:39 +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
2450caa161 add the theme file 2014-05-15 19:58:23 -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
7a78da7982 major cleanup of choklet+bannertwo 2014-05-14 18:12:18 -07:00
friendica
7c4503968d Merge branch 'navbacker' 2014-05-14 18:07:43 -07:00
friendica
0bfd08b547 fix fluid layout for choklet_bannertwo 2014-05-14 18:07:01 -07:00
friendica
b31aa49a43 this doesn't really work 2014-05-14 16:33:48 -07:00
marijus
ce25601ed0 whitespace 2014-05-14 17:24:01 +02:00
marijus
9bfcc0c5e2 colorpicker: enable rgba for for item and comment colors 2014-05-14 17:16:55 +02:00
friendica
2f1e4a6370 xss prevention 2014-05-14 00:55:32 -07:00
friendica
de550d45ff more choklet work 2014-05-13 22:39:58 -07:00
friendica
ca7888b7ce choklet tweaks 2014-05-13 22:35:33 -07:00
friendica
a4869394f4 allow jgrowl 'close all' message to be translated 2014-05-13 17:59:47 -07:00
friendica
e664d6486a fix ca anomaly 2014-05-13 02:21:01 -07:00
friendica
71ded9388b missing paren 2014-05-13 02:17:17 -07:00
friendica
8c948f4bbe forbid redefinition of language plural_select function 2014-05-13 02:10:06 -07:00
marijus
0bf68af0a7 make comment_indent an option and removeitem_opacity as it is not working properly at the current state - we have got item background opacity now (allthough not yet for custom colors because the colorpicker does not work with rgba colors). Reset left comment border width to 3px as it is barely visible otherwise. 2014-05-12 20:33:14 +02:00
marijus
0446db8104 fix bootstrap override position issue with dropdown menu 2014-05-12 16:57:13 +02:00
RedMatrix
d1841911b3 Merge pull request #458 from pixelroot/master 
modified:   view/ru/messages.po
 2014-05-12 18:27:05 +10:00
pixelroot
5830e85912 modified: view/ru/messages.po 
modified:   view/ru/strings.php
 2014-05-12 09:57:48 +02: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
RedMatrix
c455663509 Merge pull request #456 from cvogeley/master 
Move "boxy" conversation design into a schema file
 2014-05-12 09:43:58 +10:00
Christian Vogeley
3fbac93619 grrr 2014-05-11 13:23:38 +02:00
Christian Vogeley
889aaad668 For the moment last change 2014-05-11 13:16:01 +02:00
Christian Vogeley
2d69a81c00 saved 2 2014-05-11 04:22:52 +02:00
Christian Vogeley
f9ad959f17 saved 2014-05-11 04:13:54 +02:00
Christian Vogeley
7da462ada1 some corrections and cleanup 2014-05-11 03:16:39 +02:00
Christian Vogeley
5f1f82df5d Move "boxy" conversation design into a schema file 
Default design is now again basically the previous one
 2014-05-11 02:22:27 +02:00
Christian Vogeley
e2b96df27b another experiment 2014-05-10 23:43:37 +02: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
7302a3690e Merge https://github.com/friendica/red into pending_merge 2014-05-09 01:53:41 -07:00
friendica
6d56c9b603 better button theming on oauth connected apps page 2014-05-09 01:53:03 -07:00