SchoolGuy/ticketfrei
1
0
Fork 0
forked from ticketfrei/ticketfrei
Code Issues Pull requests Releases Wiki Activity
378 commits 13 branches 0 tags 44 MiB
Commit graph

38 commits

Author SHA1 Message Date
b3yond f360c4f8fd Merge remote-tracking branch 'origin/multi-deployment' into multi-deployment 
# Conflicts:
#	template/settings.tpl
 2018-09-15 19:20:25 +02:00
b3yond fcab07246b blacklist -> blocklist #31 to honor zuckerimtank@twitter.com 2018-09-15 19:01:58 +02:00
b3yond 11f3c5713b
Merge pull request #36 from git-sid/multi-deployment 
merge small stylechanges
 2018-09-15 18:58:08 +02:00
git-sid 72d6798022 WIP: #31 fix: blacklist -> blocklist. 
Replace all relevant instances of "blacklist" with blocklist.
Untested due to OS restricitions. Please check before merge.
 2018-09-14 09:44:21 +02:00
b3yond 91181e1cf8 added telegram to default city page text. 2018-09-09 21:36:27 +02:00
b3yond b80b80dc43
Merge pull request #32 from b3yond/mailbot 
Rewriting the Mailbot, included subscription mechanism
 2018-09-08 11:14:57 +02:00
b3yond 96329e968e finished #23 code. rw city page info display. Unsubscribe = Delete 2018-09-08 11:14:00 +02:00
Jorge Maldonado Ventura 0ffe4daac8 HTML fixes 2018-08-11 17:19:12 +02:00
b3yond ef0ce8f9f1 Advertising mail notifications on the city page 2018-08-08 10:55:51 +02:00
b3yond cc0b3378a9 you can now subscribe to mail notifications! Also db bugfixes. 2018-08-08 10:24:20 +02:00
b3yond a05205289f added mail template callback functions 2018-07-22 13:47:56 +02:00
b3yond 89fce872f3 added template for subscribing to mail notifications (untested) 2018-07-21 15:07:47 +02:00
b3yond 55a804f0d6 removing redundant p tags 2018-07-13 15:55:40 +02:00
b3yond cae74a5715 fixing missing /form tag #28 2018-07-13 15:55:14 +02:00
b3yond 9db71e485d fixing settings issue with required forms 2018-06-25 21:14:22 +02:00
b3yond 4c6ab2d3ae css fixes 2018-06-24 00:12:39 +02:00
b3yond 0719b094f8 added telegram to frontend 2018-06-24 00:00:48 +02:00
b3yond cd5eeb3917 You can now edit markdown in settings. #18 2018-05-25 16:50:02 +02:00
b3yond f4736c91dd fixed markdiown render issues. Closing #22 2018-05-25 16:31:08 +02:00
b3yond 628fcb4f95 small markdown fixes 2018-05-25 16:15:44 +02:00
b3yond 2a9c5c657f you can now set goodlist & blacklist in settings. render city page #18. fixed #24 and #25. 2018-05-25 15:57:20 +02:00
b3yond 04a6b82c1b You can now set data for the city page. #22 2018-05-25 14:44:45 +02:00
b3yond 5ec4d1aab0 displaying city or other titles on various pages. still ugly. 2018-04-26 23:48:26 +02:00
b3yond 62eb588b28 BETTER cat images!!11 2018-04-26 22:30:34 +02:00
b3yond 9885e39d68 added cat pictures <3333 2018-04-26 22:28:51 +02:00
b3yond 591020f8cc Merge branch 'multi-deployment' of dl6tom.de:public/ticketfrei into multi-deployment 2018-04-26 21:50:56 +02:00
b3yond d706c4f1cc created a user-facing page 2018-04-26 21:50:52 +02:00
Thomas L 642cf429e5 serve jquery from own server 2018-04-26 21:00:29 +02:00
b3yond 1a76cba4fb changed background image to jpg & more beautiful 2018-04-15 22:41:33 +02:00
b3yond 5d2ffbd935
more paragraphs, some typos 2018-03-25 22:49:14 +02:00
d24phant ce79b37b38
fixed some fails_pt2 
Hopefully.... :)
 2018-03-25 22:32:15 +02:00
d24phant 2fdc6f1f28
Delete propaganda.tpl 2018-03-25 22:31:00 +02:00
d24phant f99b44d815
Fixed some fails 
:)
 2018-03-25 22:30:17 +02:00
d24phant c980e7abb5
Added "our_mission"-draft 2018-03-25 22:06:31 +02:00
b3yond 95ada7ba62 Lorem Ipsum -> actual promotion text 2018-03-25 18:23:42 +02:00
b3yond b9613a60de added twitter & masto OAuth to new web.py - untested, take care! 2018-03-23 02:28:00 +01:00
b3yond 9e09dcea84 fixed db init, fixed confirmation mails, added logout button 2018-03-22 11:22:28 +01:00
Thomas L 3f4ec83abe start refactoring web-frontend. 2018-03-22 02:23:31 +01:00