engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
370 commits 1 branch 0 tags 110 MiB
Commit graph

272 commits

Author SHA1 Message Date
Martin Bornhold
b4ff4dfd33 tests: Add test to check that the rebase-merge setting is available on hg repos. 2016-07-05 16:49:19 +02:00
Marcin Kuzminski
fe4c5863f0 labs: enable by default. We want people to encourage using those 2016-07-05 21:18:30 +02:00
Martin Bornhold
8ad6c162c7 settings: Use the old layout to display labs settings. 2016-06-28 17:30:31 +02:00
Martin Bornhold
77c3287d4a settings: Delete obsolete code related to the rebase-merge lab settings. 2016-06-27 16:53:36 +02:00
Martin Bornhold
0f767f23a4 settings: Remove obsolete VCS config value HG_USE_REBASE_FOR_MERGING 2016-06-27 13:30:27 +02:00
Martin Bornhold
1824a54c6d settings: Use the new 'use_rebase' argument to decide between rebase or merge. 2016-06-27 13:18:25 +02:00
Martin Bornhold
b545575d28 settings: Read 'rebase-merge' config option and pass it to the VCS insntacen on merge. 2016-06-27 13:17:41 +02:00
Martin Bornhold
488bd2df2f settings: Add argument to select rebase as merge strategy. 2016-06-27 13:16:10 +02:00
Martin Bornhold
d80ead44a9 settings: Display 'rebase-merge' option in VCS settings. 2016-06-27 11:00:57 +02:00
Martin Bornhold
b3a1dec11e settings: Add the 'rebase-merge' setting to VCS base form and VCS settings model. 2016-06-27 11:00:22 +02:00
Martin Bornhold
b0612b7dc6 settings: Add 'labs_active' flag to template context. 2016-06-27 10:58:53 +02:00
Martin Bornhold
dec51f1669 pyro: Slightly improved log message and comment. 2016-07-05 09:37:57 +02:00
Martin Bornhold
64893dfad5 pyro: Return new proxy instances if called from outside of a request context. 
This allows to run code that uses the pyro connection to the VCSServer
but does not execute from within a request context, e.g. invoke tasks.
 2016-07-05 09:37:13 +02:00
Marcin Kuzminski
60b6490ced api: make comment_commits api have consistent permissions with web interface. 2016-07-05 09:56:44 +02:00
Marcin Kuzminski
9763f430b4 tests: fixed test after update of cs cache changes. 2016-07-04 23:55:36 +02:00
Marcin Kuzminski
79bb294282 system: send platform and version to upgrade endpoint. 2016-07-04 23:23:55 +02:00
Marcin Kuzminski
28876607b7 diff2way: fixed unicode problem on non-ascii files. 2016-07-04 23:18:20 +02:00
Marcin Kuzminski
c4c18efd81 js: updated mergely to 3.4.1 2016-07-04 23:13:42 +02:00
Marcin Kuzminski
f94b2c50d6 codemirror: update from 5.4.0 to 5.11.0, fixes #3154 2016-07-04 22:19:23 +02:00
lisaq
3a01852b49 styling: adds README styling for #4054 GFM 2016-07-04 17:26:32 +02:00
lisaq
9506a7f041 styling: GFM tweaks #4054 2016-06-30 15:23:53 +02:00
Martin Bornhold
ae1070b18a tests: Add an autouse fixture to patch the pyro proxy factory. 2016-07-04 15:46:29 +02:00
Martin Bornhold
ed4653ad21 pyro: Make request argument mandatory. 2016-07-04 15:44:15 +02:00
Martin Bornhold
20205cf371 pyro4: Create pyro proxy factory which returns instaces scoped by the request. 2016-07-04 16:35:03 +02:00
Marcin Lulek
81fbfe0335 frontend: topics implementation needs to live in CE edition 2016-07-04 16:13:43 +02:00
Daniel Dourvaris
a9d0598239 scm: change update_commit_cache to check revision as well 2016-07-04 16:13:53 +03:00
Daniel Dourvaris
dfa2ef3a7f scm: add tests for .mark_for_invalidation(delete=True) 2016-07-01 15:21:08 +03:00
Daniel Dourvaris
4915a005dc scm: clear the cs cache on delete/remap 2016-07-01 14:17:50 +03:00
Marcin Kuzminski
e060b2bdad i18n: updated messages catalog 2016-07-04 14:07:41 +02:00
Marcin Kuzminski
a1cfd451bb i18n-js: updated messages based on the new extractors 2016-07-04 14:07:03 +02:00
Marcin Kuzminski
83b9fcd4da release: merge back stable branch into default 2016-07-04 12:38:32 +02:00
Marcin Kuzminski
9bc6163776 release: Start preparation for 4.2.1 2016-07-04 10:18:21 +00:00
Marcin Kuzminski
7e84bfc9d7 login: fixed bad routing URL in comments, fixes #4065 2016-07-04 00:39:43 +02:00
Marcin Kuzminski
2ac185151d markdown: enable gfm globally 2016-07-01 17:47:59 +02:00
Marcin Kuzminski
4da05a5506 markdown: enable gfm by default, this is much standard now and we should use it instead of plain markdown 2016-07-01 13:41:14 +02:00
Daniel Dourvaris
ee2ad291ed celery: set global CELERY_ENABLED on any connection error 2016-06-30 19:38:31 +03:00
Marcin Kuzminski
605b26b460 i18n: replaced fragile extraction of JS translations from an _TM variable. 
We replaced it with similar to babel functions _gettext, and _ngettext, that
will prevent UI from breaking in case of untranslated strings. This
also will allow to use babel built in extractors to fetch the translations
stored inside html and JS.
 2016-07-03 23:52:22 +02:00
Marcin Kuzminski
b39ba081a2 i18n: added JS utils for translation. 2016-07-03 23:45:00 +02:00
Marcin Kuzminski
e100b79acc i18n: Update compiled message objects and js i18n files 2016-06-30 17:19:09 +00:00
Marcin Kuzminski
9e265f8e5b i18n: Pulled translation from Transifex 2016-06-30 17:19:01 +00:00
Marcin Kuzminski
4dec178f90 i18n: Updated message catalog template 2016-06-30 17:18:45 +00:00
Daniel Dourvaris
e99794cf94 ux: fix: last navigation menu's submenu was going off page to right 2016-06-30 00:52:07 +03:00
Marcin Kuzminski
42ba785d95 markdown: enable full githubFlavoredMarkdown 2016-06-29 00:51:18 +02:00
Daniel Dourvaris
46ab48ce5e celery: set global CELERY_ENABLED on any connection error 2016-06-30 19:38:31 +03:00
Marcin Kuzminski
a4db76818f release: Bump version 4.2.0 to 4.3.0 2016-06-30 17:24:14 +00:00
Martin Bornhold
58e7fa41ea css: Fix background and border color for panel-danger, panel-... classes. 2016-06-27 16:51:43 +02:00
Martin Bornhold
51c76d4cf7 admin: Use pyramid translation instead of pylons. 2016-06-29 09:52:34 +02:00
Martin Bornhold
2b5bd1c3a9 admin: Add helper to get the registry from requests. 2016-06-29 09:49:55 +02:00
Martin Bornhold
670d237f39 admin: Register and retrieve navigation registry from pyramids registry. 2016-06-29 08:52:55 +02:00
Martin Bornhold
e898f2e8a9 admin: Create interface to register/retrieve the admin navigation. 2016-06-29 08:24:57 +02:00