Commit Graph

Select branches

Hide Pull Requests

master

#1

Mono Color

• 778a0a3136
  Add docker-compose help master Marcel Schwarz 2020-03-15 00:00:16 +0100
• fb2ee00bff Merge branch 'dockerize' Marcel Schwarz 2020-03-14 23:53:45 +0100
• ef821f82f9 Update docker-compose version to 3.7, Update php to latest-7 Marcel Schwarz 2020-03-14 23:53:16 +0100
• 518a5f6ec8 remove unused volume Marcel Schwarz 2020-03-14 23:30:39 +0100
• 0507d27ebb Change structure to separate frontend and sql Marcel Schwarz 2020-03-14 20:21:40 +0100
• 93e11c22bf Split sample data and setup, remove step from webserver dockerfile Marcel Schwarz 2020-03-14 20:10:00 +0100
• 6572f20b93 Align db setup to dumped values Marcel Schwarz 2020-03-14 19:50:49 +0100
• a0c8944d09 Fix redirect after login Marcel Schwarz 2020-03-14 19:25:21 +0100
• f2619aeb2c Add docker compose, add db setup, add webserver dockerfile Marcel Schwarz 2020-03-14 19:14:26 +0100
• b018861b55 Add SQL Docker setup Marcel Schwarz 2020-03-14 18:34:01 +0100
• eb7c6eeabe put complete sql setup in one file Marcel Schwarz 2020-03-14 03:05:28 +0100
• 2d00d0e068 corrected spelling mistakes Marcel Schwarz 2018-06-21 21:31:21 +0200
• acb2652b08 corrected spelling mistakes Marcel Schwarz 2018-06-21 21:29:20 +0200
• d7be307d6c minor changes the_kellner 2018-06-20 17:02:46 +0200
• dcc87e483e minor changes the_kellner 2018-06-20 16:35:05 +0200
• 13696bc708 Minor changes in buttons on nav element the_kellner 2018-06-20 16:32:42 +0200
• b1cb5523df added more home content Marcel Schwarz 2018-06-20 16:21:32 +0200
• 11de47eaf9 added main content Marcel Schwarz 2018-06-20 16:12:24 +0200
• ce8d56ead0 added name to header and changing active nav item Marcel Schwarz 2018-06-20 15:53:52 +0200
• b220e68d1a Register bug fix (Vol.2) wiecktobi 2018-06-19 21:48:45 +0200
• 2611372164 implemented view for unused tans on dashboard Marcel Schwarz 2018-06-19 19:00:54 +0200
• f37829a6e4 added trim, fixed wrong row camping4ever 2018-06-19 17:37:02 +0200
• 7fa37fc55a Minor changes wiecktobi 2018-06-18 23:01:49 +0200
• d7b4ff0738 Merge branch 'master' of https://github.com/iCaotix/ipr-projekt wiecktobi 2018-06-18 22:44:43 +0200
• aa377addeb Register bug fix wiecktobi 2018-06-18 22:42:54 +0200
• 55450d4ff4 minor changes Marcel Schwarz 2018-06-18 21:19:04 +0200
• 26ecb2596f cleaned up source code Marcel Schwarz 2018-06-18 20:59:32 +0200
• eb6b9e9b97 Merge branch 'master' of https://github.com/iCaotix/ipr-projekt camping4ever 2018-06-18 20:23:21 +0200
• 30d2e33210 implementet show entries camping4ever 2018-06-18 20:23:05 +0200
• 6f50c84e09 implemented create Account response Marcel Schwarz 2018-06-18 19:34:17 +0200
• 774d6ef35a Merge branch 'master' of https://github.com/iCaotix/ipr-projekt Marcel Schwarz 2018-06-18 19:11:04 +0200
• b5619342d0 fixed position of new friendsTan Marcel Schwarz 2018-06-18 19:10:54 +0200
• 537f2a053c FIX: js/[particles.js, app.js] the_kellner 2018-06-18 19:10:47 +0200
• 826aba6825 FIX: segments/_myFriendsBook.php the_kellner 2018-06-18 19:07:18 +0200
• a616f0bcc9 IMPLEMENT: particles.js -->(js/[particles.js, app.js, stats.js] , index.php(imports, divs)) the_kellner 2018-06-18 18:54:36 +0200
• 4fe2528aa7 ADD: example entry for myfrindsbook ->(segments/_myFreindsBook.php) the_kellner 2018-06-18 17:51:14 +0200
• ec40e095f4 showentries erstellt camping4ever 2018-06-18 17:19:10 +0200
• acb36dda96 FIX: problems with validation -> (segments/_register.php , js/contentloader.js) the_kellner 2018-06-18 16:17:06 +0200
• 82ffca032f ADD: required function to entrys -> segments/[_entryForm.php, _login.php, _register.php] the_kellner 2018-06-18 14:44:49 +0200
• 2cc7050310 bug fix Marcel Schwarz 2018-06-18 00:32:50 +0200
• 004cd86698 formatting Marcel Schwarz 2018-06-18 00:15:08 +0200
• 3d4d080fb3 implemented new Entry page Marcel Schwarz 2018-06-18 00:13:47 +0200
• bc227e3393 minor changes Marcel Schwarz 2018-06-17 23:24:47 +0200
• c4c5fc1fb8 added user id to generated tans Marcel Schwarz 2018-06-17 23:05:13 +0200
• 41829bbbf0 implemented logout Marcel Schwarz 2018-06-17 22:23:11 +0200
• 2c5df120cb implemented login and safe userid in php session Marcel Schwarz 2018-06-17 21:36:38 +0200
• f3c02d2c19 minor changes the_kellner 2018-06-17 20:34:25 +0200
• bf0a3a1cac minor fixes the_kellner 2018-06-17 20:24:43 +0200
• d1b1f5243b index.php:semicolon the_kellner 2018-06-17 20:23:34 +0200
• 7312df615d IMPLEMENT: single index php shema; ADD: _login.php, _register.php, _headerSession.php, _home.php, _myFriendsBook.php, CHANGE: entryForm.php the_kellner 2018-06-17 20:12:19 +0200
• fdd57cd033 Merge branch 'master' of https://github.com/iCaotix/ipr-projekt the_kellner 2018-06-17 18:34:34 +0200
• 359e30d7a4 made login synchronous Marcel Schwarz 2018-06-17 18:24:56 +0200
• 7fb652f323 Merge branch 'master' of https://github.com/iCaotix/ipr-projekt the_kellner 2018-06-17 18:12:29 +0200
• 4cdc7dd21e
  added er-modell and dashboard interface Marcel Schwarz 2018-06-15 09:23:35 +0200
• 87a86d72fd
  Update entiresTable.sql Marcel Schwarz 2018-06-15 09:22:53 +0200
• 7e84260cb7 Session implementiert wiecktobi 2018-06-13 19:46:32 +0200
• 4e34f8180c Merge branch 'master' of https://github.com/iCaotix/ipr-projekt the_kellner 2018-06-11 18:18:17 +0200
• 3c53460d20 minor change wiecktobi 2018-06-11 18:17:36 +0200
• 11dbf9fd5a implemented login and signup wiecktobi 2018-06-11 18:15:21 +0200
• 6ff2323ceb Merge branch 'master' of https://github.com/iCaotix/ipr-projekt the_kellner 2018-06-11 17:57:30 +0200
• dc524ac00c solved merge problems Marcel Schwarz 2018-06-11 17:56:22 +0200
• 8ad92f6a0b Revert "switched tan from unique id to index" Marcel Schwarz 2018-06-11 17:44:54 +0200
• 1b09b345a1 Merge branch 'master' of https://github.com/iCaotix/ipr-projekt the_kellner 2018-06-11 17:44:23 +0200
• 6e8ff050fd Revert "Merge branch 'master' of https://github.com/iCaotix/ipr-projekt" Marcel Schwarz 2018-06-11 17:42:44 +0200
• 43dbaf126c Revert "Merge branch 'master' of https://github.com/iCaotix/ipr-projekt" the_kellner 2018-06-11 17:41:01 +0200
• ebb6e4eed7 Merge branch 'master' of https://github.com/iCaotix/ipr-projekt the_kellner 2018-06-11 17:28:55 +0200
• 268a8ea290 switched tan from unique id to index Marcel Schwarz 2018-06-11 02:00:39 +0200
• 09debbdc9d updated new entry handling Marcel Schwarz 2018-06-11 00:59:10 +0200
• 47934a70be reordered Project Marcel Schwarz 2018-06-11 00:24:37 +0200
• 40398a6939 Cange: index.php(entry->_entry.html)(navbar->_header.html) the_kellner 2018-06-10 20:38:33 +0200
• 038182e377 Add: EntryForm the_kellner 2018-06-10 19:24:56 +0200
• 0db79a8bb4
  Update userTableSQL wiecktobi 2018-06-10 17:55:33 +0200
• 126aed3f54
  Delete login.php wiecktobi 2018-06-10 13:25:12 +0200
• 5ab908d255
  Clickhandler wiecktobi 2018-06-08 17:31:10 +0200
• 74c33ca0db
  Paar id's hinzugefügt wiecktobi 2018-06-08 17:30:23 +0200
• 48dc6b0a23
  Add files via upload wiecktobi 2018-06-08 17:29:14 +0200
• e311cfa6dc
  Add files via upload wiecktobi 2018-06-08 17:26:29 +0200
• 24d2e76e30
  Create userTableSQL wiecktobi 2018-06-08 10:44:13 +0200
• f3f0de57ac 1Versuch wiecktobi 2018-06-07 21:55:32 +0200
• af09b5da26
  Update categories.txt wiecktobi 2018-06-07 19:43:48 +0200
• 669b5b3859 extracted db connection Marcel Schwarz 2018-06-01 20:43:25 +0200
• 8a1b946f8e
  Update categories.txt Marcel Schwarz 2018-06-01 10:21:59 +0200
• c05d8b6b09
  Create categories.txt Marcel Schwarz 2018-06-01 10:08:59 +0200
• 7108e0019e php tan corrections Marcel Schwarz 2018-05-27 19:31:44 +0200
• 2da917312e corrected tan usage Marcel Schwarz 2018-05-26 16:55:33 +0200
• 57262adcb7 tan update in database Marcel Schwarz 2018-05-26 15:59:43 +0200
• c949aebc85 create database connection Marcel Schwarz 2018-05-26 15:09:18 +0200
• 507f65dcb0
  Merge pull request #1 from iCaotix/generateUniqueLinks Marcel Schwarz 2018-05-26 14:41:31 +0200
• 5886d48a7f add tan generation Marcel Schwarz 2018-05-26 14:33:15 +0200
• d035aa16c4 cleaned project Marcel Schwarz 2018-05-26 13:49:29 +0200
• e45801cc8f fixed: a problem marcel had :D the_kellner 2018-05-26 13:28:16 +0200
• 5dca0ac831 add: header:carousel, footer:message, body:loremipsum_testSPACER, IMG/:header_images the_kellner 2018-05-26 13:11:57 +0200
• e52434e95d minor fix the_kellner 2018-05-26 11:38:46 +0200
• da088d5bc3 minor fix the_kellner 2018-05-26 11:37:59 +0200
• a746b7197e add: INFO the_kellner 2018-05-26 11:36:19 +0200
• 819b8417dd minor changes the_kellner 2018-05-26 11:31:19 +0200
• 416fe65716 add: php_post @line:61,97 the_kellner 2018-05-26 11:26:18 +0200
• 10599e2673 add: names the_kellner 2018-05-25 21:15:47 +0200
• ab7ef75987 Change to PHP the_kellner 2018-05-25 20:59:06 +0200
• 1e3ef1a3ce Add h2 the_kellner 2018-05-25 20:42:38 +0200