Commit graph

6292 commits

Author SHA1 Message Date
friendica
360c35e438 recycle symbol woes with multiple html entity encode/decode cycles going on 2012-07-04 23:24:59 -07:00
friendica
e29dd081ca render the recycle symbol correctly on Diaspora reshares 2012-07-04 22:44:04 -07:00
friendica
f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica
0990269555 restore translation of bbcode videos, events, bookmarks, etc. to diaspora 2012-07-04 19:12:09 -07:00
friendica
5589bca1e0 fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
friendica
fd626022ec add smarty engine, remove some obsolete zot1 stuff 2012-07-03 22:23:08 -07:00
friendica
13b4962531 Merge https://github.com/friendica/friendica into pull 2012-07-03 21:41:05 -07:00
friendica
c726a92a3f punycode hostname 2012-07-03 21:40:13 -07:00
Thomas Willingham
badaa68340 Diabook directory wide variants. 2012-07-04 01:08:50 +01:00
friendica
b550b1326b Merge https://github.com/friendica/friendica into pull 2012-07-03 16:26:58 -07:00
friendica
7926a0d171 add link to shares 2012-07-03 16:26:14 -07:00
Thomas Willingham
e3828fe675 Merge pull request #372 from rdc/master
Resolved CSS error in sidebar profile thumbs
2012-07-03 12:58:57 -07:00
Zvi ben Yaakov (a.k.a rdc)
424797138f Limiting .directory-photo-wrapper styles to <section> so as not to
interfere with .directory-photo-wrapper in <aside>
2012-07-03 21:49:02 +03:00
friendica
14d4635be6 Merge pull request #371 from fermionic/option-to-limit-max-image-pixel-length
add ability to set maximum pixel length of uploaded pictures
2012-07-02 19:12:58 -07:00
Zach Prezkuta
3fe5bdbd8d add ability to set maximum pixel length of uploaded pictures 2012-07-02 20:01:23 -06:00
friendica
f7144e671c fix diabook directory pages (only the normal style - any volunteers for the wide?) 2012-07-02 16:56:37 -07:00
friendica
ced0a208d8 fix double lines 2012-07-02 16:34:01 -07:00
friendica
64fc1318c6 Merge https://github.com/friendica/friendica into pull 2012-07-02 01:13:30 -07:00
friendica
315784444a try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff 2012-07-02 01:11:19 -07:00
friendica
a9c65dfe27 "babel" diagnostic - convert bbcode to different formats and back again 2012-07-01 23:00:25 -07:00
Thomas Willingham
610c78f9e0 Merge branch 'master' of https://github.com/friendica/friendica 2012-07-02 03:41:27 +01:00
Thomas Willingham
74a819980f Various theme stuff.
Profile group list for testbubble
Screenshot for facepark
Various niggles in darkzero/NS
2012-07-02 03:40:12 +01:00
friendica
ab2b3304dc ...and the other bit 2012-07-01 19:40:03 -07:00
friendica
e2a725ff98 pagination start off by one 2012-07-01 19:17:21 -07:00
friendica
dd71f9446b config to disable email validation 2012-07-01 18:56:00 -07:00
friendica
696d78d658 Merge pull request #369 from rdc/master
Added more profile data and CSS styling to the /directory page
2012-07-01 16:44:21 -07:00
friendica
c102a5f7cd Merge pull request #370 from mschmitt/master
Esperanto at 100% again
2012-07-01 15:37:19 -07:00
Martin Schmitt
85c078f862 Esperanto -> 100% 2012-07-01 19:13:24 +02:00
Zvi ben Yaakov (a.k.a rdc)
2214cd74e5 Added more profile data and CSS styling to the /directory page 2012-07-01 14:46:03 +03:00
friendica
7747f6fc96 rev update 2012-06-30 17:38:02 -07:00
friendica
a3dfb55029 bug #437 2012-06-30 06:27:46 -07:00
friendica
6cc844b2f9 restore 'shareable' to feeds after recent feed privacy re-factoring 2012-06-30 05:16:30 -07:00
friendica
31718968c6 advanced profile theming 2012-06-30 01:29:29 -07:00
Michael Vogel
bcca817b9a Removing of the title if it is the same (or part) from the body. Helps against auto generated titles from tumblr. 2012-06-30 09:25:22 +02:00
friendica
ffd5217ffa Merge https://github.com/friendica/friendica into pull 2012-06-29 20:12:44 -07:00
friendica
78e03abed8 convert ent_quotes for jquery calendar title/summary 2012-06-29 20:11:36 -07:00
friendica
1b27e24bb7 Merge pull request #368 from fabrixxm/master
Some work on quattro
2012-06-29 16:34:23 -07:00
Michael Vogel
65268d25e6 Merge remote branch 'upstream/master'
Conflicts:
	include/items.php
2012-06-29 21:43:49 +02:00
Michael Vogel
52569e536e Tests considering removing of the title 2012-06-29 21:40:54 +02:00
Fabrixxm
a03e6b96ea quattro: fix Forum widget, hide edit profile link 2012-06-29 05:47:53 -04:00
Fabrixxm
8b18ee49ff quattro: some updates
- add makefile to rebuild both css with single command
- fix icons in Forums widget
- style photos pages
2012-06-29 05:29:58 -04:00
Fabrixxm
0fb08e3642 nav: pass $baseurl to template 2012-06-29 05:29:29 -04:00
friendica
be658788de maintain page position when hovering on pop-outs 2012-06-28 22:19:12 -07:00
friendica
7b63e5792a more pager limits 2012-06-28 21:39:02 -07:00
friendica
43036bee98 wrong column name (- vs _) 2012-06-28 21:32:49 -07:00
friendica
0ecba60503 undefined fn 2012-06-28 21:15:43 -07:00
friendica
1830ecc9ba remote_self feeds are not private 2012-06-28 18:52:49 -07:00
friendica
a3edbf7e5d create third privacy state - public post but not searchable or publicly visible 2012-06-28 17:43:29 -07:00
friendica
43d3721fa9 css smiley class 2012-06-28 16:42:40 -07:00
friendica
d7f35c81db Merge https://github.com/friendica/friendica into pull 2012-06-28 16:05:28 -07:00