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
Zach Prezkuta
1f09e7ad23
Modify Javascript to improve page loading times
...
1. Add template category 'end' that places content right before final </body> tag
2. Move most Javascript from tpl files into one cacheable file, theme.js
3. Load scripts at end of the HTML document instead of in the header
4. Minify several Javascript files
Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
2012-07-28 09:57:16 -06:00
friendica
eafec44793
Merge https://github.com/friendica/friendica into pull
2012-07-27 17:53:35 -07:00
friendica
50e20a1494
rev update
2012-07-27 17:52:43 -07:00
Thomas Willingham
3f39e29e6e
Friendicaland got bigger.
2012-07-28 01:16:09 +01:00
Domovoy
eaf0d04bfb
Comment box is now inside the item. Makes it easier to know what we are commenting on.
2012-07-27 22:58:51 +02:00
Domovoy
d558d25540
CommentBox is now hidden by default, this can be toggled with a fake link
2012-07-27 22:47:18 +02:00
Domovoy
8ecf8167db
Threaded comments are starting to work.
...
For now, only on normal view, and not during update
2012-07-27 22:08:57 +02:00
Fabrixxm
672f9fd87f
include/plugin: define THISPLUGIN as "addon/$pluginname/$pluginname.php"
...
to make life a litte bit easy to lazy plugin devs like me
2012-07-27 09:02:28 -04:00
Fabrixxm
a77fdfa6aa
remove special case for /.well-known/host-meta and add module for /.well-known
2012-07-27 08:58:27 -04:00
Domovoy
3484d3bc5f
Merge branch 'master' of github.com:CyberDomovoy/friendica into threaded_items
2012-07-27 08:27:24 +02:00
