Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
61 check-ins using file src/merge.c version 1bca64b642
|
2010-01-13
| ||
| 10:10 | Fixed bug where /doc could only be read if the user had checkout security - <i>drh adds</i>: This is not a bug. Checkout permission prevents /doc from being used to "checkout" any version of any file. Closed-Leaf check-in: acba194c0d user: jeremy_c tags: dead-end | |
| 09:58 | Fixed bug where the ticket report view page was checking the wrong security attribute (too secure) which was causing people who should be able to view ticket reports to not be able to view ticket reports. check-in: 5fc36e2faa user: jeremy_c tags: trunk | |
| 09:35 | New option of 'wiki-use-html' which causes the wiki system to use HTML as it's markup language. i.e. do not interfeer with what was entered. check-in: cf3809cc71 user: jeremy_c tags: trunk | |
|
2010-01-12
| ||
| 14:33 | Fix typo on the [/doc/tip/www/password.wiki] page. Add a link to that page from the home page. check-in: c16017374e user: drh tags: trunk | |
| 14:10 | Transfer SHA1-encoded passwords on a "configure push|pull user" when the client has Admin privilege. check-in: 9c5322463b user: drh tags: trunk | |
| 13:55 | Merge the experimental password changes into the trunk. check-in: 596f3c10fe user: drh tags: trunk | |
| 13:47 | Reverted previous commit [1bf6cf832d] as it contains a major flaw of wiki links not being rendered. I tested on simple cases only, will reimplement in a way that allows wiki links to be rendered properly. check-in: b9897bb934 user: jeremy_c tags: trunk | |
| 13:38 | Added an option to enable ALL HTML, CSS and JavaScript tags/attributes for wiki pages. This comes with a strong warning against doing so on any public project. check-in: db344436c2 user: jeremy_c tags: trunk | |
|
2010-01-11
| ||
| 17:11 | Added a 'New Ticket' link to the 'View Ticket' sub menu check-in: 1bf6cf832d user: jeremy_c tags: trunk | |
| 16:21 | Additional clarification in the Password Management document. Closed-Leaf check-in: 261e55346d user: drh tags: experimental | |
| 16:09 | Updates to the Password Management document. check-in: 1cba86eabb user: drh tags: experimental | |
| 15:07 | Add the [/doc/tip/www/password.wiki] document. check-in: cac5675e6c user: drh tags: experimental | |
|
2010-01-10
| ||
| 20:56 | Change the hash algorithm for passwords so that USER.PW field stores a SHA1 hash of the project-code, user login, and user password, rather than just a hash of the user password. That way, the if two users select the same password, or if the one user selects the same password for multiple projects, the password hashes are still different. check-in: 4b58a7b838 user: drh tags: experimental | |
| 18:41 | Fix ticket [135d8acbae] - parent/child indicators on timeline fail if there are suppressed lines because they still generate an entry in the JavaScript for the id that was skipped. check-in: 2975179442 user: eric tags: trunk | |
| 14:27 | Merged ticket report list fixes from [cd93f5965b] into trunk check-in: 023c9fed38 user: jeremy_c tags: trunk | |
| 00:07 | Fixes to the configurable "report list". Load the correct default TH script when no report list script is specified. Send and receive the report list TH script together with other ticket configuration scripts. check-in: cd93f5965b user: drh tags: experimental | |
|
2010-01-09
| ||
| 22:34 | Remove some debug/test printfs that were mistakenly left in the previous commit. check-in: e8b76a69ae user: drh tags: experimental | |
| 22:03 | Store passwords in USER.PW as either cleartext (as is done in legacy) or as the SHA1 hash of the password. When changing a password or adding a new user, always use the SHA1 hash password. check-in: cfe33dcf92 user: drh tags: experimental | |
| 18:43 | Call ticket_init() from the report view so users can have access to all the common ticket code check-in: 6d0b76d01f user: jeremy_c tags: trunk | |
| 18:32 | Added a user configurable TH1 template for the ticket report list. check-in: 14253e9b33 user: jeremy_c tags: trunk | |
| 13:11 | If a ticket query begins with an underscore then: # Do not include a link to execute the query directly # Do not show to those users that do not have ticket report access This allows you to create ticket report queries that are for form submissions only, not direct access. check-in: 6069602aba user: jeremy_c tags: trunk | |
| 12:35 | Added the cgi() SQL function implemented by Brain Theado. check-in: 19f552795b user: jeremy_c tags: trunk | |
| 12:16 | Harmonized Admin/Log with other "Pagination" wording. Earlier has become Older, Later has become Newer. check-in: 2239226012 user: jeremy_c tags: trunk | |
|
2010-01-08
| ||
| 18:49 | Fix minor typo in www/theory1.wiki . check-in: 8748d75b5f user: eric tags: trunk | |
|
2010-01-06
| ||
| 14:23 | Fix typos in the copyright release template. Ticket [ffec860709] check-in: cd26978357 user: drh tags: trunk | |
| 14:19 | Fix typos in the "Thoughs On The Design Of Fossil" document. Ticket [e77e876caf3] check-in: ce6b68ca64 user: drh tags: trunk | |
| 13:48 | Only show propagating tags (not single-checkin tags) in the check-in comment entry template. check-in: 4943c0e504 user: drh tags: trunk | |
|
2010-01-05
| ||
| 21:28 | Added the "Thoughts On The Design Of Fossil" document in answer to recent criticisms and critiques. check-in: a6303982b0 user: drh tags: trunk | |
| 15:01 | Fix a potential segfault in the URL shortener of the WWW timeline logic. check-in: d66718f2e8 user: drh tags: trunk | |
|
2010-01-04
| ||
| 13:53 | Add a copyright release form template. check-in: d2bec5a1d4 user: drh tags: trunk | |
| 13:16 | Update the built-in SQLite to version 3.6.22 RC 1. check-in: 57225017b0 user: drh tags: trunk | |
|
2010-01-01
| ||
| 21:33 | [5483de2ea6] Fixed. Also fixed Black and White theme (timeline not using li tags). check-in: 5efb82a71a user: jeremy_c tags: trunk | |
| 19:49 | [5483de2ea6] Added two single quotes around baseurl fixing the bug check-in: af25881866 user: jeremy_c tags: trunk | |
| 01:30 | Fixed bug that did not display the "X similar events" message for the last item on the timeline. check-in: def89b9393 user: jeremy_c tags: trunk | |
|
2009-12-31
| ||
| 22:30 | Added SQL function user() implemented by Brian check-in: a2c2e3b115 user: jeremy_c tags: trunk | |
| 19:10 | Alternative implementation of timeline security changes - this implementation always shows the timeline link if it is applicable, even if the history capability is disabled. check-in: 9b70675778 user: drh tags: trunk | |
| 14:59 | * Changed security for timeline. To view the timeline, you must now have History access. The timeline will then display only items which you have access to. "o" (Check-out) is required for source history, "j" (Read-Wiki) is required for Wiki history and "r" (Read-Tkt) is required for Ticket history. Closed-Leaf check-in: 71ad9b62a7 user: jeremy_c tags: jeremy_c-timeline | |
| 14:49 | Fixed minor spelling error check-in: efdad08182 user: jeremy_c tags: jeremy_c-timeline | |
| 14:49 | * Fixed security bug in ticket reports, you previously had to have Check-out security to view a ticket report, you now have to have "r" (Read-tkt) to view ticket reports. check-in: 6ee7316567 user: jeremy_c tags: jeremy_c-timeline | |
| 04:42 | [886c302b3f] Added documentation for <nowiki>[#anchor]</nowiki> style links check-in: dddc514053 user: jeremy_c tags: trunk | |
|
2009-12-30
| ||
| 01:57 | Added a 's' parameter to the web timeline view. This will search the comment and brief fields for the given text via LIKE '%value%'. check-in: 1e2ec3ff87 user: jeremy_c tags: trunk | |
|
2009-12-29
| ||
| 22:10 | clean up a few compiler warnings check-in: 97789f0a92 user: rwilson tags: trunk | |
| 20:52 | Fix a bug in the IP address truncator. Ticket [a09798ba9e]. check-in: 5d16ca43f1 user: drh tags: trunk | |
| 00:11 | Only record the first 16 bits of the 32-bit IP address as part of the anonymous login cookie. check-in: 86cbb69af2 user: drh tags: trunk | |
|
2009-12-27
| ||
| 18:19 | Fix an invalid free() call that could occur when the "info" command was used with an invalid artifact ID. Ticket [aa8ba0fffa]. check-in: 9d3fe01ae3 user: drh tags: trunk | |
|
2009-12-26
| ||
| 15:30 | removed an extraneous pair of row/cell closing tags. Fixed TH tags which were closed with TD instead of TH. check-in: 06b964a0cf user: stephan tags: trunk | |
| 13:43 | timeline descendants view now properly behaves when there are no descendents, and it also sigularizes the word 'descendents' when there is only one. check-in: a388e9da2e user: stephan tags: trunk | |
|
2009-12-20
| ||
| 21:34 | Fix a comment formatting error in the recent skins.c changes. check-in: 4f24addea9 user: drh tags: trunk | |
| 17:53 | Add a black & white skin with the main menu down the left margin. check-in: 5a5d7e1f90 user: drh tags: trunk | |
| 02:58 | Fix an assertion fault that occurs when attempting to revert a file that is not in the repository. Ticket [3713cea2fc]. check-in: 2255e4e3ba user: drh tags: trunk | |
| 02:53 | Add a khaki color skin. check-in: 91b9081425 user: drh tags: trunk | |
|
2009-12-19
| ||
| 21:04 | Add a new "Skins" configuration page that allows the look and feel of the web interface to be changed to one of several prototypes at the click of a button. Currently, there are only two built-in prototypes. check-in: 007d0a9b3f user: drh tags: trunk | |
| 03:16 | Fix a segfault that occurs on an attempt to merge binary files. Ticket [3f2cb270b2f6]. check-in: 8e147fdbac user: drh tags: trunk | |
|
2009-12-18
| ||
| 23:54 | For the "version information" web pages, change the default behavior to only show the list of files that changed, not the diffs. But there is a link to get diffs of all files or of individual files. The default behavior can be changed using a Setup/Timeline configuration option to show diffs by default. check-in: 0f4f6c0325 user: drh tags: trunk | |
| 23:09 | Remove dead code from timeline.c. Make sure all shortened UUIDs have at least one hexadecimal digit greater than '9' to avoid confusing them with decimal numbers. check-in: 74534cc91e user: drh tags: trunk | |
| 22:16 | Minor cleanup to the implementation of command-line "timeline". check-in: 02920e92b5 user: drh tags: trunk | |
| 22:08 | The previous "anon-captcha" check-in missed one spot. This check-in attempts to correct the problem. check-in: bb8193cfd0 user: drh tags: trunk | |
| 22:01 | Change the name of the "anon-login-enable-captcha-filler" setting to "auto-captcha". Move the GUI setting of this setting over to the "Setup/Behavior" page. check-in: fe019f946b user: drh tags: trunk | |
| 21:38 | Change the name of the strnlen_() function in printf.c to StrNLen32(). check-in: 9a8fdf7294 user: drh tags: trunk | |
| 20:15 | Add an "annotate" command to the command-line to suppliment the "annotate" web page. check-in: 73b7faa58b user: drh tags: trunk | |
| 00:29 | Detect when the check-out contains missing files and filesystem objects that ought to be files but are not. Issue reasonable warnings. check-in: 76f169fca6 user: drh tags: trunk | |