Commit Graph

1159 Commits

Author SHA1 Message Date
Fabrixxm 64a6e8693c quattro: remove unused parameter 'comment' from function cmtBbClose 2012-08-10 04:27:50 -04:00
Domovoy 9c920fd7b9 Merge pull request #5 from fabrixxm/threaded_items
Threaded items support for Quattro theme
2012-08-09 02:14:22 -07:00
Domovoy f3b1391501 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-07 09:40:21 +02:00
friendica 3032d663f6 Merge pull request #427 from fermionic/frost-embedded-videos
allow themes to change the size of embedded videos
2012-08-06 15:58:17 -07:00
Simon L'nu 7ceb213859 add a 'manage' icon to clarify things
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-08-06 17:05:25 -04:00
Simon L'nu 76e1e07571 Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  rev update
  Frost-mobile: media query in css for tablets
  expire issue
  rev update
2012-08-06 13:18:00 -04:00
Zach Prezkuta d8a13d6e8d allow themes to change the size of embedded videos 2012-08-06 09:59:57 -06:00
Fabrixxm 4062312e9c quattro: collaps threaded items 2012-08-06 04:48:24 -04:00
Fabrixxm fd7ea5cc91 quattro: support threaded comments 2012-08-05 16:55:20 -04:00
Christian Vogeley e6067e6694 Frost-mobile: media query in css for tablets
Use space more efficiently on tablets in frost-mobile theme. Tested with
iPad 1.
2012-08-05 16:08:07 +02:00
Domovoy e247915f48 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
	include/conversation.php
2012-08-05 13:43:53 +02:00
Simon L'nu 3d0fc813dc Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  missed an instance of $mobileapp in switch to generic app label
  ImageMagick rotates CW while imagerotate() rotates CCW
  update main frost version
  update version and todo
  -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks
  put back notags
  fix angle char storage and transmission, rev update
  Darkzero/NS .contact-photo-menu
  rev update
2012-08-04 23:41:51 -04:00
Zach Prezkuta ed9811762d missed an instance of $mobileapp in switch to generic app label 2012-08-04 21:05:25 -06:00
Zach Prezkuta 1f8182a453 update main frost version 2012-08-04 14:05:56 -06:00
Zach Prezkuta 849720f160 update version and todo 2012-08-04 14:04:18 -06:00
Zach Prezkuta 63628910b2 -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter)
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
2012-08-04 14:02:39 -06:00
Domovoy 8742beb772 Flatten children when threads are disabled 2012-08-03 22:28:21 +02:00
Domovoy 75700a725e Comment box is inside the item 2012-08-03 19:18:56 +02:00
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
Simon L'nu 9433d229ed Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.
  rev update
  Changed markdown to enable diaspora postings with images that contain links
  bbcode: two new bbcode elements (style, class) for CSS
  Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow.
  network: Caching of images
  scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
  Further performance improvements
  Speed improvements in the database
2012-08-02 12:46:36 -04:00
Michael Vogel b904a21134 Merge remote branch 'upstream/master' 2012-08-02 10:27:11 +02: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
Zach Prezkuta 3e8e1ab830 ugly fix to make editplain work 2012-08-01 19:09:28 -06: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 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
Zach Prezkuta fc22c356ff fix almost all errant divs in view/ and frost folders 2012-07-31 22:43:18 -06: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
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
Domovoy 07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-30 13:36:33 +02: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
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
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
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
Simon L'nu c5603cf756 fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet.
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-25 22:35:50 -04:00
Simon L'nu 794ae669ce fixes to cursor
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-25 22:28:09 -04:00
Fabrixxm 727c93cb8c quattro: add id to items container div
needed to make commit 4c6a4321 work
2012-07-25 08:12:21 -04:00
Zach Prezkuta 2e080f594e update head.tpl for dispy 2012-07-24 18:29:23 -06:00
friendica 57a75d240b Merge pull request #406 from fermionic/frost-theme
Introducing Frost
2012-07-24 15:28:16 -07:00