larshp
14fc9a2413
remove global _raise macro, close #298
2016-08-24 14:14:01 +00:00
Lars Hvam
5a3adbef95
PINF support, close #293 ( #294 )
...
* PINF added, #293
* backport
* more backport
2016-07-24 11:37:29 +02:00
larshp
ebb3768f05
bugfix, #292 2
2016-07-20 16:13:46 +00:00
larshp
de3c3e2bad
bugfix, #292
2016-07-20 15:44:50 +00:00
Lars Hvam
a1c64810ee
update screenshot
2016-07-16 12:32:50 +02:00
larshp
c71baec727
bugfix, error for new file to existing object
2016-07-15 12:22:17 +00:00
larshp
07e4a033ef
fix possible dump, branch overview
2016-07-14 11:13:39 +00:00
larshp
05477af7c5
new feature: delete branch
...
branch operations: overview create switch delete moved to new dropdown, instead of the "Advanced" dropdown
2016-07-14 10:50:43 +00:00
larshp
a6b14f627a
bugfix, merge logic
2016-07-14 10:05:05 +00:00
larshp
374b7810a0
more changed_by implemented
2016-07-14 08:51:27 +00:00
larshp
83008d77dd
lock error, move commit work
2016-07-14 07:57:54 +00:00
larshp
b7f686b353
better lock error message
2016-07-14 07:51:55 +00:00
larshp
7dab60b3a6
commit work to release locks
2016-07-14 07:43:13 +00:00
larshp
f7407fa2ce
better handle merge conflicts, and bugfix
2016-07-14 07:37:09 +00:00
Lars Hvam
c6a242bb38
Merge pull request #290 from sbcgua/master
...
small fixes: toc style, fix new repo dump, sort objects
2016-07-14 09:30:13 +02:00
atsy
1a0814e515
toc style, fix new repo dump
2016-07-14 10:17:34 +03:00
larshp
a749279426
downport fixes, close #289
2016-07-11 11:00:25 +02:00
larshp
cf2dcd5153
fix unpack not ok, close #288
2016-07-09 10:26:29 +00:00
larshp
f9c0e1ab3d
more changed_by implemented #245
2016-07-09 10:03:12 +00:00
larshp
07e5e4c05c
implement more changed_by, use constant
2016-07-09 08:45:17 +00:00
larshp
f288cddef8
background push, split commits by changed by user
...
#245
2016-07-09 07:51:15 +00:00
larshp
2b7b1290a9
fix dump when importing zip for offline project
2016-07-09 06:31:48 +00:00
larshp
8d20648c31
background mode, remove hardcoded values #245
2016-07-08 14:22:17 +00:00
larshp
9ba7c3af7d
fix PROG R TPOOL, close #287
2016-07-08 13:38:40 +00:00
Lars Hvam
9d0cbfb858
Merge pull request #286 from larshp/branch_vishnandr
...
Fix for CUA in FUGR (name)
2016-07-08 14:32:18 +02:00
VishnAndr
eeec335729
Fix for CUA in FUGR (name)
2016-07-08 14:59:37 +03:00
larshp
3023dc11ed
move background mode settings to repo menu
2016-07-08 11:29:35 +00:00
larshp
fafd02c8b0
changes to main page top toc
...
split toc by types(online/offline/background)
sort toc alphabetically
remove online actions from offline "Advanced" dropdown
2016-07-08 10:57:47 +00:00
larshp
00c1c36e32
move more popups, fix lint error
2016-07-08 10:05:33 +00:00
larshp
731029c037
switch to repo after creation
...
move popups to new separate class
2016-07-08 09:09:52 +00:00
larshp
9bec514fec
add method changed_by in objects interface #245
2016-07-08 08:28:04 +00:00
Lars Hvam
5e2991fc35
gui changes, close #283
...
- use top breadcrumb/toc to switch between repositories
* move main and background to new includes
* done, close #283
- hide/show feature removed
- refresh all freature removed
- error log moved to before file list
* minor changes
2016-07-08 09:33:57 +02:00
larshp
a2bd714ef2
PROG, clear LEVL
2016-07-07 15:20:11 +00:00
larshp
5a01c650ea
DOCV DOCT support added, close #152
2016-07-07 15:05:45 +00:00
larshp
bc0bfc651e
TABL clear additional fields, close #126
2016-07-07 13:16:39 +00:00
larshp
fc06a7a9e7
bugfix, show menu in case of errors
2016-07-07 12:56:34 +00:00
larshp
106008b04e
validate xml, close #246
2016-07-07 12:51:04 +00:00
Lars Hvam
0a57243e53
Update CONTRIBUTING.md
2016-07-07 14:21:51 +02:00
larshp
d033fbed29
split objects into multipe files, close #278
2016-07-07 12:19:57 +00:00
larshp
b8a8e8e65b
add diff link from staging page, close #279
...
bump version after merge feature added
2016-07-07 11:42:06 +00:00
Lars Hvam
5f7d851de5
Merging, close #275 ( #282 )
...
* refactor most regarding commit and staging
* use gitgraph 1.2.3
* move db gui to new include
* allow specifying branch
* move target branch to stage object
* git, get rid of reference to repo
* merge now working #275
cleanup
2016-07-07 13:23:28 +02:00
Lars Hvam
af74a24b6d
calculate merged tree #275 ( #277 )
...
* merge #275 , scaffolding
* refactoring few gui pages
top class element moved to page_super
* syle FORM dropdown
* find common ancestor
* calculate merged tree #275
2016-07-06 16:08:00 +02:00
larshp
b286a6c62e
branch overview: compress graph
...
plus cleanup a few code inspector warnings
2016-07-06 08:13:50 +00:00
larshp
a3a5388d63
branch overview, hide gh-pages and bugfix
2016-07-06 06:43:59 +00:00
larshp
58a3457d1e
WEBI, fix pull after initial pull
2016-07-06 06:20:36 +00:00
Lars Hvam
638306fc2d
Branch overview, close #272 ( #276 )
...
* few bits
* branches now shows
todo: show merges
* parse merge commits
* show merge commits
* lint: reduce line length
2016-07-05 17:03:13 +02:00
Lars Hvam
e81b47d6cd
Update CONTRIBUTING.md
2016-07-05 07:33:53 +02:00
larshp
928ffc0882
refactoring in the git classes, #272
2016-07-04 14:37:12 +00:00
larshp
e6742d3ad6
ignore character string warnings
2016-07-04 13:13:57 +00:00
larshp
12d7591906
WEBI fix
2016-07-04 11:37:16 +00:00