summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/wicket
Commit message (Collapse)AuthorAgeFilesLines
* Fix user preferences selecting the wrong preferred locale.Florian Zschocke2019-11-112-46/+28
| | | | | | | | | | | Due to a wrong comparison, when loading the preferred locale in the user preferences page, in cases like `zh_CN` or `de_DE` the wrong locale would be chosen. As with too many things, the code is duplicated on the `UserPage` and the `EditUserPage`. And they differ. So extract the choosing of the preferred language for display into a method in the (more up-to-date) `UserPage` and call that from the `EditUserPage`.
* Guard docs pages against bad URLsFlorian Zschocke2019-11-112-0/+9
| | | | | | | | If, for example, an external site links to a docs page or a specific doc page, and the branch that link points to is no longer existing, an internal error happens due to a NPE. The NPE is guarded against and a No Docs page is returned.
* Merge branch 'pingunaut-1166_more_secure_password_hashes' into master.Florian Zschocke2019-11-062-25/+16
|\
| * Use the new PasswordHash classes.Florian Zschocke2019-11-052-29/+16
| | | | | | | | | | | | Integrate the `PasswordHash` class and subclass in the user and password editing and authentication. Replaces the old code and the previous `SecurePasswordHashingUtils` class.
| * Replaced duplicated strings by using constantMartin Spielmann2017-01-071-2/+2
| |
| * Added possibility to use secure hashes to store passwordsMartin Spielmann2017-01-011-1/+5
| | | | | | | | Addresses #1166
* | Remove "folding outlines" and sort repositories before subfolders.Florian Zschocke2019-06-152-19/+21
| | | | | | | | | | | | | | | | Remove guard rails at the left to get a cleaner look. To make it easier to determine which repositories belong to which folder, display the repositories first, then the subfolder. Decreased indentation a little.
* | Add support nested groups on the Repositories pageFlorian Zschocke2019-06-154-5/+368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for #725. Also covers #527. This is a squashed commit of the following commits, merging and closing pull request #1267: commit 55fee41769ffab1aff59344fe117d481687aa743 Author: Martin Spielmann <mail@martinspielmann.de> Date: Mon Nov 6 17:19:53 2017 +0100 declared local variable final to fix travis build commit 131e4d14a48c2a3fdce621fa54637de50684d040 Author: Martin Spielmann <mail@martinspielmann.de> Date: Mon Nov 6 14:11:55 2017 +0100 fix formatting (use tab for identation) commit 8da5f6d5967894f157251c320928acdab3a451e7 Author: Martin Spielmann <mail@martinspielmann.de> Date: Mon Nov 6 13:45:39 2017 +0100 Add repositoryListType tree. Addresses #725, 527 and includes #1224 commit 6c061651fb95212ae242dbca06c8d9ef80146201 Merge: f365daa3 40ee9653 Author: Martin Spielmann <mail@martinspielmann.de> Date: Sat Nov 4 13:19:08 2017 +0100 Merge remote-tracking branch 'collapsible/ticket/527' into 725_nested_repos commit f365daa3b1d6be135365f9b11bdece320beabf4e Author: Martin Spielmann <mail@martinspielmann.de> Date: Sat Nov 4 13:10:24 2017 +0100 first working version of tree model
* | collapsible group repositoriesybosy2019-06-153-3/+60
| |
* | Null-safe compare for ticket milestones without due dateFritz Schrogl2019-06-101-2/+14
| |
* | Update link target to Lucene 5.5 query syntax, moving the link to the page.Florian Zschocke2017-03-0516-119/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the link target to the query parser syntax page of the 5.5 version. Refactor the `LuceneSearchPage` to use an `ExternalLink` for the link to the lucene page, so that the link target is kept and updated in the Java code. Move the link out of the language files. This was way too cumbersome to update the link target (which is probably why no one ever did). The query help text is changed to contain a variable: `gb.queryHelp = here be some ${querySyntax} help`, which is replaced by Wicket with a link. The link text is a new lange file property: `gb.querySyntax`.
* | Better Czech localizationJan Breuer2017-03-031-76/+76
| |
* | Add Czech localeJan Breuer2017-02-153-0/+848
| |
* | New Setting "Default Language" when creating user.william2017-02-084-29/+71
| |
* | Sending email (certificate zip file) based on locale that user selectedwilliam2017-01-242-0/+2
| |
* | Update korean translation for gitblit new version.DONGSU, KIM2017-01-051-718/+759
|/
* Merge pull request #1160 from fzs/sshLdapAuthenticatorFlorian Zschocke2016-12-181-0/+9
|\ | | | | LDAP SSH key manager
| * The public key manager can disable writing keys, which hides commandsFlorian Zschocke2016-12-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some public key mangers may be read-only, i.e. not allow to add or delete keys, or to change the key comment or assigned permissions. In such a case the respective commands should not be available on the SSH shell and the SSH Keys panel should also not offer the possibility. The `IPublicKeyManager` gets three new methods, modelled after the `AuthenticationManager`: `supportsWritingKeys`, `supportsCommentChanges` and `supportsPermissionChanges`. They return true if a key manager allows for keys to be written or updated. For example the existing `FileKeyManager` will return true for all three since it allows to store and update keys in a file. The new `LdapKeyManager` returns false since it only accesses LDAP and can not add or update any keys in the directory. A future key manager might get keys from an LDAP directory but still keep comments and permissions for it in a local copy. If writing of keys is not supported: * the welcome shell does not suggest adding a key, * the `SshKeysDispatcher` does not offer the "add", "remove", "comment" and "permission" commands, and * the SSH keys panel hides the "delete" button in the key list, and the "Add Key" form. The hiding of the "Add key" form is not perfect since the surrounding div is still shown, but I don't know how to hide it and it didn't look too bad, either.
* | Merge branch 'rcaa-master' into master.Florian Zschocke2016-12-131-1/+1
|\ \
| * | removing duplicated code for cookie genaration and adding random bytes to ↵Rodrigo Andrade2016-08-151-1/+1
| | | | | | | | | | | | generate user cookies
* | | Fix disabled links in PagerPanelTom2016-10-312-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled links in the PagerPanel (used on the LuceneSearchPage to page through search results) were only rendered as "disabled". The links themselves remained active, which gives strange effects when clicked. For instance it was possible to move to result pages -1, -2, and so on. Really disable the links. Add missing CSS rules to have correct styling as Wicket renders disabled links as spans, not anchors. Include the new CSS file in BasePage.html. And add the left/right arrows only if not on the first/last page.
* | | Merge pull request #1142 from fzs/merge-strategyJames Moger2016-10-284-4/+13
|\ \ \ | | | | | | | | Merge strategy
| * | | Add merge type setting to repository page.merged--merge-strategyFlorian Zschocke2016-10-283-1/+10
| | | | | | | | | | | | | | | | The merge type is a per repository setting. Add it to the edit page.
| * | | Add integration strategy to merge tickes fast-forward or with commit.Florian Zschocke2016-10-281-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the option to merge a ticket branch to the integration branch only when it can be fast-forwarded, or always with a merge commit, or by fast-foward if possible, otherwise with a merge commit. Adds a new property ticket.mergeType with the valid values FAST_FOWARD_ONLY, MERGE_ALWAYS and MERGE_IF_NECESSARY. Merging and canMerge were refactored to make use of a new IntegrationStrategy class for each type of strategy.
* | | Spelling mistake fixlarsmaes2016-09-161-1/+1
| |/ |/| | | pushedNewBranch was wrongly spelled
* | 1.8.x tranditional chinese translationwilliam2016-08-041-27/+21
| |
* | 1.8.x tranditional chinese translation after user experiencewilliam2016-08-041-711/+728
|/
* Merge pull request #1087 from ↵Paul Martin2016-06-191-0/+1
|\ | | | | | | | | mereth/issues/964-session-loss-redirects-to-start-page Fixes #964 - add missing redirect after restoring user in new session
| * add missing redirect after restoring user in new sessionmereth2016-06-151-0/+1
| |
* | Merge pull request #1055 from gitblit/1048-TicketReferencesPaul Martin2016-06-183-8/+41
|\ \ | |/ |/| Ticket Reference handling #1048
| * Ticket Reference handling #1048Paul Martin2016-04-273-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Supports referencing: + Tickets from other tickets via comments + Tickets from commits on any branch + Common TicketLink class used for both commits and tickets + TicketLink is temporary and persisted to ticket as a Reference + Support deletion of ticket references + Rebasing patchsets/branches will generate new references + Deleting old patchsets/branches will remove the relevant references + Substantial testing of use cases + With and without patchsets, deleting, amending + BranchTicketService used during testing to allow end-to-end ref testing + Relocated common git helper functions to JGitUtils
* | Fixes #1062 - Upgraded to Prosemirror 0.6.1Paul Martin2016-04-291-3/+2
| |
* | Fixes #1061 - Most recent first on filestore pagePaul Martin2016-04-281-2/+42
|/
* fixes #966 to prevent always searching all reposPaul Martin2016-04-161-3/+6
|
* Fixes #1028 - FilestorePage now pages and filtersPaul Martin2016-04-083-20/+180
|
* Fix for #962 - Delete patchset abilityPaul Martin2016-04-063-1/+110
|
* Fix for #1042 - Filestore items now shown as iconsPaul Martin2016-04-067-48/+13
|
* Fixes #882 Honour allow new ticket settingPaul Martin2016-04-061-1/+1
|
* Fix for #1037 myTickets now honours permissionsPaul Martin2016-04-041-5/+13
|
* Fix for #1034 Ticket Page ErrorPaul Martin2016-03-311-8/+10
|
* Friendly URL for EditFile Page #974Paul Martin2016-03-274-13/+20
| | | | + Prevent Edit of old doc version
* Disable edit links in read only mode #974Paul Martin2016-03-272-5/+21
|
* Document edit capability via ProseMirror submodule #974Paul Martin2016-03-276-4/+290
| | | | | | | | | | | | + New docEdit page with links from docPage and docList + Bespoke menu system with full screen edit mode + npm required for building client side scripts + Ant script added for BuildUI which performs npm commands + Update font-awesome to 4.5.0 + Factor out to JGitUtils common code in BranchTicketService for EditFilePage + getTreeEntries + commitIndex + Merge capability for document editing
* Merge pull request #1032 from gitblit/1031-FixForRepositoryPagePaul Martin2016-03-271-2/+10
|\ | | | | Fix for #1031 to display error message
| * Fix for #1031 to display error messagePaul Martin2016-03-261-2/+10
| |
* | Fix for #1018 and #1025 browser LFS linksPaul Martin2016-03-214-12/+279
|/ | | | | + View and Raw both download the actual file + Blame will show the metafile
* Fix for #976 - Filestore links via browserPaul Martin2015-12-259-49/+122
| | | | | | | | | | | | | + GitLFS client support + FilestoreModel now parses meta file + Read meta heading from cache if available + Authentication based on accept headers for browser view filestore login + PathModel & PathChangeModel now understands filestore items + Zip & Rar downloads contain include filestore items + Filestore servlet returns LFS JSON error only if accepted by client + DiffStat now knows repository to allow identification of filestore items + Filestore items identified and returned via view, raw & blob links on blame, commitDiff, commit and Tree pages
* fix for #978 - HTML5 date input supportPaul Martin2015-12-096-9/+181
| | | | | | | | + JS patch/hack to coerce legacy wicket into talking to a HTML5 input type + JS script to hide inline help on date format when using HTML5 date picker + Date picker shown in user locale and standard does not support custom format. + Always sent in ISO8601 format
* fix for #967 filestore menu for all usersPaul Martin2015-12-073-32/+22
| | | | | | + Filestore listing filtered by user view permissions + Configuration help for filestore relocated to website files + Added migration example
* Catch some potential NPEsJames Moger2015-11-181-0/+3
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-01 07:27:21 +0000