clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 1b70cdbdc7 Romania typo. Thomas Willingham 2012-09-09 15:08:09 +01:00
  • 63ab82d3dd frost-mobile: was missing infront of the nav-images Tobias Diekershoff 2012-09-09 13:26:15 +02:00
  • 624fd44502 Merge https://github.com/friendica/friendica into pull friendica 2012-09-08 18:34:32 -07:00
  • 7bec5778ba provide option to view photo albums in posted order (rather than blog order) friendica 2012-09-08 18:33:28 -07:00
  • 032507bd6d rev update friendica 2012-09-08 18:11:08 -07:00
  • 1088257aad Merge pull request #461 from pixelroot/master fermionic 2012-09-08 07:33:26 -07:00
  • a04d0e6832 deleted: view/theme/smoothly/mobile pixelroot 2012-09-08 09:26:13 +02:00
  • b6d310675b deleted: view/theme/smoothly/icons/dot.png deleted: view/theme/smoothly/js/jquery.ae.image.resize.js deleted: view/theme/smoothly/js/jquery.ae.image.resize.min.js pixelroot 2012-09-08 09:25:06 +02:00
  • 393a91ea78 modified: view/theme/smoothly/comment_item.tpl new file: view/theme/smoothly/dot.png new file: view/theme/smoothly/moderated_comment.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php deleted: view/theme/smoothly/icons/dot.png deleted: view/theme/smoothly/js/jquery.ae.image.resize.js deleted: view/theme/smoothly/js/jquery.ae.image.resize.min.js pixelroot 2012-09-08 09:24:37 +02:00
  • 002168ebd9 new file: view/theme/smoothly/js/jquery.ae.image.resize.js new file: view/theme/smoothly/js/jquery.ae.image.resize.min.js modified: view/theme/smoothly/theme.php pixelroot 2012-09-08 08:54:18 +02:00
  • 6fd2414564 Merge pull request #460 from fermionic/frost-mobile-settings-and-add-contact fermionic 2012-09-07 11:20:37 -07:00
  • 63d02d98c5 add settings sections and add contacts; other tweaks and fixes Zach Prezkuta 2012-09-07 12:17:03 -06:00
  • c616b05a33 modified: view/theme/smoothly/jot.tpl modified: view/theme/smoothly/style.css pixelroot 2012-09-07 17:13:51 +02:00
  • 9f7fbbdee3 modified: view/theme/smoothly/style.css pixelroot 2012-09-07 16:32:20 +02:00
  • 8685ca5a7f new file: view/theme/smoothly/mobile pixelroot 2012-09-07 10:10:25 +02:00
  • 1157b627af modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php view/theme/smoothly/mobile pixelroot 2012-09-07 10:09:24 +02:00
  • 5c0f0df59a provide local_block - block_public as far as content but can connect with the grid. friendica 2012-09-06 20:17:50 -07:00
  • 40cfcdad2d Merge https://github.com/friendica/friendica into pull friendica 2012-09-06 17:21:28 -07:00
  • cc9a1a6474 rev update friendica 2012-09-06 17:20:31 -07:00
  • d0994fc882 Merge branch 'master' of https://github.com/friendica/friendica Thomas Willingham 2012-09-07 00:44:01 +01:00
  • 5f970aea72 Typo in notifier. Thomas Willingham 2012-09-07 00:43:05 +01:00
  • 9bf8efc45f Merge pull request #459 from fermionic/individual-choice-of-mobile-theme fermionic 2012-09-06 16:35:04 -07:00
  • b80a225fc0 Merge pull request #458 from fermionic/twitter-profile-picture-too-small fermionic 2012-09-06 16:34:40 -07:00
  • a089a89478 small twitter improvements Zach Prezkuta 2012-09-06 17:31:05 -06:00
  • af3e36f665 mark all mobile themes Zach Prezkuta 2012-09-06 17:30:24 -06:00
  • 77529ccdf1 allow individual choice of mobile themes Zach Prezkuta 2012-09-06 17:24:34 -06:00
  • 41439804f4 Merge pull request #456 from pixelroot/master fermionic 2012-09-06 11:08:48 -07:00
  • 6a46717e1a modified: view/theme/smoothly/style.css modified: view/theme/smoothly/wallwall_thread.tpl pixelroot 2012-09-06 16:25:16 +02:00
  • 6ac28c97f1 modified: view/theme/smoothly/jot.tpl modified: view/theme/smoothly/style.css pixelroot 2012-09-06 15:50:02 +02:00
  • a6f7ff686c modified: view/theme/smoothly/style.css modified: view/theme/smoothly/wallwall_thread.tpl pixelroot 2012-09-06 14:15:38 +02:00
  • a888b59c42 modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/style.css pixelroot 2012-09-06 13:25:13 +02:00
  • 5c91ca9687 new file: view/theme/smoothly/icons/dot.png new file: view/theme/smoothly/lang_selector.tpl modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/style.css new file: view/theme/smoothly/wall_thread.tpl new file: view/theme/smoothly/wallwall_thread.tpl pixelroot 2012-09-06 12:04:56 +02:00
  • 0d9f6c89cc modified: view/theme/smoothly/comment_item.tpl modified: view/theme/smoothly/contact_template.tpl modified: view/theme/smoothly/jot-header.tpl modified: view/theme/smoothly/jot.tpl modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/photo_top.tpl modified: view/theme/smoothly/profile_entry.tpl modified: view/theme/smoothly/profile_vcard.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php view/theme/smoothly/icons/ view/theme/smoothly/lang_selector.tpl view/theme/smoothly/wall_thread.tpl view/theme/smoothly/wallwall_thread.tpl pixelroot 2012-09-06 11:17:17 +02:00
  • 5e3076b5d2 view/theme/smoothly/icons/ view/theme/smoothly/lang_selector.tpl view/theme/smoothly/wall_thread.tpl view/theme/smoothly/wallwall_thread.tpl pixelroot 2012-09-06 09:44:15 +02:00
  • 1478229abc allow comments on other folks wall-to-wall postings friendica 2012-09-05 18:24:06 -07:00
  • f7c4b033c7 Merge https://github.com/friendica/friendica into pull friendica 2012-09-05 16:27:30 -07:00
  • 3968dc932f update writable for dfrn contacts when using local delivery friendica 2012-09-05 16:26:11 -07:00
  • f8b81b31f2 rev update friendica 2012-09-05 15:43:19 -07:00
  • 79a2a1c37d Merge pull request #457 from fermionic/testbubble-broken-with-threading fermionic 2012-09-05 10:13:46 -07:00
  • c6f4404914 conversation.tpl doesnt appear to be necessary Zach Prezkuta 2012-09-05 11:12:08 -06:00
  • 0d45fec969 add threading files to make testbubble not broken with threading Zach Prezkuta 2012-09-05 11:11:03 -06:00
  • 92a9070e1e view/theme/smoothly/lang_selector.tpl pixelroot 2012-09-05 16:04:29 +02:00
  • e326e3e5d0 modified: view/theme/smoothly/style.css pixelroot 2012-09-05 13:29:45 +02:00
  • 9e5fa5b9a9 ignore exif orientation if we can't parse the particular flavour of exif friendica 2012-09-05 04:02:30 -07:00
  • 89adfbeb80 deleted: view/theme/smoothly/back-gradient.jpg modified: view/theme/smoothly/style.css pixelroot 2012-09-05 10:28:15 +02:00
  • de9bcb5825 new file: view/theme/smoothly/login.tpl pixelroot 2012-09-05 09:46:26 +02:00
  • 2d37a18513 view/theme/smoothly/login.tpl pixelroot 2012-09-05 09:42:52 +02:00
  • 411b6a71b4 Merge https://github.com/friendica/friendica into pull friendica 2012-09-04 22:53:32 -07:00
  • 4cd8233f61 remote_user can now support multiple contacts being logged in at once friendica 2012-09-04 22:50:28 -07:00
  • a9deda1e5e rev update friendica 2012-09-04 20:41:44 -07:00
  • e079ffdce6 Merge pull request #455 from fermionic/previews-dont-work fermionic 2012-09-04 17:50:33 -07:00
  • 79012bf888 conversation needs preview parameter Zach Prezkuta 2012-09-04 18:47:49 -06:00
  • 59d378913d Merge remote branch 'upstream/master' Michael Vogel 2012-09-04 07:22:59 +02:00
  • 5beda888b8 Merge https://github.com/friendica/friendica into pull friendica 2012-09-03 21:32:47 -07:00
  • cdf648c0b4 attachments from non-friendica contacts shouldn't go through redir - it won't work friendica 2012-09-03 21:31:35 -07:00
  • ca371de509 rev update friendica 2012-09-03 21:31:00 -07:00
  • 6f7e8eee9e Merge pull request #454 from CyberDomovoy/mass_vhost fermionic 2012-09-02 14:18:00 -07:00
  • 2b51e91414 Added comments in .htacces to help configuring installation behind a VirtualDocumantRoot Domovoy 2012-09-02 23:00:58 +02:00
  • f6818ab243 Merge remote branch 'upstream/master' Michael Vogel 2012-09-02 17:50:25 +02:00
  • 3c24a7ed3e items: added some logging infos Michael Vogel 2012-09-02 17:49:06 +02:00
  • 05dda2f226 new file: view/theme/smoothly/back-gradient.jpg new file: view/theme/smoothly/calendar.png new file: view/theme/smoothly/comment_item.tpl new file: view/theme/smoothly/connect.png new file: view/theme/smoothly/contact_template.tpl new file: view/theme/smoothly/conversation.tpl new file: view/theme/smoothly/group_drop.tpl new file: view/theme/smoothly/group_edit.tpl new file: view/theme/smoothly/group_side.tpl new file: view/theme/smoothly/groups.png new file: view/theme/smoothly/icons.png new file: view/theme/smoothly/icons.svg new file: view/theme/smoothly/jot-header.tpl new file: view/theme/smoothly/jot.tpl new file: view/theme/smoothly/lock.cur new file: view/theme/smoothly/login-bg.gif new file: view/theme/smoothly/lrarrow.gif new file: view/theme/smoothly/mail_head.tpl new file: view/theme/smoothly/match.tpl new file: view/theme/smoothly/menu-user-pin.jpg new file: view/theme/smoothly/menu-user-pin.png new file: view/theme/smoothly/nav-bg.png new file: view/theme/smoothly/nav.tpl new file: view/theme/smoothly/nets.tpl new file: view/theme/smoothly/next.png new file: view/theme/smoothly/notifications.png new file: view/theme/smoothly/photo-menu.jpg new file: view/theme/smoothly/photo_album.tpl new file: view/theme/smoothly/photo_top.tpl new file: view/theme/smoothly/photo_view.tpl new file: view/theme/smoothly/photography.png new file: view/theme/smoothly/premium.png new file: view/theme/smoothly/prev.png new file: view/theme/smoothly/profile_entry.tpl new file: view/theme/smoothly/profile_vcard.tpl new file: view/theme/smoothly/saved_searches_aside.tpl new file: view/theme/smoothly/screenshot.jpg new file: view/theme/smoothly/screenshot.png new file: view/theme/smoothly/search.png new file: view/theme/smoothly/search_item.tpl new file: view/theme/smoothly/star.png new file: view/theme/smoothly/style.css new file: view/theme/smoothly/theme.php new file: view/theme/smoothly/user.png new file: view/theme/smoothly/wall_item.tpl new file: view/theme/smoothly/wallwall_item.tpl pixelroot 2012-09-02 13:11:17 +02:00
  • 0aebf15f03 deleted: view/theme/softy/back-gradient.jpg deleted: view/theme/softy/calendar.png deleted: view/theme/softy/comment_item.tpl deleted: view/theme/softy/connect.png deleted: view/theme/softy/contact_template.tpl deleted: view/theme/softy/conversation.tpl deleted: view/theme/softy/group_drop.tpl deleted: view/theme/softy/group_edit.tpl deleted: view/theme/softy/group_side.tpl deleted: view/theme/softy/groups.png deleted: view/theme/softy/icons.png deleted: view/theme/softy/icons.svg deleted: view/theme/softy/jot-header.tpl deleted: view/theme/softy/jot.tpl deleted: view/theme/softy/lock.cur deleted: view/theme/softy/login-bg.gif deleted: view/theme/softy/lrarrow.gif deleted: view/theme/softy/mail_head.tpl deleted: view/theme/softy/match.tpl deleted: view/theme/softy/menu-user-pin.jpg deleted: view/theme/softy/menu-user-pin.png deleted: view/theme/softy/nav-bg.png deleted: view/theme/softy/nav.tpl deleted: view/theme/softy/nets.tpl deleted: view/theme/softy/next.png deleted: view/theme/softy/notifications.png deleted: view/theme/softy/photo-menu.jpg deleted: view/theme/softy/photo_album.tpl deleted: view/theme/softy/photo_top.tpl deleted: view/theme/softy/photo_view.tpl deleted: view/theme/softy/photography.png deleted: view/theme/softy/premium.png deleted: view/theme/softy/prev.png deleted: view/theme/softy/profile_entry.tpl deleted: view/theme/softy/profile_vcard.tpl deleted: view/theme/softy/saved_searches_aside.tpl deleted: view/theme/softy/screenshot.jpg deleted: view/theme/softy/screenshot.png deleted: view/theme/softy/search.png deleted: view/theme/softy/search_item.tpl deleted: view/theme/softy/star.png deleted: view/theme/softy/style.css deleted: view/theme/softy/theme.php deleted: view/theme/softy/user.png deleted: view/theme/softy/wall_item.tpl deleted: view/theme/softy/wallwall_item.tpl view/theme/smoothly/ pixelroot 2012-09-02 13:09:16 +02:00
  • a287b34eb3 DE strings (pokes THX @zottel) Tobias Diekershoff 2012-09-02 11:59:44 +02:00
  • 115310f1f4 Merge https://github.com/friendica/friendica into pull friendica 2012-09-02 01:48:24 -07:00
  • 39c7b34276 rev update friendica 2012-09-02 01:47:04 -07:00
  • 9752f62b8d Merge pull request #452 from fabrixxm/master fabrixxm 2012-09-01 02:05:53 -07:00
  • 02037e345d quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas Fabrixxm 2012-09-01 04:52:01 -04:00
  • f88f0bf3f2 Merge https://github.com/friendica/friendica into pull friendica 2012-08-31 01:29:55 -07:00
  • b1c8b22aa5 rev update friendica 2012-08-31 01:29:37 -07:00
  • 2ace7d6646 Merge pull request #451 from fabrixxm/master friendica 2012-08-31 01:26:03 -07:00
  • 51686cce01 quattro: remove 'experimental' Fabrixxm 2012-08-31 03:32:10 -04:00
  • ad45d9a78a quattro: fix live update Fabrixxm 2012-08-31 03:31:33 -04:00
  • 9346de5686 deleted: view/theme/softy/style.alex deleted: view/theme/softy/style.alt pixelroot 2012-08-30 16:50:22 +02:00
  • d96e3d95c1 new file: view/theme/softy/back-gradient.jpg new file: view/theme/softy/calendar.png new file: view/theme/softy/comment_item.tpl new file: view/theme/softy/connect.png new file: view/theme/softy/contact_template.tpl new file: view/theme/softy/conversation.tpl new file: view/theme/softy/group_drop.tpl new file: view/theme/softy/group_edit.tpl new file: view/theme/softy/group_side.tpl new file: view/theme/softy/groups.png new file: view/theme/softy/icons.png new file: view/theme/softy/icons.svg new file: view/theme/softy/jot-header.tpl new file: view/theme/softy/jot.tpl new file: view/theme/softy/lock.cur new file: view/theme/softy/login-bg.gif new file: view/theme/softy/lrarrow.gif new file: view/theme/softy/mail_head.tpl new file: view/theme/softy/match.tpl new file: view/theme/softy/menu-user-pin.jpg new file: view/theme/softy/menu-user-pin.png new file: view/theme/softy/nav-bg.png new file: view/theme/softy/nav.tpl new file: view/theme/softy/nets.tpl new file: view/theme/softy/next.png new file: view/theme/softy/notifications.png new file: view/theme/softy/photo-menu.jpg new file: view/theme/softy/photo_album.tpl new file: view/theme/softy/photo_top.tpl new file: view/theme/softy/photo_view.tpl new file: view/theme/softy/photography.png new file: view/theme/softy/premium.png new file: view/theme/softy/prev.png new file: view/theme/softy/profile_entry.tpl new file: view/theme/softy/profile_vcard.tpl new file: view/theme/softy/saved_searches_aside.tpl new file: view/theme/softy/screenshot.jpg new file: view/theme/softy/screenshot.png new file: view/theme/softy/search.png new file: view/theme/softy/search_item.tpl new file: view/theme/softy/star.png new file: view/theme/softy/style.alex new file: view/theme/softy/style.alt new file: view/theme/softy/style.css new file: view/theme/softy/theme.php new file: view/theme/softy/user.png new file: view/theme/softy/wall_item.tpl new file: view/theme/softy/wallwall_item.tpl pixelroot 2012-08-30 16:42:50 +02:00
  • ef52ff6b01 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items Domovoy 2012-08-30 07:47:21 +02:00
  • f433158bed config: fix get_config and get_pconfig search for serialized array works also if the serialized string contains newlines Fabrixxm 2012-08-29 04:19:15 -04:00
  • af789ee98b Merge https://github.com/friendica/friendica into pull friendica 2012-08-28 20:35:25 -07:00
  • ed7c3363c2 Merge pull request #450 from fermionic/frost-showmore-border fermionic 2012-08-28 19:20:36 -07:00
  • 2ef1081c68 make the show more line look nicer Zach Prezkuta 2012-08-28 20:19:47 -06:00
  • 65f766ba0e Merge pull request #449 from fermionic/markdownify-breaks-links-with-underscores fermionic 2012-08-28 19:13:48 -07:00
  • f7a1999c15 manually fix escaped underscores in links Zach Prezkuta 2012-08-26 18:18:43 -06:00
  • f07658accf Merge https://github.com/friendica/friendica into pull friendica 2012-08-28 19:11:52 -07:00
  • 724583e386 rev update friendica 2012-08-28 19:08:17 -07:00
  • 9ae5ae6df5 Merge pull request #448 from fermionic/limit-items-on-all-pages fermionic 2012-08-28 19:03:15 -07:00
  • 597e96e156 Merge pull request #447 from fermionic/zrls-and-redir-photos-broken-with-tags fermionic 2012-08-28 19:03:04 -07:00
  • 8c064069d9 Merge pull request #443 from fermionic/new-users-privacy-settings fermionic 2012-08-28 19:02:51 -07:00
  • c2b4dc2e60 DE: some translations Tobias Diekershoff 2012-08-28 18:14:57 +02:00
  • 9ecb984285 Merge remote branch 'friendica/master' into bid-prov Fabrixxm 2012-08-28 10:38:40 -04:00
  • d9ffb0578c quattro: display date info as "ago" with mouse over date stamp Tobias Diekershoff 2012-08-27 19:47:04 +02:00
  • 647802f92e get "ago" information into the mail thread view Tobias Diekershoff 2012-08-27 19:46:35 +02:00
  • cf91a7f79a quattro: mail_display has no ago information so don't display it Tobias Diekershoff 2012-08-27 19:39:31 +02:00
  • 036d5db0c0 quattro: use "ago" for date information and on mouse the date stamp Tobias Diekershoff 2012-08-27 19:32:23 +02:00
  • 1e9d35fb0e pass "ago" information to the mail_list template Tobias Diekershoff 2012-08-27 19:31:41 +02:00
  • 37a0504f96 quattro: expanded the new prvmessage field a bit Tobias Diekershoff 2012-08-27 08:13:07 +02:00
  • c681e69794 limit number of items on profile page too; add show more back to Frost mobile; some show more fixes Zach Prezkuta 2012-08-26 15:21:26 -06:00
  • 72712175b5 regular expressions were grabbing too much Zach Prezkuta 2012-08-26 14:56:34 -06:00
  • 0765ab5203 Merge pull request #446 from fermionic/frost-scrollbars-are-annoying fermionic 2012-08-26 08:32:52 -07:00
  • a77081f659 remove show more/less from frost mobile--it is too great a load Zach Prezkuta 2012-08-26 09:31:37 -06:00
  • 0fe1727d74 remove show more/less animation on mobile Zach Prezkuta 2012-08-26 09:22:49 -06:00
  • 17b59a7e3f Merge pull request #445 from fermionic/frost-scrollbars-are-annoying fermionic 2012-08-25 21:45:52 -07:00