OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Commit Graph

  • dc995501bd Merge remote-tracking branch 'upstream/master' into code-upgrade code-upgrade Markus Birth 2015-05-31 22:45:13 +02:00
  • 2ff320965e Merge pull request #176 from Bananeweizen/patch-1 following5 2015-05-31 16:21:25 +02:00
  • 4e0dd29277 fix typos Michael Keppler 2015-05-31 08:44:39 +02:00
  • dff6f495a3 Smarty is now on GitHub. Updated composer.json. Markus Birth 2015-05-31 00:53:07 +02:00
  • f6550ba3f7 Fix broken merge. Markus Birth 2015-05-31 00:18:32 +02:00
  • 1ec05ba62d Merge remote-tracking branch 'upstream/master' into code-upgrade Markus Birth 2015-05-31 00:00:26 +02:00
  • f3ae08230c added English changelog for v3.0.12 following 2015-05-30 12:29:05 +02:00
  • 0c2440391d set wayoint input fields to upper case; updates #334 following 2015-05-30 12:07:35 +02:00
  • e10164f55b Merge remote-tracking branch 'upstream/master' into code-upgrade Markus Birth 2015-05-29 23:32:11 +02:00
  • 8de3d2d6ac changelog update following 2015-05-28 16:36:59 +02:00
  • f1f4d1f616 changlog update following 2015-05-28 16:16:52 +02:00
  • 9384124daf added German v3.0.12 changelog following 2015-05-28 16:04:58 +02:00
  • 6e4cbc6576 fixed send-email-address default option; updates #333 following 2015-05-28 15:30:46 +02:00
  • 62b6a3c4e2 Merge pull request #174 from 4Vs/patch-8 following5 2015-05-28 12:05:35 +02:00
  • 139c5da4d9 Merge pull request #173 from 4Vs/patch-7 following5 2015-05-28 12:05:08 +02:00
  • 132e12378e Warnung eingefügt bzgl. HTML tags 4Vs 2015-05-28 11:48:38 +02:00
  • 927f44a360 Warnung wegen falscher Angaben eingefügt 4Vs 2015-05-28 11:46:00 +02:00
  • fa0f3c73d6 Merge pull request #172 from 4Vs/master following5 2015-05-28 01:12:07 +02:00
  • 9dea9e0ab8 Merge branch '240-removed-logs-info' following 2015-05-28 01:08:58 +02:00
  • 6fd3c3ddf6 added log date and type to remove-log notification email; updates #240 following 2015-05-25 18:24:04 +02:00
  • 84e027369e merged branch 334-gc-waypoints following 2015-05-28 01:05:23 +02:00
  • e3af6ec2ee validate GC waypoints; added explanations for waypoints; updates #334 following 2015-05-25 17:20:27 +02:00
  • e5236141de Merge branch '169-save-note' following 2015-05-28 00:55:14 +02:00
  • 1321fe6566 better handling of bad personal-note-coordinate input; updates #169 following 2015-05-25 16:17:12 +02:00
  • 208fb008a2 added waypoint link to 'duplicate cache' error message following 2015-05-28 00:50:37 +02:00
  • 0a011ddeed merged 76-duplicate-listings branch following 2015-05-28 00:32:57 +02:00
  • 31bca18727 merged "more events" branch; resolved merge conflict following 2015-05-27 23:53:50 +02:00
  • e32f482f66 added 'more events' link on start page; update #208 following 2015-05-25 13:07:04 +02:00
  • 08aaff331b Merge pull request #166 from following5/703-fix-language-switch following5 2015-05-27 23:49:53 +02:00
  • 94a3603328 added workaround for bad REQUEST_URIs; updates #703 following 2015-05-24 23:50:25 +02:00
  • b89232ee56 Merge branch '710-w3w-mapsearch' following 2015-05-27 23:46:29 +02:00
  • 0a02baaae3 narrowed w3w mapsearch regex; updates #710 following 2015-05-25 14:30:09 +02:00
  • 1542643b7a Merge pull request #164 from following5/333-send-email-address-default following5 2015-05-27 23:44:49 +02:00
  • 8fe2d4e0c2 added profile setting for default of 'send my e-mail address', updates #333 following 2015-05-24 20:47:31 +02:00
  • f984a452dd Merge pull request #163 from following5/365-usermail-address following5 2015-05-27 23:42:46 +02:00
  • 3c19e9137a fixed sender email address in usercontactmail template; updates #365 following 2015-05-24 19:18:28 +02:00
  • d5272d1e66 Merge pull request #162 from following5/704-default-logdate following5 2015-05-27 23:38:54 +02:00
  • 96fd24d761 added expiration time for default log date cookie; updates #704 following 2015-05-24 17:38:39 +02:00
  • 5cc74499c4 Merge pull request #161 from following5/368-archive-events following5 2015-05-27 23:32:37 +02:00
  • df2ccd2448 enabled auto-archiving of disabled event caches, update #386 following 2015-05-24 13:20:45 +02:00
  • b5fb2e8bf0 NO REVIEW REQUIRED: Linkanpassung und Target -> blank 4Vs 2015-05-27 08:49:29 +02:00
  • b406e261cd NO REVIEW REQUIRED: Linkanpassung und Target -> blank 4Vs 2015-05-27 08:47:30 +02:00
  • 73afab7840 Merge branch 'stable' following 2015-05-26 20:41:45 +02:00
  • 3529cc5865 added disable option and another error check for what3words api following 2015-05-26 20:32:00 +02:00
  • 5604b2b176 update #76: catch new caches with duplicate coordinates following 2015-05-25 15:20:36 +02:00
  • 1df52c4914 team list update following 2015-05-25 11:53:25 +02:00
  • a2e5271349 updated teamlist following 2015-05-25 11:51:07 +02:00
  • 40511db4ab added what3words coordinat search to map following 2015-05-24 22:42:18 +02:00
  • 89d4645e17 OKAPI update, revision 1075 following 2015-05-22 14:55:37 +02:00
  • 891d2349bd Merge pull request #160 from following5/license-update bohrsty 2015-05-21 14:11:10 +02:00
  • 14aac6eb77 Merge pull request #159 from following5/w3w-windowsize bohrsty 2015-05-21 14:10:51 +02:00
  • ea0191b808 Merge pull request #158 from 4Vs/master bohrsty 2015-05-21 14:10:09 +02:00
  • 526226ae3b Merge pull request #157 from 4Vs/patch-6 bohrsty 2015-05-21 14:09:32 +02:00
  • c793315702 Merge pull request #156 from 4Vs/patch-5 bohrsty 2015-05-21 14:09:12 +02:00
  • d06dbb6f79 improved w3w error handling following 2015-05-21 12:04:28 +02:00
  • 63d66b2611 added license info for garmin api following 2015-05-21 00:55:26 +02:00
  • 0b8c3f0c4d increased 'other coordinate systems' window to accomodate for new W3W links, and enabled automatic scrollbars following 2015-05-20 22:41:06 +02:00
  • 03d6a3737f Links zur Satzung und zum Beitrittsformular geändert 4Vs 2015-05-20 09:53:48 +02:00
  • 783c3a2f71 Link zur Satzung und Beitrittsformular geändert 4Vs 2015-05-20 09:52:38 +02:00
  • da4e7673cb Änderung Kassenwart 4Vs 2015-05-17 23:51:29 +02:00
  • 2f4b5d328a Kassenwart im Team geändert 4Vs 2015-05-17 23:50:03 +02:00
  • d7544a0321 Put constants into RowEditor class. Markus Birth 2015-02-13 00:32:24 +01:00
  • ea3179d144 Removed redundant code from RowEditor. Markus Birth 2015-02-13 00:00:15 +01:00
  • f069afe5d4 Converted class RowEditor into PSR4. Markus Birth 2015-02-12 23:27:23 +01:00
  • fe550657b4 Froze Symfony versions. Updated Smarty to latest 2.x branch. Markus Birth 2015-01-26 15:20:22 +01:00
  • 87a0c48b45 Enlarged coordinates popup to accomodate what3words entries. Markus Birth 2015-01-22 01:12:07 +01:00
  • 7379bf60b5 Merge remote-tracking branch 'upstream/master' into code-upgrade Markus Birth 2015-01-22 01:11:18 +01:00
  • 5c81dd4d01 Merge pull request #155 from mbirth/add-what3words-coordinate-output bohrsty 2015-01-21 21:13:51 +01:00
  • 7655f53d7c Typo fix. Markus Birth 2015-01-20 23:58:36 +01:00
  • aa0bf49cb2 Moved what3words API Key to settings.inc.php. Added links. Markus Birth 2015-01-20 23:41:47 +01:00
  • 905e5783e1 Merge pull request #154 from mbirth/add-what3words-coordinate-output bohrsty 2015-01-19 20:23:23 +01:00
  • ad039dd69b Added what3words.com support in coordinates output. API key was registered for Opencaching.de. Markus Birth 2015-01-12 01:55:36 +01:00
  • ec2f4640f8 Merge remote-tracking branch 'upstream/master' into code-upgrade Markus Birth 2015-01-11 22:07:28 +01:00
  • 5dcd9edf6d Merge pull request #153 from 4Vs/patch-4 bohrsty 2014-11-28 12:10:05 +01:00
  • 2ee0326328 Merge pull request #152 from 4Vs/patch-3 bohrsty 2014-11-28 12:09:39 +01:00
  • 103a375893 Change of treasurer 4Vs 2014-11-26 13:12:21 +01:00
  • 97609e814b Änderung des Kassenwartes 4Vs 2014-11-26 13:10:18 +01:00
  • 4eaf502091 Merge remote-tracking branch 'upstream/master' into code-upgrade Markus Birth 2014-11-25 12:13:08 +01:00
  • cfd22c14ce Merge pull request #151 from mbirth/364-send-to-gps-failed-fix master bohrsty 2014-11-24 20:07:29 +01:00
  • 93b4578272 Enable "Send to GPS" button again. Markus Birth 2014-11-22 22:56:54 +01:00
  • 0159db9652 Show Garmin status even if browser is not supported (otherwise the user wouldn't have a clue). Markus Birth 2014-11-22 22:56:11 +01:00
  • 2cd4de54d3 Switched to own API files. Markus Birth 2014-11-22 22:55:54 +01:00
  • e984c53bf8 Fixed bug in Garmin API. Markus Birth 2014-11-22 22:54:58 +01:00
  • 8e41aaee2e Added Garmin Communicator API from http://www.garmindeveloper.com/web-device/garmin-communicator-plugin/ . Markus Birth 2014-11-22 22:54:15 +01:00
  • ed667419a9 Merge pull request #150 from wrygiel/okapi bohrsty 2014-11-22 21:07:20 +01:00
  • 3f713f6d79 OKAPI Project update (r1055) Wojciech Rygielski 2014-11-22 20:58:20 +01:00
  • 8031718675 Merge remote-tracking branch 'upstream/stable' into stable stable Markus Birth 2014-11-22 20:40:19 +01:00
  • 8f3797f2ac Changed menu to use split-up translate.inc instead of .class. Markus Birth 2014-11-22 20:18:38 +01:00
  • 85ebe576c2 Indentation. Markus Birth 2014-11-22 15:07:20 +01:00
  • 756b429efc Updated packages. Markus Birth 2014-11-22 15:00:54 +01:00
  • 826966ba40 Merge remote-tracking branch 'upstream/master' into code-upgrade Markus Birth 2014-11-22 14:28:43 +01:00
  • 3a24b647f4 removed "send to GPS" button due to changes on Garmin site Nils Bohrs 2014-11-22 14:10:24 +01:00
  • c6e3022fee Merge pull request #148 from wrygiel/okapi bohrsty 2014-11-21 09:32:42 +01:00
  • 575a0e4bc1 Merge pull request #149 from FriedrichFroebel/master bohrsty 2014-11-14 15:40:53 +01:00
  • 1f78a6ad71 Headerbilder hinzugefuegt FriedrichFröbel 2014-11-11 16:22:45 +01:00
  • ccf5cf33a3 OKAPI Project update (r1031) Wojciech Rygielski 2014-10-08 10:06:07 +02:00
  • 859df34de6 Rewrote Cookie handling to new Global Class. Markus Birth 2014-09-23 13:39:47 +02:00
  • ca5bb8be8d Updated Composer packages. Markus Birth 2014-09-23 13:39:35 +02:00
  • c43b308be0 Merge remote-tracking branch 'upstream/master' into code-upgrade Markus Birth 2014-09-18 23:01:50 +02:00
  • 2becadb611 Merge pull request #147 from Schrottie/editorial-link-for-changelog-v11 bohrsty 2014-07-12 20:53:39 +02:00