Skip to content

Merge from old repo#1

Merged
jackycute merged 157 commits intomasterfrom
github
Nov 30, 2015
Merged

Merge from old repo#1
jackycute merged 157 commits intomasterfrom
github

Conversation

@jackycute
Copy link
Copy Markdown
Member

No description provided.

a60814billy and others added 28 commits January 7, 2015 03:13
…velop

# By Wu ChenHan
# Via Wu ChenHan
* 'develop' of bitbucket.org:a60814billy/hackboard:
  Updated sementic-ui to version 1.6.1
  Fixed modal not updated position after insert data
  Fixed issue contenteditable might not clear selection after blur
  Fixed contenteditable new line and selection issues
  Fixed ui-card cursor style and fixed a hurry type card bottom style
  Fixed page overflow-y and div height, ui-list-content sortable issue
  Fixed window resize and zoom list resize issue and remove unused code
…velop

# By Wu ChenHan
# Via Wu ChenHan
* 'develop' of bitbucket.org:a60814billy/hackboard:
  Updated stash list style
  Added stash and mock items
add task , add flow
avoid angular watch caused broadcast radiation
…into develop

Conflicts:
	app/assets/javascripts/view_controllers.coffee
* commit 'b5a77bea9d197c5dfe0dc24e18d95a05f5a1fd65':
  Remove unused script link
  Fixed stash drag item style

Conflicts:
	app/assets/javascripts/view_controllers.coffee
	app/views/view/board.html.erb
…velop

# By Wu ChenHan
# Via Wu ChenHan
* 'develop' of bitbucket.org:a60814billy/hackboard:
  Updated add member style and directive

Conflicts:
	app/assets/javascripts/view_controllers.coffee
* commit '47d4c8844da55b7ba581f136bff62c52f671bb85':
  Modified for login page previous page preventing.
update some code
jackycute added a commit that referenced this pull request Nov 30, 2015
@jackycute jackycute merged commit 6d83ad9 into master Nov 30, 2015
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.

4 participants