friendica
4cbde6a75d
rev update
2012-08-02 01:23:16 -07:00
Simon L'nu
31eff37693
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
ugly fix to make editplain work
quattro: readd sparkle cursor
quattro: style for "show more" addon
tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
logic was reversed - should work now
fix almost all errant divs in view/ and frost folders
Provide backend ability to poke as a comment rather than top-level post
rev update
2012-08-01 22:59:54 -04: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
Simon L'nu
0e7f6d1417
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix /display bug; oembed audio bug; other tweaks
Frost: reduce DOM elements by about 20%; other tweaks and fixes
rev update
errant div in events_reminder.tpl
pass deleted flag to display
rev update
fix filer bug; some interface tweaks
Update view/theme/frost/nav.tpl
Update view/theme/frost-mobile/nav.tpl
don't show birthday/event details on mobile devices
rev update
remove server-specific change
update version of frost and frost-mobile
Modify Javascript to improve page loading times
rev update
Friendicaland got bigger.
2012-07-31 23:16:56 -04: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
friendica
fe19890c3c
Merge https://github.com/friendica/friendica into pull
2012-07-28 16:13:25 -07:00
friendica
61115d7a07
rev update
2012-07-28 16:12:12 -07:00
friendica
52df143134
Merge pull request #413 from fermionic/improve-page-loading
...
Modify Javascript to improve page loading times for Frost
2012-07-28 16:08:44 -07:00
Zach Prezkuta
38d4df77c6
remove server-specific change
2012-07-28 10:14:28 -06:00
Zach Prezkuta
231b37217b
update version of frost and frost-mobile
2012-07-28 10:03:56 -06:00
