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

Commit Graph

  • f84aaaea4d Merge pull request #1983 from annando/1510-ejabberd-auth Tobias Diekershoff 2015-10-25 16:51:36 +01:00
  • bac61cf596 manage-selector: some cleanup and css work rabuzarus 2015-10-25 16:49:45 +01:00
  • 78a8db55c6 Merge pull request #1981 from rabuzarus/poke Michael Vogel 2015-10-25 14:59:39 +01:00
  • 5b93bff6da poke template: make use of global.css rabuzarus 2015-10-25 14:40:56 +01:00
  • e0e6762ed8 some inital work to have profile pics on manage page rabuzarus 2015-10-25 14:00:08 +01:00
  • c7205ea705 Bugfix: Authorization at ejabberd only worked for uid=1 Michael Vogel 2015-10-25 10:17:23 +01:00
  • 65403973c1 Merge pull request #1977 from rabuzarus/crepair Michael Vogel 2015-10-25 09:44:12 +01:00
  • 4dd2a748b9 Merge pull request #1976 from rabuzarus/tabs-id Michael Vogel 2015-10-25 09:42:48 +01:00
  • 4631c13d08 Profile data are now reduced to only the most important fields Michael Vogel 2015-10-25 09:15:36 +01:00
  • a11833e248 Statusnet is now GNU Social Michael Vogel 2015-10-24 20:44:18 +02:00
  • ecf65e52ee OStatus: send the coordinates in an additional field Michael Vogel 2015-10-24 20:42:47 +02:00
  • ddc8f069f2 Workaround for bad configured servers Michael Vogel 2015-10-24 20:41:21 +02:00
  • 8f92b6eea4 some work on poke template rabuzarus 2015-10-24 19:51:58 +02:00
  • eb33698556 some minor changes in crepair.tpl rabuzarus 2015-10-24 16:01:55 +02:00
  • ea2b3b2f76 move html from crepair.php to template rabuzarus 2015-10-24 15:57:46 +02:00
  • 87ecd8f658 tabs have now an ID rabuzarus 2015-10-24 15:04:27 +02:00
  • 442d59abc4 template rework: multi-row view for the other themes rabuzarus 2015-10-23 21:45:16 +02:00
  • 86f94570ef template rework: delete unused templates rabuzarus 2015-10-23 16:49:12 +02:00
  • eaf5d05030 template rework: display more infos for match and dirfind rabuzarus 2015-10-23 16:48:32 +02:00
  • b6cceda131 template rework: revert commit because plugin community home uses the css classes rabuzarus 2015-10-23 15:41:49 +02:00
  • 7c9df68964 template rework: revert #b2bb600 for vier (is needed for right sidebar) rabuzarus 2015-10-23 15:23:00 +02:00
  • fad8ebc355 template rework: two row contact page for vier rabuzarus 2015-10-23 15:18:05 +02:00
  • efb12aed20 template rework: little theme specific changes (frost, quattro) rabuzarus 2015-10-23 01:32:03 +02:00
  • b2bb600f3a template rework: delete unused css rabuzarus 2015-10-23 01:04:47 +02:00
  • 0c3979720f template rework: rearrange sidebar widgets for contact related pages rabuzarus 2015-10-23 00:12:00 +02:00
  • 2aad62190f template rework: use viewcontact_template.tpl also for directory rabuzarus 2015-10-22 22:48:49 +02:00
  • 64a5b33e77 Merge pull request #1973 from annando/1510-ejabberd-auth Tobias Diekershoff 2015-10-20 07:11:47 +02:00
  • 891ad5b39d Support for additional passwords for ejabberd Michael Vogel 2015-10-19 19:03:11 +02:00
  • 59559e7452 Merge pull request #1971 from tobiasd/20151019-docs Michael Vogel 2015-10-19 10:10:24 +02:00
  • c652aec970 Updates to the documentations Tobias Diekershoff 2015-10-19 07:58:13 +02:00
  • f9c0c1d696 template rework: use viewcontact_template.tpl for contact dealing pages rabuzarus 2015-10-18 17:12:48 +02:00
  • 5317c0b28f Merge pull request #1968 from annando/1510-directory-configuration Tobias Diekershoff 2015-10-18 16:08:48 +02:00
  • 4c1c614fa6 Merge viewcontact into template_rework rabuzarus 2015-10-17 22:28:09 +02:00
  • 452a3011f7 Merge suggest into template_rework rabuzarus 2015-10-17 22:22:52 +02:00
  • dbf1f9efcd Merge dirfind into template_rework rabuzarus 2015-10-17 22:22:35 +02:00
  • e55f9f8f07 Merge dir into template_rework rabuzarus 2015-10-17 22:22:20 +02:00
  • 4b8ca578d1 dirfind: move pagination into template rabuzarus 2015-10-17 22:09:19 +02:00
  • b9d9bf8ecd directory: move pagination into template rabuzarus 2015-10-17 21:45:55 +02:00
  • 6d559bf8a9 viewcontact: use section_title.tpl as headding rabuzarus 2015-10-17 21:40:41 +02:00
  • 9176e739a4 sugest.php: themeable as whole page rabuzarus 2015-10-17 21:25:21 +02:00
  • 72896b0f6b unify directory page rabuzarus 2015-10-17 19:45:57 +02:00
  • b75a3c8943 Automatically set the new configuration for the global directory when updating. Michael Vogel 2015-10-17 15:26:11 +02:00
  • ddaacc1e53 Merge pull request #1965 from rabuzarus/event-attendance Tobias Diekershoff 2015-10-17 12:51:19 +02:00
  • d640128dc9 Merge pull request #1966 from annando/1510-event-guid Tobias Diekershoff 2015-10-17 12:51:09 +02:00
  • 8a79e1afb3 The datepicker is now localised Michael Vogel 2015-10-17 10:48:13 +02:00
  • 8395f67351 Events on Diaspora now looking okay. Michael Vogel 2015-10-17 09:41:58 +02:00
  • 2070c96dd1 Changing the acl does not work when editing posts - so it is disabled for events. Michael Vogel 2015-10-17 08:46:45 +02:00
  • 2178be9863 Merge branch '1510-event-guid' of github.com:annando/friendica into 1510-event-guid Michael Vogel 2015-10-17 08:29:22 +02:00
  • 316276cb6d Editing an item with an event is now opeing the event edit form. Michael Vogel 2015-10-17 08:27:33 +02:00
  • 485e65871e Avoid wrong birthdays Michael Vogel 2015-10-17 02:36:16 +02:00
  • 7f9711ffe6 Delete event when the item is deleted Michael Vogel 2015-10-17 01:25:25 +02:00
  • dd46a6ff68 Store the event when a summary or a description is set Michael Vogel 2015-10-17 00:58:22 +02:00
  • 67f699403a match.php: restructure acdording to the change of match.tpl rabuzarus 2015-10-17 00:39:50 +02:00
  • 20bb16859f dirfind.php: move html to templates rabuzarus 2015-10-17 00:19:01 +02:00
  • fcc185a182 Unsure to store the guid with new events Michael Vogel 2015-10-16 23:50:34 +02:00
  • 6ebb21a935 directory.php: move html to templates rabuzarus 2015-10-16 21:44:10 +02:00
  • 642f3fca1a fix translation bug for likers rabuzarus 2015-10-14 19:48:57 +02:00
  • 7ae884f132 Merge pull request #1964 from rebeka-catalina/FAQignoreDescr Tobias Diekershoff 2015-10-14 18:11:36 +02:00
  • 9817104ebc Clarified description of ignore rebeka-catalina 2015-10-14 17:48:26 +02:00
  • c855c9ba67 Merge pull request #1963 from annando/1510-feed-warning Tobias Diekershoff 2015-10-14 08:49:02 +02:00
  • 65228e37bb Avoid a warning when a feed contains no items. Michael Vogel 2015-10-14 08:10:06 +02:00
  • a961c29d05 Merge pull request #1962 from annando/1510-attend-vier Tobias Diekershoff 2015-10-14 06:42:50 +02:00
  • f3e1d12643 Merge pull request #1961 from tobiasd/20151013-typo Michael Vogel 2015-10-13 21:42:01 +02:00
  • 66ea33623b Vier: Some small changes in the template for events Michael Vogel 2015-10-13 20:15:01 +02:00
  • e47acf83d2 typo in markdown syntax Tobias Diekershoff 2015-10-13 18:22:45 +02:00
  • 1e0aa4b22e Merge pull request #1960 from tobiasd/20151013-deA Tobias Diekershoff 2015-10-13 17:37:01 +02:00
  • db14dc13c3 DE: update to the strings Tobias Diekershoff 2015-10-13 17:35:08 +02:00
  • 407560532c Merge pull request #1959 from tobiasd/20151013-de Tobias Diekershoff 2015-10-13 17:09:39 +02:00
  • 1df5a7212b DE: translation of the attend strings THX to Abrax Tobias Diekershoff 2015-10-13 17:06:35 +02:00
  • c0d0298b0f Merge pull request #1958 from fabrixxm/event_firstday Tobias Diekershoff 2015-10-12 21:17:03 +02:00
  • 154c55b36e Merge pull request #1957 from fabrixxm/duepuntozeroattend Tobias Diekershoff 2015-10-12 21:16:40 +02:00
  • 5299f25920 default value for firstDay in events page fabrixxm 2015-10-12 20:23:09 +02:00
  • fd8e8d005a attend functionality for duepuntozero fabrixxm 2015-10-12 20:09:33 +02:00
  • 6f2f024b17 Merge pull request #1954 from tobiasd/20151012-messages fabrixxm 2015-10-12 19:05:57 +02:00
  • 735755aa0e Merge pull request #1956 from tobiasd/20151012-de fabrixxm 2015-10-12 19:04:51 +02:00
  • 8bf3a36737 Merge pull request #1955 from tobiasd/20151012-quattroattend fabrixxm 2015-10-12 19:03:30 +02:00
  • 5839242792 DE Update to the translation, thx Abrax Tobias Diekershoff 2015-10-12 18:08:11 +02:00
  • da8c81a12e cleanup forgotten lines Tobias Diekershoff 2015-10-12 15:58:34 +02:00
  • 3debdf0a91 attend functionality for quattro theme (part of #1953) Tobias Diekershoff 2015-10-12 15:34:18 +02:00
  • 32a21bb02b regeneration of the messages.po file for attendance translation Tobias Diekershoff 2015-10-12 15:15:39 +02:00
  • ce03ccc95c Merge pull request #1929 from rabuzarus/event-attendance Tobias Diekershoff 2015-10-12 15:10:03 +02:00
  • 456e078021 Merge pull request #1952 from annando/1510-ifttt Tobias Diekershoff 2015-10-12 08:18:11 +02:00
  • a58be37930 Merge pull request #1943 from tobiasd/20151007-adminname Michael Vogel 2015-10-12 07:50:40 +02:00
  • adba75600a Vier: Support for the new IFTTT addon. Michael Vogel 2015-10-11 23:36:23 +02:00
  • 5c2923869a this got lost by merge rabuzarus 2015-10-11 20:00:54 +02:00
  • 649578ae33 Merge develop-new into event-attendance-new rabuzarus 2015-10-11 19:39:55 +02:00
  • db7dca3d5f Merge event-attendance into develop Conflicts: include/conversation.php rabuzarus 2015-10-11 19:28:54 +02:00
  • a539455d81 correct a little mistake (delivery.php was not commited) rabuzarus 2015-10-11 18:20:06 +02:00
  • 6f04c57ed3 correct a little mistake (ACTIVITY_LIKE is supported) rabuzarus 2015-10-11 15:34:56 +02:00
  • 0b36b09823 don't send attendance activities to diaspora (unsupported) rabuzarus 2015-10-11 13:07:19 +02:00
  • 78b8a081f3 Merge pull request #1951 from tobiasd/20151011-messagespo Michael Vogel 2015-10-11 12:01:46 +02:00
  • 199bcdb7a0 regenerated messages.po file Tobias Diekershoff 2015-10-11 10:38:05 +02:00
  • aded5e4127 Merge pull request #1950 from annando/1510-contact-menu Tobias Diekershoff 2015-10-11 08:53:15 +02:00
  • 48309a25ec Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu Michael Vogel 2015-10-11 05:11:46 +02:00
  • 27fa20ab22 Merge pull request #1947 from annando/1510-diaspora-follower Tobias Diekershoff 2015-10-10 18:50:20 +02:00
  • 9e2b62b082 Merge pull request #1948 from annando/1510-more-escaping Tobias Diekershoff 2015-10-10 18:48:20 +02:00
  • 0104c33d98 Merge pull request #1949 from annando/1510-feed-duplicates Tobias Diekershoff 2015-10-10 18:47:02 +02:00
  • bb0dff2c75 Improved contact menu Michael Vogel 2015-10-10 16:23:20 +02:00
  • ba06d659f1 Bugfix: Feeds weren't imported if a post with the same URI existed. Michael Vogel 2015-10-10 14:26:07 +02:00
  • efbdb57f92 Reworked contact relations between Friendica and Diaspora Michael Vogel 2015-10-10 11:06:18 +02:00