Domovoy
|
66848b0471
|
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
update.php
|
2012-08-03 18:57:37 +02:00 |
|
Thomas Willingham
|
208019ea9c
|
Darkzero/NS .contact-photo-menu
|
2012-08-03 03:07:29 +01:00 |
|
friendica
|
864b5fc256
|
rev update
|
2012-08-02 14:15:56 -07:00 |
|
friendica
|
ad25336d10
|
Merge pull request #422 from annando/master
Speed improvements, better diaspora export
|
2012-08-02 03:47:02 -07:00 |
|
Michael Vogel
|
b904a21134
|
Merge remote branch 'upstream/master'
|
2012-08-02 10:27:11 +02:00 |
|
Michael Vogel
|
6d0f0e6273
|
parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.
|
2012-08-02 10:25:08 +02:00 |
|
friendica
|
9885be256e
|
Merge https://github.com/friendica/friendica into pull
|
2012-08-02 01:24:04 -07:00 |
|
friendica
|
4cbde6a75d
|
rev update
|
2012-08-02 01:23:16 -07:00 |
|
fermionic
|
50ffe24280
|
Merge pull request #421 from fermionic/frost-tinymce-editplain-broken
ugly fix to make editplain work
|
2012-08-01 18:10:25 -07:00 |
|
Zach Prezkuta
|
3e8e1ab830
|
ugly fix to make editplain work
|
2012-08-01 19:09:28 -06:00 |
|
Michael Vogel
|
2aa67d67f5
|
Changed markdown to enable diaspora postings with images that contain links
|
2012-08-02 01:46:28 +02:00 |
|
Michael Vogel
|
04c31d194f
|
Merge remote branch 'upstream/master'
Conflicts:
update.php
|
2012-08-02 00:21:14 +02:00 |
|
Michael Vogel
|
bed99674d2
|
bbcode: two new bbcode elements (style, class) for CSS
|
2012-08-02 00:13:37 +02:00 |
|
fabrixxm
|
ac88336ce9
|
Merge pull request #420 from fabrixxm/master
Quattro: Style "show more" plugin
|
2012-08-01 01:56:56 -07:00 |
|
Fabrixxm
|
fde3edaa21
|
quattro: readd sparkle cursor
|
2012-08-01 04:45:27 -04:00 |
|
Fabrixxm
|
bf04fb450a
|
quattro: style for "show more" addon
|
2012-08-01 04:41:21 -04:00 |
|
friendica
|
372ad112c9
|
tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
|
2012-08-01 01:36:39 -07:00 |
|
friendica
|
70389c99ea
|
logic was reversed - should work now
|
2012-07-31 22:25:03 -07:00 |
|
friendica
|
14282a40bb
|
Merge pull request #419 from fermionic/more-div-problems
fix almost all errant divs in view/ and frost folders
|
2012-07-31 21:58:08 -07:00 |
|
Zach Prezkuta
|
fc22c356ff
|
fix almost all errant divs in view/ and frost folders
|
2012-07-31 22:43:18 -06:00 |
|
friendica
|
764ee653ba
|
Provide backend ability to poke as a comment rather than top-level post
|
2012-07-31 20:59:51 -07:00 |
|
friendica
|
08c9185a7e
|
Merge https://github.com/friendica/friendica into pull
|
2012-07-31 18:02:41 -07:00 |
|
friendica
|
49ad9b355c
|
rev update
|
2012-07-31 18:01:55 -07:00 |
|
friendica
|
0c36d5b3cf
|
Merge pull request #418 from fermionic/reduce-frost-dom-elements
Reduce frost dom elements
|
2012-07-31 18:01:33 -07:00 |
|
Zach Prezkuta
|
885bb50f0d
|
fix /display bug; oembed audio bug; other tweaks
|
2012-07-31 18:53:18 -06:00 |
|
Zach Prezkuta
|
b522ffeea5
|
Frost: reduce DOM elements by about 20%; other tweaks and fixes
|
2012-07-31 08:00:50 -06:00 |
|
friendica
|
5c033dee77
|
Merge https://github.com/friendica/friendica into pull
|
2012-07-30 14:17:07 -07:00 |
|
friendica
|
5297d6ee75
|
Merge pull request #417 from fermionic/events-reminder-makes-format-wonky
errant div in events_reminder.tpl
|
2012-07-30 14:16:11 -07:00 |
|
friendica
|
27ee8620f9
|
rev update
|
2012-07-30 14:14:20 -07:00 |
|
Zach Prezkuta
|
72df6ff664
|
errant div in events_reminder.tpl
|
2012-07-30 07:59:08 -06:00 |
|
Domovoy
|
07f87848b4
|
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
|
2012-07-30 13:36:33 +02:00 |
|
friendica
|
efded40461
|
pass deleted flag to display
|
2012-07-30 00:49:48 -07:00 |
|
friendica
|
9b752b8a59
|
Merge https://github.com/friendica/friendica into pull
|
2012-07-29 15:36:01 -07:00 |
|
friendica
|
ee802016ba
|
Merge pull request #416 from fermionic/frost-tweaks
fix filer bug; some interface tweaks
|
2012-07-29 15:35:02 -07:00 |
|
friendica
|
299f9e3d9e
|
rev update
|
2012-07-29 15:32:26 -07:00 |
|
Zach Prezkuta
|
067865db9e
|
fix filer bug; some interface tweaks
|
2012-07-29 14:49:12 -06:00 |
|
Domovoy
|
30d7db5e42
|
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
|
2012-07-29 22:43:49 +02:00 |
|
fermionic
|
4f13618b18
|
Merge pull request #414 from 23n/patch-1
Update view/theme/frost-mobile/nav.tpl
|
2012-07-29 12:36:22 -07:00 |
|
fermionic
|
ec1580b82d
|
Merge pull request #415 from 23n/patch-2
Update view/theme/frost/nav.tpl
|
2012-07-29 12:36:05 -07:00 |
|
Domovoy
|
7b2ca538c8
|
Fallback to the old behavior for unhandled conversations mode.
|
2012-07-29 21:11:19 +02:00 |
|
Domovoy
|
283e91cd6a
|
Update the thr-parent field in the item table
|
2012-07-29 21:01:04 +02:00 |
|
Domovoy
|
56f0ee4915
|
Threaded items on profile page
|
2012-07-29 20:41:11 +02:00 |
|
Domovoy
|
3b330510ea
|
Fixed misbehaviour in collapsing
|
2012-07-29 20:09:51 +02:00 |
|
Domovoy
|
2fc0fcdc18
|
Unlimited level threading is now a site option.
|
2012-07-29 19:53:04 +02:00 |
|
Domovoy
|
25015d3ab9
|
Update now handles threaded items.
|
2012-07-29 18:39:38 +02:00 |
|
Domovoy
|
8ea3087342
|
Collapsing is back for threaded comments.
Comment box is displayed at the end of the thread.
Comments on comments are all collapsed
|
2012-07-29 17:13:21 +02:00 |
|
23n
|
5b5e4b6cb7
|
Update view/theme/frost/nav.tpl
moved identity/page management-link to system-menu
|
2012-07-29 15:28:59 +03:00 |
|
23n
|
0f1b33a278
|
Update view/theme/frost-mobile/nav.tpl
move identity management link to menu
|
2012-07-29 15:07:52 +03:00 |
|
Domovoy
|
10eb873f7c
|
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
|
2012-07-29 10:03:17 +02:00 |
|
friendica
|
5e64bccd5c
|
don't show birthday/event details on mobile devices
|
2012-07-28 17:48:33 -07:00 |
|