Commit Graph

174 Commits

Author SHA1 Message Date
Mark Pemberton
032ea9ec25 Fixed missing change that was in master 2011-06-07 21:42:11 -04:00
Mark Pemberton
b628e63e01 Merge branch 'master' into privatekey2
Conflicts:

	data/templates/default/bookmarks.tpl.php
2011-06-04 00:38:07 -04:00
Christian Weiske
2419885577 make upgrade file fully rST-compatible and move SQL commands out into single schema files 2011-05-27 06:59:33 +02:00
Christian Weiske
5ba53394fc implement request #1989987: theme support. merge themes branch with --squash 2011-05-25 19:43:36 +02:00
Christian Weiske
63b0a4b8cb make tag and common tag description pages valid html 2011-05-25 06:57:55 +02:00
Mark Pemberton
b105867e75 Merge branch 'master' into privatekey2 2011-05-21 21:38:25 -04:00
Mark Pemberton
e0149e24e2 Resolve some failed bookmark and tag tests 2011-05-21 14:36:29 -04:00
Christian Weiske
b436b4273d ignore test configs 2011-05-19 07:39:42 +02:00
Mark Pemberton
920f7fc623 Updated PrivateKey to include Tag searches 2011-05-17 00:24:43 -04:00
Mark Pemberton
10214c43b5 Updated 'Generate New Key' button to use ajax if javascript enabled. 2011-05-16 00:35:31 -04:00
Mark Pemberton
16791766de Fixed SQL structure for PrivateKey 2011-05-14 23:08:46 -04:00
Mark Pemberton
ec345f7a13 new privatekey2 branch with privatekey changes 2011-05-13 14:26:51 -04:00
Christian Weiske
803b83fb7d Merge branch 'master' into ssl-client-certs 2011-05-13 06:57:54 +02:00
Christian Weiske
88d7b9631b Merge branch 'master' into configurable-privacy2 2011-05-12 19:25:03 +02:00
Christian Weiske
9cc4b5ffc2 add SSL client certificate translations for german (de_DE) 2011-05-11 18:00:31 +02:00
Christian Weiske
d3615844ae update translation base file 2011-05-11 17:51:55 +02:00
Christian Weiske
73792c5807 document template parameters and correct form action 2011-05-11 06:48:40 +02:00
Christian Weiske
9d91f1bee1 do not use links but POST form to change SSL settings. Proper web apps should never change data with GET requests 2011-05-11 06:44:49 +02:00
Christian Weiske
c13689813e prepare user interface to register and delete client certificates on the profile page 2011-05-10 15:23:58 +02:00
Christian Weiske
967ba79ece show current users certificates on profile page 2011-05-09 18:16:53 +02:00
Christian Weiske
c7ec370b47 also match client issuer (CA) 2011-05-05 12:01:39 +02:00
Christian Weiske
b212c837f0 autofill registration form email address if user has a ssl client certificate 2011-05-04 17:13:14 +02:00
Christian Weiske
4e63a9a679 part of request #3163623: add support to login via ssl client certificate. web interface to register certificates is still missing 2011-05-04 17:08:25 +02:00
Christian Weiske
dda05f5cc7 SQL schema version table to ease future database upgrades 2011-05-04 08:02:33 +02:00
Christian Weiske
2077464d46 begin bookmark model class with URL validation method 2011-05-03 09:14:32 +02:00
Christian Weiske
8be81abfe6 merge master 2011-05-02 18:07:15 +02:00
Christian Weiske
8e7138bf1f make html valid xml to be able to load it with an xml parser 2011-04-26 06:58:49 +02:00
Christian Weiske
106bdcec66 replace named html entities with their numeric name to be able to load the generated pages with an xml parser 2011-04-26 06:53:50 +02:00
Christian Weiske
c81566f5d8 cherry-pick:
add new feature: allow unit test mode enabling via HTTP GET parameter
2011-04-06 08:42:26 +02:00
Christian Weiske
705d016301 move bookmarklet code to own template file 2011-04-05 18:56:51 +02:00
Christian Weiske
1527555a96 restructure opera bookmarklet popup code (doesnt work currently :)) and make normal opera bookmarklet code a bit easier to read 2011-04-04 23:11:05 +02:00
Christian Weiske
361c94895d explain opera button commands 2011-04-04 22:26:19 +02:00
Christian Weiske
51763183e0 FINALLY get the first opera bookmarklet working, with cleaner code now 2011-04-04 22:07:39 +02:00
Christian Weiske
43974a15f2 make popup bookmarklet work in firefox when the title contains double and single quotes. opera still broken, though 2011-04-01 08:17:01 +02:00
bretticvs
42942507c4 Revert "Revert "Updates for configurable-privacy2, hopefully without carriage returns.""
This reverts commit f072059f2d.
2011-03-31 16:18:36 -07:00
bretticvs
f072059f2d Revert "Updates for configurable-privacy2, hopefully without carriage returns."
This reverts commit 675eadd584.
2011-03-31 16:17:53 -07:00
bretticvs
675eadd584 Updates for configurable-privacy2, hopefully without carriage returns. 2011-03-31 15:59:44 -07:00
U-SYBASE\bdee
8cbfef8115 Revert "Further updates for configurable-privacy2."
This reverts commit ef88147d45.
2011-03-31 13:25:37 -07:00
Christian Weiske
7a45f330a7 re-enable browser bookmarklets after fixing some naaaaaaaaaaaaaasty bugs with site titles that have special chars in them 2011-03-31 19:13:07 +02:00
bretticvs
ef88147d45 Further updates for configurable-privacy2. 2011-03-30 22:31:51 -07:00
Christian Weiske
28c8cdaf58 make dynamictags (tagcloud) work again 2011-03-30 19:20:26 +02:00
Christian Weiske
c7c702f544 begin to fix dynamictags for xhtml compatibility 2011-03-29 18:04:26 +02:00
Christian Weiske
407daf0bfa work around minLength problem in jquery-ui-autocomplete 2011-03-29 08:05:15 +02:00
Christian Weiske
13fb8739db split words also by =, < and > 2011-03-29 07:57:35 +02:00
Christian Weiske
3f6bf4a5eb update from 1.8.5 to jquery-ui 1.8.11 2011-03-29 07:54:47 +02:00
Christian Weiske
5c1d75ae65 use getadmintags.php if configured so 2011-03-28 19:24:44 +02:00
Christian Weiske
833dde3f53 jquey-autocomplete works! 2011-03-28 19:17:51 +02:00
Christian Weiske
361c18469a add new feature: allow unit test mode enabling via HTTP GET parameter 2011-03-26 15:09:22 +01:00
Christian Weiske
6d49b0622d begin modifying ajax/getcontacttags 2011-03-25 19:26:42 +01:00
Christian Weiske
f67250a720 do not error out when the bookmark cannot be saved 2011-03-22 21:08:17 +01:00