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

Commit Graph

  • 8207272fbc Merge branch 'pull' friendica 2012-03-01 18:54:50 -08:00
  • 58e3372b23 probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type friendica 2012-03-01 18:49:23 -08:00
  • a5256b7996 Merge pull request #54 from campino/master friendica 2012-03-01 17:54:41 -08:00
  • 5183e737d0 diabook commit tommy tomson 2012-03-02 02:05:35 +01:00
  • dd9432903d Merge remote-tracking branch 'upstream/master' Alexander Kampmann 2012-03-01 11:49:22 +01:00
  • b6b7742579 Merge remote-tracking branch 'friendica/master' into randomerror Fabio Comuni 2012-03-01 11:47:45 +01:00
  • ed42fa7d59 conversation: remove templating items in code and move it to template. Fabio Comuni 2012-03-01 11:46:08 +01:00
  • e0c659b34b Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them Alexander Kampmann 2012-03-01 11:44:33 +01:00
  • c462ed9fc5 template proc: avoid a notice and allow template name to include to be passed with a variable value Fabio Comuni 2012-03-01 11:32:49 +01:00
  • a26ce7c56b show relation in contact_template Fabio Comuni 2012-03-01 11:31:16 +01:00
  • f0b6e76293 admin: fix small string Fabio Comuni 2012-03-01 11:28:48 +01:00
  • b7ab2a2fc9 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-02-29 23:26:49 -05:00
  • bd2c8c92f1 yet more work on notifications friendica 2012-02-29 19:23:01 -08:00
  • bbebb4c2a0 notification enhancements friendica 2012-02-29 18:19:08 -08:00
  • 84d5f495e6 better handling of multiple notifications for same item, and old notifications friendica 2012-02-29 16:26:07 -08:00
  • b71a3af457 Merge remote-tracking branch 'friendica/master' into randomerror Fabio Comuni 2012-02-29 14:58:37 +01:00
  • 6855474146 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-02-29 06:56:59 -05:00
  • fb33b4f2bc Update LICENSE friendica 2012-02-29 21:09:20 +11:00
  • aedb7c5f69 Update README friendica 2012-02-29 21:07:33 +11:00
  • 60ae0d8974 cleaned up mess created when both people request friendship and one approves as duplex friendica 2012-02-28 17:32:44 -08:00
  • 21803e0cd3 call time pass by reference deprecated friendica 2012-02-28 14:54:17 -08:00
  • f40ef1bf46 Merge branch 'pull' friendica 2012-02-28 14:53:41 -08:00
  • 4dd4a22582 From Tobias H - catch some irregularities caused by cut/paste code friendica 2012-02-28 14:52:23 -08:00
  • 5bb8ed4b8b Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php Tobias Hößl 2012-02-28 21:56:42 +00:00
  • 21d1dc48a8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-02-28 16:43:08 -05:00
  • 3d249f0edd Merge remote branch 'upstream/master' Tobias Hößl 2012-02-28 21:19:02 +00:00
  • 733f830be4 fix url and network display fabrixxm 2012-02-28 19:10:27 +01:00
  • 36a1a43f06 Avoid notices Tobias Hößl 2012-02-28 13:42:12 +00:00
  • f48556cbc0 contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used Tobias Hößl 2012-02-28 13:40:41 +00:00
  • 1204210c69 wasn't actually changed before Tobias Hößl 2012-02-28 13:01:58 +00:00
  • e55d13c2b4 Avoid a notice Tobias Hößl 2012-02-28 12:56:16 +00:00
  • 718c5ea23e Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-02-28 05:25:05 -05:00
  • 53412dacd4 update globaldir when page-type changes, add spam date field friendica 2012-02-27 23:27:16 -08:00
  • 2b730ae86d clicking contact on contacts page broken link friendica 2012-02-27 18:46:11 -08:00
  • cf7e141055 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-02-27 21:08:19 -05:00
  • 6c0fa7a166 Merge branch 'pull' friendica 2012-02-27 17:18:53 -08:00
  • d7407f8daa cleanup notify subject lines friendica 2012-02-27 17:18:19 -08:00
  • b84ef3039c Merge remote branch 'upstream/master' Michael 2012-02-28 00:03:49 +01:00
  • 7c30fca981 Avoid a Notice Tobias Hößl 2012-02-27 22:17:57 +00:00
  • e33c2b8f89 Avoid a Notice Tobias Hößl 2012-02-27 22:08:00 +00:00
  • 35128ef2c9 Avoid a Notice Tobias Hößl 2012-02-27 22:01:17 +00:00
  • 8c2bda46f7 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-02-27 13:34:19 -05:00
  • e11b51aca1 Merge pull request #53 from fabrixxm/master fabrixxm 2012-02-27 10:05:27 -08:00
  • 42d591d257 revert 01a2791e3a to avoid random preg internal errors. fix contact_template Fabio Comuni 2012-02-27 18:48:59 +01:00
  • cce69f0509 Merge remote branch 'upstream/master' Michael 2012-02-27 16:31:58 +01:00
  • b1cdc5a932 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-02-27 09:08:48 -05:00
  • a33031634e Merge pull request #52 from campino/master Simon 2012-02-27 06:07:46 -08:00
  • 9986fc1910 fixed syntax errors Alexander Kampmann 2012-02-27 14:12:44 +01:00
  • 153e7beb19 add plugin hooks to enotify friendica 2012-02-26 23:54:04 -08:00
  • 6e76d9d3a3 Merge pull request #51 from simonlnu/master Simon 2012-02-26 22:20:46 -08:00
  • 72e78046af minor typographical fixes. need to do something about the http on https sites for html5shiv. changed to https on mine Simon L'nu 2012-02-27 01:04:41 -05:00
  • 36d173ca98 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-02-27 00:56:41 -05:00
  • fc036210fb spam db friendica 2012-02-26 18:53:48 -08:00
  • 6bc48b29cc fix tag icon size friendica 2012-02-26 16:40:21 -08:00
  • e994b990eb typo in css friendica 2012-02-26 16:31:51 -08:00
  • a1861d1128 tagging missing from wallwall and a couple of themes, star missing from dispy friendica 2012-02-26 16:29:06 -08:00
  • 89560edde2 Merge pull request #50 from annando/master friendica 2012-02-26 15:07:34 -08:00
  • 18679111f5 Merge remote branch 'upstream/master' Michael 2012-02-27 00:03:51 +01:00
  • 6ddd444afd Merge pull request #49 from CatoTH/master friendica 2012-02-26 14:49:56 -08:00
  • fe3dfbee56 Mail: New options for actions after importing mails. Michael 2012-02-26 23:39:29 +01:00
  • b79380f906 Merge branch 'pull' friendica 2012-02-26 14:34:58 -08:00
  • bdb14d5aad relative link redirects friendica 2012-02-26 14:34:01 -08:00
  • 437e18d7a7 Merge remote branch 'upstream/master' Michael 2012-02-26 21:47:47 +01:00
  • 4b1de0f538 Avoid some notices Tobias Hößl 2012-02-26 20:43:51 +00:00
  • ac86407fdf Bugfix Tobias Hößl 2012-02-26 20:43:35 +00:00
  • b102a1d5ec is not always defined; but if defined, then always of type integer Tobias Hößl 2012-02-26 20:43:23 +00:00
  • cbc6ca642a 1 Bugfix (missing $ character) and avoid some notices Tobias Hößl 2012-02-26 20:41:41 +00:00
  • 792abc3a24 necessare fields not loaded from DB Tobias Hößl 2012-02-26 20:40:41 +00:00
  • fd9c12128a should probably be a->user['hidewall'] instead of profile['hidewall'] Tobias Hößl 2012-02-26 20:39:37 +00:00
  • edc44933a4 "Vier-Theme" Some more design stuff. Michael 2012-02-26 21:16:29 +01:00
  • 2081e6d507 some revision to the German strings Tobias Diekershoff 2012-02-26 17:12:14 +01:00
  • 0877fbb42a German strings Tobias Diekershoff 2012-02-26 15:41:27 +01:00
  • aa92901b11 Wrong variable name root 2012-02-26 14:29:17 +00:00
  • 5f7858a688 show experimental and unsupported theme status on theme admin page friendica 2012-02-26 04:17:02 -08:00
  • fb8675f349 jumping divs with no scrolling friendica 2012-02-26 01:20:43 -08:00
  • 484426d3e2 imrpove contrast on darkzero blockquotes friendica 2012-02-26 00:53:31 -08:00
  • 828034ad23 darkzero-NS theme friendica 2012-02-26 00:48:11 -08:00
  • 896f97b31a Merge pull request #48 from abinoam/thmail-5 Simon 2012-02-25 18:01:09 -08:00
  • 9b6afc2a38 one more attempt friendica 2012-02-25 17:07:38 -08:00
  • 35b5850af7 missed a spot friendica 2012-02-25 17:04:31 -08:00
  • f3a225437b Comment notifications by e-mail now are threaded Abinoam P. Marques Jr 2012-02-25 16:56:14 -08:00
  • bcfac6c72f include/items.php pass 'parent' to notification Abinoam P. Marques Jr 2012-02-25 13:23:00 -08:00
  • 2d5f8b4b48 mod/item.php pass 'parent' to notification Abinoam P. Marques Jr 2012-02-25 13:10:33 -08:00
  • da52792d06 DB_UPDATE_VERSION incremented Abinoam P. Marques Jr 2012-02-25 13:06:50 -08:00
  • edcc33ab5c Added notify-threads to update.php Abinoam P. Marques Jr 2012-02-25 13:06:06 -08:00
  • 3d37a688c7 Added notify-threads to database.sql. Abinoam P. Marques Jr 2012-02-25 12:33:08 -08:00
  • d075fd8a40 reverse order of links friendica 2012-02-25 16:47:21 -08:00
  • da1411af47 do not set notify popup empty anymore (though another solution is needed for firehose mode) friendica 2012-02-25 16:16:52 -08:00
  • 2c7da5d0de scale external images friendica 2012-02-25 14:22:51 -08:00
  • 579738aff7 fixed link for toggling plugin from detail page friendica 2012-02-25 13:00:44 -08:00
  • 1cf1870512 poller.php: Test for moving to archive, vier-style: notifications fixed Michael 2012-02-25 19:40:05 +01:00
  • 00edc89c47 notify positioning, theming friendica 2012-02-25 05:00:48 -08:00
  • c90bac5727 sysnotify count in wrong location, and wrong number friendica 2012-02-25 04:37:12 -08:00
  • 4839c235da theme seen,unseen notifications friendica 2012-02-25 03:28:07 -08:00
  • 3c68bf25ac "vier" popup menu looks nicer now (more like quattro again) Michael 2012-02-25 11:13:04 +01:00
  • dccefb3c36 "vier": The contacts are now working again. Line break before closing bbcodes removed. Michael 2012-02-25 11:00:35 +01:00
  • aa67771eaa photos in notifications friendica 2012-02-25 00:42:25 -08:00
  • 18bf5d1402 theme info (like plugin info) friendica 2012-02-25 00:30:14 -08:00
  • 6092567c97 notifications to zeros, bug in notify link friendica 2012-02-24 23:44:55 -08:00
  • 9441ff5142 string update for 2.38 friendica 2012-02-24 22:47:43 -08:00