Commit Graph

Select branches

Hide Pull Requests

master

php7

utf8

Mono Color

• 81bd8f12ac Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-09-04 21:24:46 +02:00
• 8208fd7dde Forcing sercure connections. Just Thomas Misund 2013-09-04 21:24:39 +02:00
• e2aa559d6a Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-09-04 21:17:18 +02:00
• 368d447590 Using secure links from secure pages. Just Thomas Misund 2013-09-04 21:14:46 +02:00
• c65652259e Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-09-04 21:09:40 +02:00
• a1a43ebf7f Forgot to close a PHP block. Just Thomas Misund 2013-09-04 21:09:22 +02:00
• fd3e1d4a27 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-09-04 21:08:20 +02:00
• 60397fafd6 Removing old js menu from new test site. Just Thomas Misund 2013-09-04 21:06:24 +02:00
• d7188830fb Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-09-04 20:14:01 +02:00
• 0d0e5c23d7 Adding button properties to default buttons. Just Thomas Misund 2013-09-04 20:11:39 +02:00
• a1a2559210 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-09-04 18:18:53 +02:00
• 9f4ed5175e Closing some elements that were wide open. Just Thomas Misund 2013-09-04 18:18:44 +02:00
• 4fdeb3a540 More semantics. Just Thomas Misund 2013-09-04 18:14:27 +02:00
• 9c05424110 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-09-04 17:59:05 +02:00
• 9223891c7b Changing from XHMTL 1.0 to HTML5. Just Thomas Misund 2013-09-04 17:58:46 +02:00
• 5a67e369d1 Some more semantics in navigation. Just Thomas Misund 2013-09-04 17:14:06 +02:00
• 8a294ae7e9 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-09-03 10:45:39 +02:00
• 3b6e88a6fd Improving CSS dev test. Just Thomas Misund 2013-09-03 10:44:42 +02:00
• f7ea4f4c5e Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-30 17:51:39 +02:00
• b3ad738f6e Storing sticker expiry dates in a date-friendly format. misund 2013-08-30 17:51:25 +02:00
• 7fc084d9d2 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-30 16:16:50 +02:00
• 2e5daa742f Fixing layout bug for users without any memberships. misund 2013-08-30 16:14:40 +02:00
• 27f0b91f36 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 12:30:25 +02:00
• c73cba3323 Extra failsafe for failing new registrants. misund 2013-08-29 12:30:03 +02:00
• 2a9789aee5 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 12:06:11 +02:00
• 72272c9455 Adding leads. misund 2013-08-29 12:05:16 +02:00
• 9c14a2e214 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 08:00:58 +02:00
• 09f3060625 Typo. misund 2013-08-29 08:00:48 +02:00
• 4be1670964 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 07:53:59 +02:00
• ef22b1fe37 Styling recruitment copy. misund 2013-08-29 07:53:51 +02:00
• b18dbdab6e Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 07:50:34 +02:00
• 83b8a946c0 Adding recruitment copy. misund 2013-08-29 07:50:10 +02:00
• fd84637665 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 07:33:33 +02:00
• f408942d61 Updating copy. misund 2013-08-29 07:33:14 +02:00
• bcf818e868 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 07:12:45 +02:00
• 7652b683bd Updating copy. misund 2013-08-29 07:12:22 +02:00
• 1510988d3d Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 06:56:51 +02:00
• 34da4d762a Actually echoing membership status. misund 2013-08-29 06:56:39 +02:00
• 5a71075108 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 06:50:57 +02:00
• d64a4b3527 Displaying membership status on user profile. misund 2013-08-29 06:50:15 +02:00
• 9fc80ef18d Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 06:32:36 +02:00
• 960ec1eb28 Removing bloat. misund 2013-08-29 06:32:23 +02:00
• 772748928d Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 06:23:01 +02:00
• 2c24ccfc03 Styling membership buttons. misund 2013-08-29 06:22:53 +02:00
• be85513964 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 06:16:27 +02:00
• 26dd3d51d6 Styling alerts yet again. misund 2013-08-29 06:16:16 +02:00
• ad4a0e226e Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 06:12:39 +02:00
• 413a4fc4b1 Simplifying membership status notifications. misund 2013-08-29 06:12:20 +02:00
• abeb065313 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 06:01:03 +02:00
• 508fc76121 Adding yet more Bootstrap semantics in navigation. misund 2013-08-29 06:00:51 +02:00
• 8168d515fd Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 05:59:22 +02:00
• dc2bde9575 Adding more semantics. misund 2013-08-29 05:59:10 +02:00
• efbe59f93b Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 05:55:21 +02:00
• 0c37a7f1d6 Commenting out Bootstrap small screen navigation aid. misund 2013-08-29 05:55:02 +02:00
• bf491d97cc Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 05:52:32 +02:00
• 904f0b3557 Adding Bootstrap classes, removing bloat. misund 2013-08-29 05:52:19 +02:00
• 745262a6f4 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 05:16:02 +02:00
• 97d0ab9723 Making nice Bootstrap buttons. misund 2013-08-29 05:15:22 +02:00
• 2bd6620744 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 05:10:02 +02:00
• f5ee7d8a99 Renaming classes to go with Bootstrap. misund 2013-08-29 05:09:36 +02:00
• e294ee1ee8 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 05:02:04 +02:00
• 81f9873d2a Making alerts prettier. misund 2013-08-29 05:01:43 +02:00
• f907d2fbc5 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 04:45:31 +02:00
• 3c098017ae Adding Bootstrap js. misund 2013-08-29 04:45:12 +02:00
• d955cb10ee Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 04:33:28 +02:00
• bf6eb564a3 Styling profile info. misund 2013-08-29 04:33:19 +02:00
• f5833a9363 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 04:24:39 +02:00
• 2f1c8d5e24 Adding profile links. misund 2013-08-29 04:24:25 +02:00
• 5bb2aa90ca Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 02:42:33 +02:00
• e42fe70f64 Styling the panels. misund 2013-08-29 02:42:24 +02:00
• ac73478252 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 02:39:08 +02:00
• fe0c7275b2 Panelizing logged in home page. misund 2013-08-29 02:38:50 +02:00
• 6710438899 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 02:01:11 +02:00
• 02f49cc8c3 Adding some semantic markup. misund 2013-08-29 02:00:05 +02:00
• 4d6127427e Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-29 00:01:53 +02:00
• 4db51893da Securing testing styles. misund 2013-08-29 00:01:47 +02:00
• 61b0932a6c Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-28 23:53:17 +02:00
• a63fb64727 Adding testing styles. misund 2013-08-28 23:53:09 +02:00
• 1a683958e3 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-28 23:33:51 +02:00
• f84257c7f9 Fixing date formats. misund 2013-08-28 23:33:41 +02:00
• dd5f145951 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-28 23:30:54 +02:00
• 2a7d6f9615 Improving which SMSs to show in the smslog by default. misund 2013-08-28 23:30:38 +02:00
• 23d6a5544f Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-28 23:22:26 +02:00
• 860e47c694 Showing fewer SMSs in smslog by default. misund 2013-08-28 23:21:48 +02:00
• 7194f347f1 Changed text in form for registering new members. Torkild Gundersen Kjevik 2013-08-28 18:09:18 +00:00
• 89287c4989 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-08-21 19:12:07 +02:00
• 2e1c1e6803 Changed 'muffins' to 'muffens' Torkild Gundersen Kjevik 2013-08-21 17:10:49 +00:00
• 345f3d942c Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-03-20 21:07:38 +01:00
• 36f006f47b Oops nikolark 2013-03-20 21:06:50 +01:00
• 64cee58142 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-03-20 21:02:21 +01:00
• cd34ff227f Format bug report mail nikolark 2013-03-20 21:01:23 +01:00
• 61d9a56d68 Merge branch 'master' of git://git.neuf.no/inside root@amen 2013-01-27 22:12:12 +01:00
• d9b730628b Style updates nikolark 2013-01-27 22:11:23 +01:00
• 7c0dd490b7 Merge branch 'master' of git://git.neuf.no/inside Paal Braathen 2013-01-10 23:13:49 +01:00
• df4e153d3c x Paal Braathen 2013-01-10 23:12:33 +01:00
• 5ccfb492db Display ldap usernames Paal Braathen 2013-01-10 23:09:10 +01:00
• 6ccf5363d5 Comments out UserGroupRelationship delete function nikolark 2012-10-02 23:36:47 +02:00
• 1d1d720dd2 Prose updates nikolark 2012-09-22 15:20:58 +02:00
• f409820383 Fixes ldap_username overlap nikolark 2012-09-22 15:07:24 +02:00
• 3d5a14e6e5 Removed functionality: Delete user Paal Braathen 2012-08-27 13:55:45 +02:00