Skip to content

Conversation

@devimust
Copy link
Owner

@devimust devimust commented Jun 1, 2016

No description provided.

devimust added 16 commits June 1, 2016 21:30
* master: (26 commits)
  Remove chrome plugin code as it's now available inside its own repo.
  Get gulp to build clean with no errors/warnings in travis.
  Fix missing sudo to install gulp globally for travis build.
  Now try with nodesource apt-get.
  Load node v4 manually in travis.
  Try to get travis to play nicely with php and nodejs.
  Add npm and gulp commands to composer post install.
  Add editorconfig file.
  Add translation files for french.
  Add translate for login page.
  Translate user form.
  Update admin main page translation.
  Make user unique in auth controller.
  Update translation for api controllers.
  Translate button.
  Make user name unique.
  Add translation in laravel parts, form and messages.
  update french translation file.
  Update translate in controllers.
  Update message translation.
  ...

Conflicts:
	.gitignore
	.travis.yml
	public/css/bootstrap-darkly.css
	public/css/bootstrap-default.css
	public/css/bootstrap-sandstone.css
	public/css/bootstrap-united.css
	public/css/bootstrap-yeti.css
	public/css/vendor.css
	public/js/vendor.js
	public/views/bookmark-view.html
	resources/views/auth/login.blade.php
* master:
  Fix bug on gulp production due to minify JS file.
  Upate login.
  Add demo link
* master:
  Use native language detector, with angular-translate detect method - referencing PR #25.
@devimust devimust changed the title Add selenium automation support to run on travis Add e2e automation support to run on travis Nov 6, 2016
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.

2 participants