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

Commit Graph

  • 2d834d0f45 add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css tommy tomson 2012-03-26 18:54:57 +02:00
  • f1d15d8884 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2012-03-26 14:49:15 +02:00
  • 37f10a6d4f marking quattro-green as extension of quattro and deleting the tpl files Tobias Diekershoff 2012-03-26 14:48:01 +02:00
  • aaddee0d94 minor css fixes in diabook tommy tomson 2012-03-26 13:52:44 +02:00
  • 0164da4fb9 screenshot for darkzero-NS, same as darkzero friendica 2012-03-26 04:25:20 -07:00
  • 8ded404aaa added quaddro templates to quaddro-green Tobias Diekershoff 2012-03-26 11:28:38 +02:00
  • 63fa5f6c77 Merge pull request #172 from fabrixxm/master friendica 2012-03-26 02:00:14 -07:00
  • 3431d0b427 Merge branch 'pull' friendica 2012-03-26 01:43:48 -07:00
  • b240b8489a language issues in enotify friendica 2012-03-26 01:43:26 -07:00
  • 876aa0c752 small fix in diabook :: add local friendica to right_aside tommy tomson 2012-03-26 10:33:28 +02:00
  • ca31aed490 Merge branch 'pull' friendica 2012-03-26 00:53:32 -07:00
  • 2820dba1e7 comix screenshot friendica 2012-03-26 00:52:54 -07:00
  • 579c4f3079 diabook: small fix in theme_info array Fabio Comuni 2012-03-26 09:48:38 +02:00
  • 109e8d4f05 more theme screenshots friendica 2012-03-26 00:47:52 -07:00
  • 4b83b9bee6 Merge pull request #171 from simonlnu/master Simon 2012-03-26 00:41:22 -07:00
  • 0c4aba4b57 [fix] contact_edit.tpl syntax; reduce cols to fit better Simon L'nu 2012-03-26 03:39:06 -04:00
  • 7fad65d7af Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-26 03:38:19 -04:00
  • c4c69959e2 add screenshots to diabook tommy tomson 2012-03-26 09:37:14 +02:00
  • 51d419e159 themes: use duepuntozero tpls as default Fabio Comuni 2012-03-26 09:09:14 +02:00
  • 5b3fe48ec6 Merge pull request #170 from simonlnu/master Simon 2012-03-26 00:02:51 -07:00
  • 7de8e15ca4 fix the search box Simon L'nu 2012-03-26 03:01:13 -04:00
  • 629a66793c Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-26 02:51:40 -04:00
  • 37f02424f8 small fix tommy tomson 2012-03-26 07:02:27 +02:00
  • 021c647673 don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin. friendica 2012-03-25 21:43:17 -07:00
  • ba28362242 position the theme-preview on settings page friendica 2012-03-25 21:12:10 -07:00
  • 1e2e6f5ba9 more wordsmithing of the Friendica invitation email friendica 2012-03-25 20:52:34 -07:00
  • a06185e87c screenshot gallery friendica 2012-03-25 20:08:28 -07:00
  • be52ec6f5a Merge branch 'pull' friendica 2012-03-25 19:48:17 -07:00
  • 2147ffa487 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-25 22:47:56 -04:00
  • 7873347c65 Merge pull request #167 from unary/typo Simon 2012-03-25 19:47:39 -07:00
  • 8ac59d81f3 Merge pull request #169 from simonlnu/master Simon 2012-03-25 19:46:59 -07:00
  • 3d11c22b01 add in the search box Simon L'nu 2012-03-25 22:45:44 -04:00
  • 758e1b7424 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-25 22:40:24 -04:00
  • c88674aaf2 theme preview for end users friendica 2012-03-25 19:05:14 -07:00
  • 7ab117fd31 Merge branch 'pull' friendica 2012-03-25 18:19:58 -07:00
  • 7ef1ed2d70 theme screenshots friendica 2012-03-25 17:55:43 -07:00
  • 3d62cb9782 minor fix to dispy theme.php Simon L'nu 2012-03-25 17:13:24 -04:00
  • 739d903870 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-25 17:07:43 -04:00
  • e6b07d61cf Merge pull request #168 from simonlnu/master Simon 2012-03-25 14:07:33 -07:00
  • aa33815d3c urgent fix to dispy-dark theme.php Simon L'nu 2012-03-25 17:06:38 -04:00
  • 38b30c1d10 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-25 17:06:17 -04:00
  • ca1e2254c9 typo datarry -> datarray Michael Johnston 2012-03-25 16:00:11 -04:00
  • baeb735315 small fixes tommy tomson 2012-03-25 19:43:42 +02:00
  • 873a55e918 enotify plugin hook friendica 2012-03-25 05:06:11 -07:00
  • 5bb7303408 NOTIFY_SYSTEM friendica 2012-03-25 04:37:09 -07:00
  • 2e797a6243 Merge pull request #166 from simonlnu/master Simon 2012-03-25 00:32:55 -07:00
  • 2c43120129 dispy-dark not experimental. start implementing fpostit Simon L'nu 2012-03-25 03:22:16 -04:00
  • 84686a2698 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-25 03:18:21 -04:00
  • 1b8ac30fae Merge pull request #165 from tomtom84/master tomtom84 2012-03-24 23:50:05 -07:00
  • 329a26d62e move community_pages to right_aside, fixes in css tommy tomson 2012-03-25 08:47:17 +02:00
  • ea29a26059 Merge branch 'pull' friendica 2012-03-24 23:05:33 -07:00
  • 6780b76b0c improved the inivitations and added a bit of sales pitch. friendica 2012-03-24 23:04:18 -07:00
  • 1d56224b08 increase version to 1.0 for dispys \o/ Simon L'nu 2012-03-25 01:12:28 -04:00
  • f0b08290fc Merge pull request #164 from simonlnu/master Simon 2012-03-24 22:04:23 -07:00
  • 8fe77e5b86 implement filer/file-as Simon L'nu 2012-03-25 01:01:59 -04:00
  • 5bd4f62210 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-25 00:59:25 -04:00
  • f1cb287742 bug #329 - compress the plugin list on the friendica info page friendica 2012-03-24 21:50:04 -07:00
  • d06ddeb1cc bug #346 - add oembed maxwidth to oembed request friendica 2012-03-24 21:26:50 -07:00
  • 8a6c407282 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-24 19:38:54 -04:00
  • 3ae43c2448 prevent duplicate friend suggestions friendica 2012-03-24 15:53:53 -07:00
  • 3aacc119a1 block filed items from deletion friendica 2012-03-24 04:16:27 -07:00
  • 8c4fbc3b4d add the bang friendica 2012-03-24 03:11:45 -07:00
  • 72c2386edf Merge branch 'pull' friendica 2012-03-24 02:32:15 -07:00
  • db5ec58863 network filter is now a permission group friendica 2012-03-24 01:33:50 -07:00
  • 8451b22d42 small fix in css tommy tomson 2012-03-24 08:56:26 +01:00
  • b23ad806ec Merge pull request #163 from tomtom84/master tomtom84 2012-03-24 00:15:31 -07:00
  • ba027f174d add right_aside to diabook-blue tommy tomson 2012-03-24 08:13:48 +01:00
  • 64397ff09f Merge pull request #162 from tomtom84/master tomtom84 2012-03-23 22:20:25 -07:00
  • 378762fed2 add connectable services to right_aside tommy tomson 2012-03-24 06:17:14 +01:00
  • ef27af623e Merge pull request #161 from tomtom84/master tomtom84 2012-03-23 20:06:48 -07:00
  • d76b052f90 add PostIt to right_aside, fixes in css tommy tomson 2012-03-24 04:05:21 +01:00
  • fabd4f4d2e Merge remote branch 'upstream/master' zottel 2012-03-24 01:31:05 +01:00
  • 803f79e091 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-03-23 10:41:55 -04:00
  • ce8cfb7b05 Merge pull request #160 from fabrixxm/master tomtom84 2012-03-23 07:41:32 -07:00
  • 1780fff161 diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links) Fabio Comuni 2012-03-23 14:09:06 +01:00
  • 14f81eca00 Merge remote branch 'upstream/master' zottel 2012-03-23 13:29:02 +01:00
  • 82cc86a41a user settings: don't show emoticons Fabio Comuni 2012-03-23 12:07:22 +01:00
  • 6f79cde024 Merge remote-tracking branch 'friendica/master' Fabio Comuni 2012-03-23 10:45:10 +01:00
  • c35b9ec24f fix in css right_aside tommy tomson 2012-03-23 10:16:11 +01:00
  • 5fadf68fb4 Merge remote branch 'upstream/master' zottel 2012-03-23 08:39:00 +01:00
  • 7706a8f9d8 small fix tommy tomson 2012-03-23 07:28:48 +01:00
  • 149b3f3018 Merge pull request #159 from tomtom84/master tomtom84 2012-03-22 23:03:55 -07:00
  • 687fa80094 fix 1024resolution tommy tomson 2012-03-23 07:02:21 +01:00
  • 42d231f8bf Merge pull request #158 from tomtom84/master friendica 2012-03-22 20:19:44 -07:00
  • bf4dd8ad17 add right_aside to theme diabook tommy tomson 2012-03-23 02:36:34 +01:00
  • 528d795fb6 ability to change tags in edited posts friendica 2012-03-22 16:17:10 -07:00
  • e7d80a79ff Merge remote branch 'upstream/master' zottel 2012-03-22 16:03:14 +01:00
  • d5a6e7b176 Merge remote-tracking branch 'friendica/master' Fabio Comuni 2012-03-22 14:56:23 +01:00
  • 622b25df5f Merge branch 'pull' friendica 2012-03-22 06:20:32 -07:00
  • 40d19d5b8c normalise comparison link on delegation page friendica 2012-03-22 06:19:27 -07:00
  • 586c07681b Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2012-03-22 14:10:53 +01:00
  • 07c5b0af5a quattro(-green) styling the 'filed under: remove' text Tobias Diekershoff 2012-03-22 14:09:21 +01:00
  • c7dcc58673 Merge pull request #157 from campino/master friendica 2012-03-22 05:49:08 -07:00
  • 1e86e3fb26 it's only item.filer ;-) Tobias Diekershoff 2012-03-22 13:46:05 +01:00
  • 5babf5c8b4 Merge branch 'quattrofiler' Tobias Diekershoff 2012-03-22 13:42:10 +01:00
  • 6df7fae4b5 non static filer text Tobias Diekershoff 2012-03-22 13:41:41 +01:00
  • 19eaed60d5 Merge branch 'master' of https://github.com/friendica/friendica Tobias Diekershoff 2012-03-22 13:38:59 +01:00
  • 9ba5fff865 new lines removed Alexander Kampmann 2012-03-22 13:05:34 +01:00
  • 43f672877f removed some new lines to cut down number of changed files Alexander Kampmann 2012-03-22 13:03:28 +01:00
  • ad9d0dadb3 removed unneccessary stuff Alexander Kampmann 2012-03-22 12:52:24 +01:00