harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • e1de2e3de0 don't change ssl settings on local photos for remote contact friendica 2012-04-02 19:38:13 -07:00
  • 06942b3654 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-02 21:55:10 -04:00
  • 9391fc965d bug #363 and a couple of other reported ssl link issues friendica 2012-04-02 17:43:11 -07:00
  • 9cb3fc226a Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-02 16:53:47 -04:00
  • 81dfb61f93 API: template for test function added Michael Vogel 2012-04-02 22:36:05 +02:00
  • 3dc317dcc6 Merge commit 'upstream/master' Michael Vogel 2012-04-02 22:00:22 +02:00
  • 6dfd55668f diabook-themes: css-fixes tommy tomson 2012-04-02 20:30:27 +02:00
  • 076b1b374b diabook-themes: fixes in js tommy tomson 2012-04-02 18:16:58 +02:00
  • b5d57d5313 diabook-themes: fixed pageheader tommy tomson 2012-04-02 17:17:14 +02:00
  • 9faa940f04 diabook-themes: bugfixes / css-fixes tommy tomson 2012-04-02 15:06:55 +02:00
  • 2352e6c1cb make the "new calendar" (javascript interactive) the default friendica 2012-04-02 01:46:35 -07:00
  • 62e528ba43 remove zrl from query string friendica 2012-04-02 00:45:45 -07:00
  • 7127626f55 Merge remote branch 'upstream/master' zottel 2012-04-02 08:52:24 +02:00
  • 1f74bd1b78 catch a couple more Oo smilies friendica 2012-04-01 22:57:50 -07:00
  • 7df6ab9a87 add page_content_top hook friendica 2012-04-01 22:22:26 -07:00
  • 5eca42975c Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-01 23:56:13 -04:00
  • 5d35f0d54a add title to D* posts friendica 2012-04-01 19:16:13 -07:00
  • 07cfdba9c3 Merge pull request #200 from unary/categories friendica 2012-04-01 19:03:20 -07:00
  • 581b54c974 allow users to set categories on their posts Michael Johnston 2012-04-01 21:28:31 -04:00
  • 06e9a8b7a0 Merge pull request #199 from beardy-unixer/1457d6e90f36a6a7bb07df3579b6e5c0475b121d friendica 2012-04-01 17:53:59 -07:00
  • c4f4715a54 Merge remote-tracking branch 'upstream/master' Thomas Willingham 2012-04-02 01:27:23 +01:00
  • 1457d6e90f Modified peopleyouknow to handle sites without Facebook better Thomas Willingham 2012-04-02 01:26:45 +01:00
  • 845b123b47 Merge pull request #198 from beardy-unixer/master friendica 2012-04-01 16:49:19 -07:00
  • 210586eaed Merge remote-tracking branch 'upstream/master' Thomas Willingham 2012-04-02 00:29:27 +01:00
  • 23dc376364 diabook-themes: add link to global dir in "find friends" at right_aside tommy tomson 2012-04-02 01:29:20 +02:00
  • 8406803473 modified: mod/newmember.php Thomas Willingham 2012-04-02 00:27:47 +01:00
  • 8c9c561f6c New user quick start. Thomas Willingham 2012-04-02 00:23:58 +01:00
  • f95db4382e check for style.php existence before inclusion friendica 2012-04-01 16:21:55 -07:00
  • d0ddd380e7 Moved Diaspora notes away from top, per user request Thomas Willingham 2012-04-02 00:18:03 +01:00
  • 9472ba8d20 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-01 18:59:53 -04:00
  • 2589feef70 Merge branch 'pull' friendica 2012-04-01 15:44:27 -07:00
  • 00bbb9ad36 slight improvement in handling of plaintext feeds friendica 2012-04-01 15:43:57 -07:00
  • a39d8d3f02 The "vier"-theme is now working again. But there is still work needed Michael Vogel 2012-04-02 00:08:49 +02:00
  • 408de09f72 css-fixes tommy tomson 2012-04-02 00:05:49 +02:00
  • 5409825fe7 New script that checks if a script is running Michael Vogel 2012-04-01 20:56:27 +02:00
  • 4cf1e5aa21 poller: An optional lockfile is used to check if the poller is already running Michael Vogel 2012-04-01 20:52:33 +02:00
  • 31d04d685e Merge pull request #197 from tomtom84/master tomtom84 2012-04-01 09:13:35 -07:00
  • f075e977fe add new messages-layout in diabook tommy tomson 2012-04-01 18:12:20 +02:00
  • 6c302e78da Merge pull request #196 from tomtom84/master tomtom84 2012-04-01 07:35:47 -07:00
  • ff12637ceb fix the display of community-plugin in diabook-themes tommy tomson 2012-04-01 16:34:31 +02:00
  • 9b4bef8ac4 that didn't quite work out friendica 2012-04-01 06:46:12 -07:00
  • 7d23149a61 Merge commit 'upstream/master' Michael Vogel 2012-04-01 14:11:37 +02:00
  • bb67ca9f1c Merge branch 'pull' friendica 2012-04-01 04:13:58 -07:00
  • d1783bba17 Merge pull request #195 from tomtom84/master tomtom84 2012-04-01 04:13:48 -07:00
  • 63ea378d92 document tinymce fixes/workarounds friendica 2012-04-01 04:13:27 -07:00
  • 15ba0ef5d0 various bugfixes and css-fixes tommy tomson 2012-04-01 13:12:15 +02:00
  • bc283f7c5d qcomment overflow friendica 2012-04-01 03:37:41 -07:00
  • f0b8d01615 try slightly better detection of html in feeds friendica 2012-04-01 03:19:37 -07:00
  • ae5e5bf1e4 Merge branch 'pull' friendica 2012-04-01 01:03:05 -07:00
  • 5c2fdc795f send unverified private mail using zrl friendica 2012-04-01 00:59:35 -07:00
  • 4bf2a7bf50 Merge pull request #194 from simonlnu/master Simon 2012-04-01 00:58:08 -07:00
  • db7f7e4237 latest fixes for dispys. tweaking/repairing Simon L'nu 2012-04-01 03:57:05 -04:00
  • bbd86382a6 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-04-01 03:54:58 -04:00
  • e97d90820d line 86: s/Friendika/Friendica/ Simon 2012-04-01 04:52:45 -03:00
  • ea10bba147 fix "between yourself and You" in mail list friendica 2012-03-31 20:08:32 -07:00
  • ed8c5954a9 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-31 22:46:13 -04:00
  • e6fd6bfd89 more error handling friendica 2012-03-31 17:44:34 -07:00
  • 2147e0a71f ensure all new users get a timezone. We'll use UTC until they choose otherwise. friendica 2012-03-31 16:08:40 -07:00
  • 53f799f2bc handle escaped file chars in display and search friendica 2012-03-31 15:25:17 -07:00
  • 7581b32bb3 Merge branch 'pull' friendica 2012-03-31 14:50:14 -07:00
  • 0cf2e051bb escape % in file_tag_query as it is ultimately embedded in a sprintf friendica 2012-03-31 14:48:35 -07:00
  • 05ad28fb9b Merge pull request #193 from tomtom84/master tomtom84 2012-03-31 09:44:12 -07:00
  • 36545e554b diabook-themes: move "common tabs" to left side on settings page tommy tomson 2012-03-31 18:42:11 +02:00
  • 19a7096be6 Merge pull request #192 from tomtom84/master tomtom84 2012-03-31 08:00:45 -07:00
  • 13ded12ffb move the common tabs to right_aside in diabook-derivates tommy tomson 2012-03-31 16:58:02 +02:00
  • 59b45f7fc1 Several improvements Michael Vogel 2012-03-31 16:28:39 +02:00
  • adebc2793e register hooks for a COPA plugin friendica 2012-03-31 06:15:33 -07:00
  • c34a71eba6 some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus friendica 2012-03-31 05:51:56 -07:00
  • d5a31e5791 Merge branch 'pull' friendica 2012-03-31 04:40:35 -07:00
  • 893ece9066 bug fix in diabook-aerith and -red tommy tomson 2012-03-31 11:50:33 +02:00
  • ee9a3eb163 Merge pull request #191 from tomtom84/master tomtom84 2012-03-31 02:11:30 -07:00
  • 0b41654935 bug-fixes in diabook-derivates tommy tomson 2012-03-31 11:09:57 +02:00
  • 6b086cd266 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-31 04:05:19 -04:00
  • 3d2bcaa5fc Merge pull request #190 from simonlnu/master Simon 2012-03-31 01:03:39 -07:00
  • f5e3ec9a56 forgot the css changes for last push Simon L'nu 2012-03-31 04:02:51 -04:00
  • b4b1055b50 settings for unknown private mail acceptance friendica 2012-03-31 00:57:59 -07:00
  • ee95c12a24 Merge pull request #189 from simonlnu/master Simon 2012-03-31 00:57:26 -07:00
  • b88a452c6b theme fixes; fix qcomment (finally) Simon L'nu 2012-03-31 03:56:06 -04:00
  • e940acf8c6 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-31 03:42:19 -04:00
  • 8c928e67ba warning cleanup friendica 2012-03-30 23:18:46 -07:00
  • 301527e5a2 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-30 19:48:15 -04:00
  • f39e812677 Merge remote branch 'upstream/master' zottel 2012-03-31 00:30:34 +02:00
  • aace55df0a Merge branch 'pull' friendica 2012-03-30 15:12:20 -07:00
  • cfdfcb37cb don't delete contact from a friend request if friendship was already established friendica 2012-03-30 15:10:50 -07:00
  • 007d67a998 Merge pull request #188 from fabrixxm/master friendica 2012-03-30 14:58:44 -07:00
  • be2005f146 quattro: move quattro-green inside quattro folder. Add config option to select quattro color scheme. Fabio Comuni 2012-03-30 21:21:14 +02:00
  • 01af7d355a allow themes to use "style.php" instead of "style.css". Load style.php trhu mod/view.php to pass it friendica framework. Fabio Comuni 2012-03-30 21:18:25 +02:00
  • 77f57e1b13 Merge remote-tracking branch 'friendica/master' Fabio Comuni 2012-03-30 19:37:43 +02:00
  • f50fb7d6ca css-fixes in diabook-derivates tommy tomson 2012-03-30 17:52:29 +02:00
  • 24e7a3413c quattro-green: remove settings code Use config.php from quattro Fabio Comuni 2012-03-30 15:46:14 +02:00
  • db59a45030 quattro: add config.php Fabio Comuni 2012-03-30 15:45:23 +02:00
  • 054d21a2e8 settings: add "display settings" tab, with UI-related settings. Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property. Fabio Comuni 2012-03-30 15:45:02 +02:00
  • 6d3d882f9b css-fixes in diabook-derivates tommy tomson 2012-03-30 16:33:34 +02:00
  • 17c908973f catch OpenID login errors in cases when the OpenID server does not answers Tobias Diekershoff 2012-03-30 15:19:17 +02:00
  • 5b4bb347a6 css-fixes in diabook-derivates tommy tomson 2012-03-30 14:38:21 +02:00
  • 8685a91742 quattro-green: added Description to the theme.php Tobias Diekershoff 2012-03-30 14:24:45 +02:00
  • c5cb208cb8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-30 08:17:40 -04:00
  • b5e292509e quattro-green: adopted quattro option for centered display Tobias Diekershoff 2012-03-30 14:03:33 +02:00
  • e36b1ed3d7 Merge branch 'pull' friendica 2012-03-30 04:53:49 -07:00
  • 32b346f5f1 string update friendica 2012-03-30 04:53:00 -07:00