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

Commit Graph

  • 3303d9db75 put 1i8n position orders in welcome string friendica 2012-11-03 14:43:48 -07:00
  • 2b6498b2a2 Merge remote-tracking branch 'upstream/master' Michael 2012-11-03 22:27:34 +01:00
  • 2871fd4793 Depublish public posts when archiving a contact zottel 2012-11-02 23:54:03 +01:00
  • 7de5c7ebe1 Changes to make contacts delete all content from the user when a user is deleted. zottel 2012-11-02 21:43:47 +01:00
  • d3290f314f Merge pull request #521 from fermionic/20121101-updates fermionic 2012-11-02 12:26:49 -07:00
  • e8fa4279fa no profile pic on photos page if no photos have been uploaded friendica 2012-11-02 04:20:12 -07:00
  • c6a3b87359 update_display for display live updates Zach Prezkuta 2012-11-01 18:36:11 -06:00
  • c9248b66db display live update; don't collapse comments on live update Zach Prezkuta 2012-11-01 18:31:50 -06:00
  • ce932dfdaf Merge https://github.com/friendica/friendica into pull friendica 2012-11-01 17:21:55 -07:00
  • 08121ad6b4 rev update friendica 2012-11-01 17:21:39 -07:00
  • 6effdd570c add a confirm dialog and a busy rotator for delete selected Zach Prezkuta 2012-11-01 17:42:40 -06:00
  • e9b26ffbb3 prevent double posting of status updates and comments Zach Prezkuta 2012-11-01 17:14:42 -06:00
  • 6ecccf6830 Merge pull request #520 from fermionic/20121101-auto-redir-and-theme-threading fermionic 2012-11-01 09:37:18 -07:00
  • 3e594f0f1c get rid of stray file Zach Prezkuta 2012-11-01 10:35:20 -06:00
  • d98974572b fix theme control of allowing threading Zach Prezkuta 2012-11-01 10:33:01 -06:00
  • 43de9cf904 don't try to auto redir if I'm a blocked or pending contact Zach Prezkuta 2012-11-01 10:32:33 -06:00
  • c177a5e5b2 vier: threads Tobias Diekershoff 2012-11-01 15:05:31 +01:00
  • 9086641fd1 ES: update to the strings Tobias Diekershoff 2012-11-01 13:12:54 +01:00
  • 4832bc74f5 FR: update to the strings Tobias Diekershoff 2012-11-01 13:03:25 +01:00
  • 1a3a5ee8d9 moveme: first successful relocated user Fabrixxm 2012-10-31 17:13:45 +01:00
  • 70f8a69ef3 IT: update to the strings Tobias Diekershoff 2012-10-31 07:42:23 +01:00
  • e2ca9e9db5 poco - ignore archived contacts friendica 2012-10-30 14:25:33 -07:00
  • 68da185cce rev update friendica 2012-10-30 14:23:11 -07:00
  • 0fe9019c08 rev update friendica 2012-10-29 21:01:15 -07:00
  • fcc8bf8105 Merge https://github.com/friendica/friendica into pull friendica 2012-10-29 21:01:08 -07:00
  • a41e78a06d Merge pull request #516 from fermionic/20121029-auto-redir-fix friendica 2012-10-29 21:00:28 -07:00
  • d3682f5d6a Merge pull request #517 from fermionic/20121029-wall-live-commenting friendica 2012-10-29 20:58:32 -07:00
  • fca910a7c9 Merge pull request #518 from fermionic/20121029-email-polling-array-size friendica 2012-10-29 20:57:50 -07:00
  • 400d91a8b4 Merge pull request #519 from fermionic/20121029-delete-duplicate-template-files friendica 2012-10-29 20:55:43 -07:00
  • 2bfacda2df missed quattro threaded_conversation live update field Zach Prezkuta 2012-10-29 13:04:59 -06:00
  • 4fa5b76167 delete template files that are identical to the defaults Zach Prezkuta 2012-10-29 12:56:17 -06:00
  • 200d2030d5 don't combine msg and meta arrays unless they're the same size Zach Prezkuta 2012-10-29 12:47:51 -06:00
  • 4fd339b216 add live div to wall page Zach Prezkuta 2012-10-29 12:43:52 -06:00
  • 4990f64927 make sure that the contact is local for auto redir Zach Prezkuta 2012-10-29 12:03:48 -06:00
  • dbc6cbe024 moveme: send and receive DFRN "relocate" message (WIP) Fabrixxm 2012-10-29 17:48:08 +01:00
  • c51e057fe6 Merge remote branch 'friendica/master' into moveme Fabrixxm 2012-10-29 05:57:58 -04:00
  • 81a21257c3 rev update friendica 2012-10-27 15:42:23 -07:00
  • ab78e2064c Merge https://github.com/friendica/friendica into pull friendica 2012-10-26 14:30:23 -07:00
  • 88c8387c44 revive "mark everything seen" on main network page - see comments friendica 2012-10-26 14:29:42 -07:00
  • c1299bc689 view/theme/smoothly/screenshot.png pixelroot 2012-10-25 13:50:26 +02:00
  • 8e9c9992b0 new file: view/theme/smoothly/images/arrow.png new file: view/theme/smoothly/images/calendar.png new file: view/theme/smoothly/images/connect.png new file: view/theme/smoothly/images/dot.png new file: view/theme/smoothly/images/down.png new file: view/theme/smoothly/images/file.gif new file: view/theme/smoothly/images/groups.png new file: view/theme/smoothly/images/icons.png new file: view/theme/smoothly/images/icons.svg new file: view/theme/smoothly/images/login-bg.gif new file: view/theme/smoothly/images/lrarrow.gif new file: view/theme/smoothly/images/menu-user-pin.jpg new file: view/theme/smoothly/images/menu-user-pin.png new file: view/theme/smoothly/images/nav-bg.png new file: view/theme/smoothly/images/next.png new file: view/theme/smoothly/images/notifications.png new file: view/theme/smoothly/images/photo-menu.jpg new file: view/theme/smoothly/images/photography.png new file: view/theme/smoothly/images/premium.png new file: view/theme/smoothly/images/prev.png new file: view/theme/smoothly/images/search.png new file: view/theme/smoothly/images/shiny.png new file: view/theme/smoothly/images/star.png new file: view/theme/smoothly/images/tobottom.png new file: view/theme/smoothly/images/totop.png new file: view/theme/smoothly/images/user.png pixelroot 2012-10-25 12:27:05 +02:00
  • 272cccb47f deleted: view/theme/smoothly/arrow.png deleted: view/theme/smoothly/calendar.png deleted: view/theme/smoothly/connect.png modified: view/theme/smoothly/css/typography.css deleted: view/theme/smoothly/dot.png deleted: view/theme/smoothly/down.png deleted: view/theme/smoothly/file.gif deleted: view/theme/smoothly/groups.png deleted: view/theme/smoothly/icons.png deleted: view/theme/smoothly/icons.svg deleted: view/theme/smoothly/login-bg.gif deleted: view/theme/smoothly/lrarrow.gif deleted: view/theme/smoothly/menu-user-pin.jpg deleted: view/theme/smoothly/menu-user-pin.png deleted: view/theme/smoothly/nav-bg.png modified: view/theme/smoothly/nav.tpl deleted: view/theme/smoothly/nets.tpl deleted: view/theme/smoothly/next.png deleted: view/theme/smoothly/notifications.png deleted: view/theme/smoothly/photo-menu.jpg deleted: view/theme/smoothly/photo_album.tpl deleted: view/theme/smoothly/photo_top.tpl deleted: view/theme/smoothly/photo_view.tpl deleted: view/theme/smoothly/photography.png deleted: view/theme/smoothly/premium.png deleted: view/theme/smoothly/prev.png deleted: view/theme/smoothly/profile_entry.tpl deleted: view/theme/smoothly/profile_vcard.tpl deleted: view/theme/smoothly/saved_searches_aside.tpl deleted: view/theme/smoothly/screenshot.png deleted: view/theme/smoothly/search.png deleted: view/theme/smoothly/search_item.tpl deleted: view/theme/smoothly/shiny.png deleted: view/theme/smoothly/star.png pixelroot 2012-10-25 12:26:09 +02:00
  • 01221ccb2a Merge pull request #515 from simonlnu/master Simon 2012-10-25 00:03:23 -07:00
  • 00ee068b65 fix for preview post thingy blocking the posting buttons Simon L'nu 2012-10-25 02:59:49 -04:00
  • 1d9633b0cc Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-10-25 02:11:38 -04:00
  • 356329ee63 Friendicaland - remove states no longer flying the Friendica banner. Thomas Willingham 2012-10-25 01:42:25 +01:00
  • fa7157492a deleted: view/theme/smoothly/categories_widget.tpl deleted: view/theme/smoothly/contact_template.tpl deleted: view/theme/smoothly/footer.tpl deleted: view/theme/smoothly/generic_links_widget.tpl deleted: view/theme/smoothly/group_drop.tpl deleted: view/theme/smoothly/group_side.tpl deleted: view/theme/smoothly/header.tpl deleted: view/theme/smoothly/mail_head.tpl deleted: view/theme/smoothly/message_side.tpl deleted: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css pixelroot 2012-10-24 16:41:56 +02:00
  • c92e7a3521 modified: view/theme/smoothly/style.css pixelroot 2012-10-24 14:04:57 +02:00
  • 6d1614e8fa modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/style.css pixelroot 2012-10-24 12:24:12 +02:00
  • cf42b6f78d Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-10-24 05:41:11 -04:00
  • cc59cb2755 modified: view/theme/smoothly/style.css pixelroot 2012-10-24 11:13:12 +02:00
  • fe4e6f05d7 modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-10-24 10:33:39 +02:00
  • a8084fa540 Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break). Thomas Willingham 2012-10-23 20:05:55 +01:00
  • 35a44d8d27 Diabook - first part of clean-up to make the theme maintainable. Thomas Willingham 2012-10-23 19:20:49 +01:00
  • e43097dbc1 modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css pixelroot 2012-10-23 15:47:48 +02:00
  • db5482e609 Merge remote branch 'upstream/master' pixelroot 2012-10-23 14:23:48 +02:00
  • 136175047d modified: view/theme/smoothly/profile_vcard.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php new file: view/theme/smoothly/vcard-widget.tpl pixelroot 2012-10-23 14:23:28 +02:00
  • e757f3cb53 Merge https://github.com/friendica/friendica into pull friendica 2012-10-23 03:29:50 -07:00
  • 89d0b6926c rev update friendica 2012-10-23 03:29:27 -07:00
  • 5f61290811 modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css pixelroot 2012-10-23 10:58:50 +02:00
  • f8787b6762 modified: view/theme/smoothly/default.php modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css new file: view/theme/smoothly/tobottom.png pixelroot 2012-10-23 10:22:39 +02:00
  • 215f084a2e modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-10-23 09:24:19 +02:00
  • 09a36fc05c IT: update to the strings Tobias Diekershoff 2012-10-22 17:54:17 +02:00
  • b157a00c34 DE: update to the strings Tobias Diekershoff 2012-10-22 17:48:30 +02:00
  • e4ab5dd32f new file: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-10-22 16:53:56 +02:00
  • 05bfd3bbf7 DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me. Thomas Willingham 2012-10-22 01:49:35 +01:00
  • 97b4cb7b5e Merge branch 'master' of https://github.com/friendica/friendica Thomas Willingham 2012-10-22 01:24:04 +01:00
  • c03eb332a3 Friendicaland Thomas Willingham 2012-10-22 01:23:16 +01:00
  • c2af58da01 Merge https://github.com/friendica/friendica into pull friendica 2012-10-21 14:44:32 -07:00
  • 02251f23df undefined fn: init_groups_visitor in mod_profile, rev update friendica 2012-10-21 14:41:10 -07:00
  • 1b9438120c Diabook - remove redundant TPL to bring back all admin settings Thomas Willingham 2012-10-21 18:44:23 +01:00
  • 298aeb5bf5 CS: update to the strings Tobias Diekershoff 2012-10-20 12:57:34 +02:00
  • 64a0dc1eed ES: update to the strings Tobias Diekershoff 2012-10-20 12:57:09 +02:00
  • 50cf6c0797 FR: update to the strings Tobias Diekershoff 2012-10-20 12:56:47 +02:00
  • 21ffccbe72 DE: update to the strings Tobias Diekershoff 2012-10-20 12:56:25 +02:00
  • 5016a589fb modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-10-19 11:53:22 +02:00
  • 28b085569a Merge remote branch 'upstream/master' Michael Vogel 2012-10-19 07:12:15 +02:00
  • 2347a4326c get rid of 'Friendika' friendica 2012-10-18 21:51:45 -07:00
  • 6ee4e4a93d Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-10-18 11:30:58 -04:00
  • abba881a02 Merge https://github.com/friendica/friendica into pull friendica 2012-10-17 15:22:54 -07:00
  • f6f3042d00 imagick exception friendica 2012-10-17 15:22:29 -07:00
  • b39d9d3e71 rev update friendica 2012-10-17 15:22:09 -07:00
  • 65d235017c move account. first step. export basic account data as json import basic account data in db (dbs must be at same schema version) Fabrixxm 2012-10-17 11:13:01 -04:00
  • 2940f25df9 Merge pull request #514 from hmeine/master Thomas Willingham 2012-10-16 09:05:50 -07:00
  • ba503b9927 diabook: use proper defaults in popup sidebar config Hans Meine 2012-10-16 13:44:27 +02:00
  • d0775be2e2 diabook boxes: use a common hide/show form entry definition Hans Meine 2012-10-16 13:42:18 +02:00
  • 2d614b6700 remove lots of duplicated code in diabook config handling Hans Meine 2012-10-16 13:33:53 +02:00
  • 2c15bdd99e merge HEAD Simon L'nu 2012-10-15 22:48:25 -04:00
  • 80513e4332 Trying this fix for endless redirection friendica 2012-10-15 18:51:22 -07:00
  • fd6a21f522 oops - missingfile from last checking, the important one friendica 2012-10-15 16:33:00 -07:00
  • a02e5f692e disabling auto_redir until we prevent it from infinite looping friendica 2012-10-15 16:28:43 -07:00
  • 3af16ff92a Merge https://github.com/friendica/friendica into pull friendica 2012-10-14 17:16:41 -07:00
  • dec5298248 rev update friendica 2012-10-14 17:16:25 -07:00
  • 4bf6604d88 Merge pull request #513 from unary/photo-comments friendica 2012-10-14 14:33:10 -07:00
  • 939227e820 Moved comment box on photos to be after the last comment, added text for the Preview link Michael Johnston 2012-10-14 14:30:10 -04:00
  • f5a458d139 DE/FR/PT-BR: update to the strings Tobias Diekershoff 2012-10-13 09:38:47 +02:00
  • a126005877 Merge branch 'master' of https://github.com/friendica/friendica Thomas Willingham 2012-10-12 21:35:32 +01:00
  • a01dd4d9be German help file images Thomas Willingham 2012-10-12 21:34:17 +01:00
  • 022c1e8995 German helpfiles Thomas Willingham 2012-10-12 21:33:21 +01:00
  • ca21f1bbc8 Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts fermionic 2012-10-11 17:24:11 -07:00