Skip to content

Jb transparent key#13

Open
joelbrock wants to merge 2914 commits intoWedgeCoop:masterfrom
CORE-POS:jb-transparent-key
Open

Jb transparent key#13
joelbrock wants to merge 2914 commits intoWedgeCoop:masterfrom
CORE-POS:jb-transparent-key

Conversation

@joelbrock
Copy link

tiny little UI improvement
just this, not the rest of it though...
1c53df7
still getting the hang of this pull request thingy

flathat and others added 30 commits May 17, 2013 02:54
Conflicts:
	fannie/auth/utilities.php
Conflicts:
	fannie/auth/utilities.php
Conflicts:
	fannie/mem/modules/Notes.php
Conflicts:
	fannie/mem/modules/Notes.php
Switch default database when requesting a new DB connection
Bad function call in MemDates controller
Table daterange widget correctly
Switch default database when requesting a new DB connection
Bad function call in MemDates controller
Table daterange widget correctly
gohanman and others added 29 commits August 21, 2013 09:23
Conflicts:
	pos/is4c-nf/ajax-callbacks/ajax-end.php
	pos/is4c-nf/ajax-callbacks/ajax-endorse.php
	pos/is4c-nf/gui-modules/memlist_cards.php
	pos/is4c-nf/lib/CoreState.php
	pos/is4c-nf/lib/DisplayLib.php
	pos/is4c-nf/lib/TransRecord.php
The scale reset is redundant; login2/login3 do it too
The scale reset is redundant; login2/login3 do it too
Ignore missing Preparser & Parser modules so they can
be deleted/disabled in real time
@gohanman gohanman deleted the jb-transparent-key branch August 11, 2014 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants