Commit Graph

Select branches

Hide Pull Requests

master

php7

utf8

Mono Color

• 97302c0ff2 minor nikolark 2012-08-08 13:15:30 +02:00
• c1fa8fd661 Updates register-user text nikolark 2012-08-08 13:13:06 +02:00
• fe8d0e1d03 LOL omg. Directory structure fails Paal Braathen 2012-05-23 17:21:56 +02:00
• 775b1f1d57 Dear mother of god, i am 12 and what is this? Paal Braathen 2012-05-23 16:50:28 +02:00
• f8266c579c Form tweaks. Google Analytics update nikolark 2012-05-06 17:15:00 +02:00
• ad54d513ea Oops2 nikolark 2012-05-06 15:04:10 +02:00
• 36d98ff7f7 Oops nikolark 2012-05-06 15:01:51 +02:00
• 91e968bb87 LDAP usernames are fine nikolark 2012-05-06 14:53:48 +02:00
• 5dff48c84a New URLs nikolark 2012-05-06 14:11:54 +02:00
• 3e8df79c8c Deploy fixes nikolark 2012-05-03 02:12:50 +02:00
• 4ef9b1739a Removes old urls (fixing payex payment callback) nikolark 2012-05-01 13:47:57 +02:00
• 6d88632a06 Path fixes nikolark 2012-04-21 00:31:23 +02:00
• 52cc657538 Major cleanups nikolark 2012-04-20 23:45:21 +02:00
• 4d59143fa9 No need for membership to migrate nikolark 2012-04-19 11:04:16 +02:00
• 408bcb1859 Minor nikolark 2012-04-19 02:53:30 +02:00
• f133f13d2e Replace password-reset with userinfo-link nikolark 2012-04-19 02:49:43 +02:00
• 6412941e39 Merge branch 'master' of git.neuf.no:inside into nikolark nikolark 2012-04-19 02:36:41 +02:00
• c787ac9207 Merge branch 'master' into nikolark nikolark 2012-04-19 02:34:17 +02:00
• dc85a4b084 Product images Just Thomas Misund 2012-04-19 02:33:50 +02:00
• bede4f4fda Put usersync host in config Just Thomas Misund 2012-04-12 15:37:59 +02:00
• 4004fae55f Including lifelong memberships in stats. Just Thomas Misund 2012-04-11 13:52:42 +02:00
• edb67fdd19 Inside stats nikolark 2012-04-11 01:46:04 +02:00
• e3aa4a4f36 Site root function nikolark 2012-04-11 01:45:35 +02:00
• 7d52972ef7 Merge branch 'master' into nikolark nikolark 2012-04-10 21:55:42 +02:00
• dc7fed1157 Adds ldap as primary auth, lots of cleanups nikolark 2012-04-10 21:53:53 +02:00
• e1425e2f45 Updates DB.php to v1.7.14 nikolark 2012-04-09 14:02:13 +02:00
• 295ac6a063 Changed links from absolute to relative. Just Thomas Misund 2012-03-21 22:04:00 +01:00
• c437585f8c Payex stuff. Just Thomas Misund 2012-03-21 22:03:31 +01:00
• 5cba85dac6 [Inside] Prøvde å fikse utsending av mailer når et kort blir produsert. Robert Kolner 2012-02-29 18:15:14 +01:00
• dd3a719086 Removes change username link nikolark 2012-02-29 00:39:29 +01:00
• b4c79a90c3 Merge branch 'master' of git.neuf.no:inside Just Thomas Misund 2012-02-28 20:13:00 +01:00
• be256de256 Updating link to Viteboka Just Thomas Misund 2012-02-28 20:12:44 +01:00
• 2561522deb Remove notice nikolark 2012-02-23 01:22:57 +01:00
• 4941fc13fe Resample images nikolark 2012-02-20 00:28:19 +01:00
• 932ebb79e9 Oops nikolark 2012-02-20 00:22:25 +01:00
• f58ae1bc8a File uploads fixes. nikolark 2012-02-20 00:17:22 +01:00
• 462bad096a display-current-user: Now shows migration status nikolark 2012-02-09 18:29:50 +01:00
• b51b474228 Ignore swap files nikolark 2012-02-07 22:52:06 +01:00
• c1b62790d3 Merge branch 'master' of git.neuf.no:inside Øyvind Bakkeli 2012-02-03 00:00:39 +01:00
• fb425d5443 1337 lines111 Just Thomas Misund 2012-02-01 17:15:12 +01:00
• b5e0be5a4a Merge branch 'master' of git.neuf.no:inside Øyvind Bakkeli 2012-01-30 19:33:15 +01:00
• 5284e81eab 100 kronersmeldemskap våren2011 Øyvind Bakkeli 2012-01-18 12:10:16 +01:00
• ee6f479d75 .gitignore Just Thomas Misund 2012-01-12 23:42:19 +01:00
• f81cd9b151 Fixed bug introduced by live commit (new-expiry-date should be new-sticker-date) Øyvind Bakkeli 2012-01-11 21:12:54 +01:00
• 1187b4bd83 skriveleif Øyvind Bakkeli 2012-01-11 18:27:46 +01:00
• 8f2775db32 Merge branch 'master' of git.neuf.no:inside Øyvind Bakkeli 2012-01-11 18:25:02 +01:00
• b4a6aa785e Fiks av bug med medlemssalg Øyvind Bakkeli 2012-01-11 18:07:55 +01:00
• b6b0b73100 Fiksa renameing x2 da det er skrevet mongokode flere plasser Paal Braathen 2012-01-05 19:40:48 +01:00
• 58241fc900 Fikset renameing av filer Paal Braathen 2012-01-05 19:20:57 +01:00
• 6746b3034b upping max file size for image uploads Mausern Testbruker 2011-11-03 19:14:55 +01:00
• 9534abf0d7 Unneccesery merge nikolark 2011-10-21 01:23:04 +02:00
• 0d58c8b816 Opening hours. nikolark 2011-10-21 01:19:18 +02:00
• 69392f6953 Live changes (sticker period related) Mausern Testbruker 2011-10-21 00:52:34 +02:00
• f73dcc0e57 Subtle regex fixes. nikolark 2011-09-21 00:09:35 +02:00
• 57409da756 Typo nikolark 2011-09-20 23:35:16 +02:00
• 19f76fbd9c Check for quotes and backslash in password. nikolark 2011-09-20 23:34:19 +02:00
• 73a3ee2831 fixed some stuff oyvinbak 2011-09-14 16:23:13 +02:00
• 8cc1fb59a8 fikset loop Øyvind Bakkeli 2011-09-14 16:08:47 +02:00
• 5afdcb17a2 fixed bug? Øyvind Bakkeli 2011-09-14 15:57:52 +02:00
• 37eab1fba0 Standarized how expiry and stamp periods are used Øyvind Bakkeli 2011-09-14 15:34:33 +02:00
• d105c55469 Only members with a valid membership can migrate through the modal dialog. Note: Newly registered users are still migrated. nikolark 2011-09-02 00:30:24 +02:00
• 057082578a User.php: Removed use of checkForumUsername. ajax.php: Changed username check to allways return true. nikolark 2011-08-29 22:22:06 +02:00
• 5e9754bc2d Removed change username link nikolark 2011-08-29 22:09:05 +02:00
• 8b1d6b846a strtolower on usernames in migration. Mausern Testbruker 2011-08-29 20:46:53 +02:00
• 5b073c26e2 Minor Mausern Testbruker 2011-08-23 21:31:52 +02:00
• e9b6dd19fd English flag nikolark 2011-08-23 21:17:52 +02:00
• 87ba786fac Updated opening hours. nikolark 2011-08-23 21:12:26 +02:00
• 30f6da18e7 Merged with live changes oyvinbak 2011-08-23 12:44:08 +02:00
• 7ada424f2b La til dings for å sperre kort Mausern Testbruker 2011-08-23 12:42:34 +02:00
• e874adf32b Fixed some stuff in user Mausern Testbruker 2011-08-23 12:30:47 +02:00
• 95a62fe4ba Removed log-file Mausern Testbruker 2011-08-20 02:09:37 +02:00
• bbebb12e0c Fixed log out notice. nikolark 2011-08-20 02:03:44 +02:00
• 7b918bb211 Ignored files nikolark 2011-08-20 01:49:33 +02:00
• 3942e0535c Dependency injection on migration functions (uid parameter). nikolark 2011-08-20 01:44:46 +02:00
• 2c64cd1d27 Live changes Mausern Testbruker 2011-08-19 15:24:08 +02:00
• f39f8b88ce merged with live oyvinbak 2011-08-17 18:15:37 +02:00
• 9eecbcf993 live changes Mausern Testbruker 2011-08-17 18:10:42 +02:00
• ceef0e82e7 Added LDAP sync for new registrations and updated the form validation rules. Removed Nordea-code. nikolark 2011-08-17 18:02:20 +02:00
• 95f8e11663 Ironed out the last migration bugs (hopefully) with assistance from the EDB-robot. nikolark 2011-08-11 19:23:32 +02:00
• 1b6ebc3f56 Only lowercase letters in username. nikolark 2011-08-09 21:27:35 +02:00
• 90792d84c6 Merged with launchpad. nikolark 2011-08-09 11:17:59 +02:00
• 28b177add9 Added migration which starts executing in Page.php:displayHome(), ie. when a user just logged in. This is to migrate old users to LDAP for SingleSignOn across our systems. Missing: migrate on user registration. + Some membercard sticker stuff from oyvinbak. nikolark 2011-08-09 11:02:44 +02:00
• ed12767de0 merged with live oyvinbak 2011-08-08 00:02:48 +02:00
• b89bdfde6c live changes Mausern Testbruker 2011-08-07 23:56:07 +02:00
• b35318faf7 Oppdatert for at medlemskap skal følge skolesemester oyvinbak 2011-08-07 23:45:25 +02:00
• 9840114bae Ikke oppdatert addressestatus hvis ny og gammel status er den samme. Genererte mye unødvendig loggbeskjeder. h-alstad 2011-05-11 21:55:55 +02:00
• 58608a4ea5 Oppdaget feil ved salg av nytt medlemskort til livsvarige medlemmer. Bruk hasExpired() i stedet for å sjekke på dato for å sjekke medlemsstatus ved medlemskapssalg. hasExpired() har støtte for livsvarig medlemskap. h-alstad 2011-05-11 21:46:49 +02:00
• 5f36bf87e0 Gi status på om kortnummer er brukt h-alstad 2011-04-06 23:32:17 +02:00
• d56401ebcd Fikset bug - "Bestill nytt kort"-knappen i membershipSale() fungerte ikke h-alstad 2011-04-06 23:05:25 +02:00
• edf3ab07ba added nagging oyvinbak 2011-03-04 12:14:27 +01:00
• 0613f1c952 merged with live oyvinbak 2011-03-04 11:18:46 +01:00
• ebd0ac95dd removed .htaccess from repository glium337 2011-03-04 11:18:28 +01:00
• fe673df045 merge diision update update time oyvinbak 2011-03-02 00:19:51 +01:00
• 7f7285520f knapp for aa oppdatere foreningers update tid, ledd i automatisk purring paa foreninger glium337 2011-03-02 00:19:28 +01:00
• 8b72653bf6 merged oyvinbak 2011-03-01 23:31:06 +01:00
• 72377371d6 added a .htaccess redirect instead of doing it in the script. site seems to work again now glium337 2011-03-01 23:29:56 +01:00
• 291ba49a15 merge... oyvinbak 2011-02-23 14:35:22 +01:00
• 5a8ab4e541 added search for phone number glium337 2011-02-23 14:32:41 +01:00
• 5226b9a11d added javascript in link oyvinbak 2011-02-22 13:51:40 +01:00
• eac7c3f299 la til lenke i meldingen oyvinbak 2011-02-22 13:47:27 +01:00