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
