Граф коммитов

43 Коммитов

Автор SHA1 Сообщение Дата
morsh cabe8ea1ee fix info drawer to float instead of blocking the screen 2017-07-12 11:10:29 +01:00
morsh 1eec04396a update build process 2017-07-11 17:47:32 +01:00
Mor Shemesh ab178340d0 Merge pull request #231 from CatalystCode/moving-layouts
moving layouts from config to base
2017-07-06 14:32:53 +03:00
morsh 0d7e0828d0 adding dashboard categories 2017-07-04 16:10:21 +03:00
morsh 11effc1b6e moving layouts from config to base 2017-07-04 15:03:27 +03:00
morsh 91fc91192c update yarn lock 2017-07-04 14:47:44 +03:00
deadlyfingers 2a7424ce07 hotfix: includes fullpage dialog scroll fix 2017-07-04 11:42:54 +01:00
Itye 8b39cbc727 Merge branch 'ibex-version-1.0' into itye/ibex-version-1.0-deletion-merge
# Conflicts:
#	server/routes/api.js
2017-07-04 11:01:28 +03:00
David Douglas 18b7671a1e Using state for value rather than component method 2017-07-03 14:55:14 +01:00
David Douglas f5304fcd74 Merge with latest changes in v1 2017-07-03 14:34:20 +01:00
Itye 55ba48be99 Merge branch 'issue_66_Enable_dashboards_deletion_API_UX' into itye/ibex-version-1.0-deletion-merge
# Conflicts:
#	client/src/actions/ConfigurationsActions.ts
2017-07-03 16:20:48 +03:00
Elad Iwanir eb7b934071 fix lint errors 2017-07-03 15:21:44 +03:00
Elad Iwanir aadb1dcf1b Fixing a bug in GetFileById 2017-07-03 14:42:44 +03:00
David Douglas c5c68518d1 Ace Editor and copy command 2017-07-03 11:22:58 +01:00
David Douglas bb893b1e5c Merge client/src 2017-07-03 10:55:32 +01:00
Elad Iwanir 8bbd890976 moving the import button up 2017-07-03 12:54:14 +03:00
Elad Iwanir 630d2d9d6f minor change 2017-07-03 12:54:14 +03:00
Elad Iwanir 1b53f55da1 changing variable name from file to ImportedFileName 2017-07-03 12:54:14 +03:00
Elad Iwanir b26b48b730 changes according to review 2017-07-03 12:54:13 +03:00
Elad Iwanir f9fc537bf7 changing the import command to be a PUT command 2017-07-03 12:54:13 +03:00
Elad Iwanir 8d6d29fc53 aligning the import button to the right + changing the fileupload accept type to 'application/javascript' 2017-07-03 12:54:13 +03:00
Elad Iwanir a5658b8034 moving the import button into the dashboard HOME component 2017-07-03 12:54:13 +03:00
Elad Iwanir 0eefe6ea71 Adding export dashboard feature 2017-07-03 12:53:36 +03:00
Elad Iwanir 3e31663de1 Import dashboard:
Added an 'import dashboard' feature to load a text file into IBEX
2017-07-03 12:53:35 +03:00
Elad Iwanir 8f4ecc2889 Merge branch 'ibex-version-1.0' into eladiw_importDash 2017-07-03 07:49:22 +03:00
Mor Shemesh 0ef663d8be Merge pull request #214 from CatalystCode/fix-cs-telemetry-link
removing excess files, other PRs take care of this
2017-07-02 18:36:51 +03:00
morsh 30eba31ed3 update temp ==> tmpl 2017-07-02 17:57:40 +03:00
morsh 66f5a012d1 removing excess files, other PRs take care of this 2017-07-02 17:52:44 +03:00
morsh 1bf5d2d541 updating descriptions 2017-07-02 17:00:41 +03:00
Elad Iwanir b8559c4871 minor change 2017-07-02 14:32:10 +03:00
Elad Iwanir aa6377a926 changing variable name from file to ImportedFileName 2017-07-02 13:55:30 +03:00
Elad Iwanir bd8bf2f493 changes according to review 2017-07-02 13:48:00 +03:00
Elad Iwanir 1eedd401a5 changing the import command to be a PUT command 2017-07-02 13:31:51 +03:00
Elad Iwanir 53f5b4648a aligning the import button to the right + changing the fileupload accept type to 'application/javascript' 2017-07-02 11:31:18 +03:00
Elad Iwanir 46f7095203 moving the import button into the dashboard HOME component 2017-06-29 22:23:46 +03:00
Elad Iwanir 4cf46242c6 Merge branch 'ibex-version-1.0' of https://github.com/CatalystCode/ibex-dashboard into eladiw_importDash 2017-06-29 19:13:37 +03:00
Elad Iwanir 67d3d31adb update yarn.lock 2017-06-29 15:44:01 +03:00
Elad Iwanir d2e96897d0 fixing wrong reference in all of precondigured dashboards 2017-06-29 15:28:24 +03:00
Elad Iwanir 6d5a387532 added package-lock.json (server and client) 2017-06-29 14:26:08 +03:00
Elad Iwanir 388a163275 merge of client - server seperation with ibex-version-1.0 2017-06-28 19:48:23 +03:00
Clemens Wolff 528d07327f Port fix for compiler warnings 2017-06-15 10:21:11 +02:00
Clemens Wolff 47568afcd8 Remove auto-generated CSS 2017-06-14 16:49:39 +02:00
Clemens Wolff 02842cda75 Split client/server packages 2017-06-14 12:38:35 +02:00