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
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
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
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
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
Michael Vogel
dc416e5887
Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow.
2012-07-26 07:38:51 +02:00
friendica
2e5c970cb1
Merge pull request #412 from rainulf/master
...
Sending a pull request
2012-07-25 19:03:58 -07:00
Rainulf Pineda
1573c10631
Fixed syntax error in usage of anonymous function.
2012-07-25 21:38:28 -04:00
friendica
6ac45f2f6f
Merge https://github.com/friendica/friendica into pull
2012-07-25 15:55:30 -07:00
friendica
b9f13400d9
rev update
2012-07-25 15:52:26 -07:00
Michael Vogel
fc27edb6d7
network: Caching of images
2012-07-26 00:23:25 +02:00
Michael Vogel
6456c2484e
scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
2012-07-25 23:40:23 +02:00
Michael
f140a6da89
Further performance improvements
2012-07-25 22:50:06 +02:00
Michael Vogel
69b883829a
Speed improvements in the database
2012-07-25 21:28:06 +02:00
fabrixxm
42e80a162b
Merge pull request #411 from fabrixxm/master
...
quattro: add id to items container div
2012-07-25 05:16:48 -07:00
Fabrixxm
727c93cb8c
quattro: add id to items container div
...
needed to make commit 4c6a4321
2012-07-25 08:12:21 -04:00
