Wykres commitów

156 Commity (17106993ab57fb60a6d179d250af5885646387e2)

Autor SHA1 Wiadomość Data
Tim Robinson 9319cace3e Merge remote-tracking branch 'origin/master' into monitor-workspaces 2016-01-21 15:09:30 +00:00
Dana 7aa84e3fa8 Add extra guards for users without id or with old uid 2016-01-21 09:18:25 +00:00
Fabian Jakobs 53c3a2dcd1 Merge pull request +11685 from c9/prepare-load-balancing
Prepare load balancing
2016-01-20 16:54:19 +01:00
Fabian Jakobs 6113cb8b58 remove warning. this matches valid mbed url 2016-01-20 10:39:44 +00:00
Fabian Jakobs 06bc14b9af add unit test 2016-01-19 14:33:12 +00:00
Fabian Jakobs b6c0d9fd06 support both nameing schemes 2016-01-19 13:27:29 +00:00
Fabian Jakobs 1300bff8ab minor fixes 2016-01-19 10:50:19 +00:00
Matthijs van Henten 8ba4144d63 circumvent silly amd 2016-01-18 09:40:14 +00:00
Tim Robinson d39cc36b36 Changed block port retriving to get every project and display them instead 2016-01-13 22:53:19 +00:00
Nikolai Onken b16bc97546 Add referrefBy to identify 2016-01-13 14:15:05 +00:00
Matthijs van Henten 017e7630ed Merge pull request +11427 from c9/fix-issue-11379-git-urls
fixes +11379 we dont allow dangerous shell chars in scm urls ever
2016-01-06 12:02:25 +01:00
Matthijs van Henten ad867d45c1 fixes +11379 we dont allow dangerous shell chars in scm urls ever 2016-01-06 10:13:28 +00:00
Tim Robinson c4af4bdfc0 Adding frontend for monitor workspace 2016-01-06 01:15:54 +00:00
Tim Robinson 07626193fd Merge pull request +11401 from c9/delete-branches-containers
Don't backup branches containers
2016-01-05 12:43:11 -05:00
Tim Robinson 40430bf58a Using nc -z as portScanner fails in parallel. Moving gce script 2016-01-05 01:11:28 +00:00
Tim Robinson 16cea99a2c Add ci-helpers 2016-01-04 16:47:27 +00:00
Dana Ivan 7fb73c9c74 Standardizes user traits sent to analytics 2016-01-04 15:13:32 +00:00
Lennart kats 3b0c9f0151 Improve warning 2015-12-29 12:31:22 +00:00
Alex Brausewetter 32bfa5dc11 Add Google OAuth authentication 2015-12-28 08:08:04 -08:00
Dana a1179a9279 Fixes tracking for unauthorized users client-side 2015-12-09 11:06:28 +00:00
Dana e5e868339e some formatting changes 2015-12-08 11:56:38 +00:00
Dana e6cef5fe3b Reduces the uid checks - less warnings 2015-12-07 15:49:16 +00:00
Matthijs van Henten 4f5ac4a79c fix localBaseUrl for dogfood and rename it to internalBaseUrl 2015-11-25 11:28:52 +00:00
DanaIv acab297580 Merge pull request +10723 from c9/revert-10722-revert-10708-refactor-addtrait
[FIXME] Refactor addtrait
2015-11-24 15:48:35 +01:00
Matthijs van Henten 5c47170a0d Merge pull request +10725 from c9/api-available
Expose available as part of user quota
2015-11-24 10:02:18 +01:00
Matthijs van Henten 51f7bda3ec move available; expose available as part of user quota 2015-11-23 22:18:59 +00:00
Dana 48026f4b4b Fixes +10723 and adds extra tests 2015-11-23 20:00:22 +00:00
Lennart Kats a40ad9fe17 Revert "Revert "Refactor addtrait"" 2015-11-23 19:35:15 +01:00
Lennart Kats c1fdf4906a Revert "Refactor addtrait" 2015-11-23 19:34:46 +01:00
Matthijs van Henten 5572b4f101 fixes +10369 silence the warnings 2015-11-23 16:19:46 +00:00
Dana 134eeaf0fc Adds further filtering 2015-11-23 15:12:12 +00:00
Dana 94c568a532 Fixes regex and tests 2015-11-23 15:12:12 +00:00
Dana 973e6fc51d Changes signature of addTrait and adds filtering for test users 2015-11-23 15:12:01 +00:00
basdewachter 8cabf04221 reorder files 2015-11-03 22:33:47 +01:00
Fabian Jakobs 65a0dc39c8 Merge pull request +10145 from c9/fix-regexp-in-settings
Fix regexp in settings
2015-10-30 11:00:01 +01:00
Matthijs van Henten cf69b96a1a .test is more robust them match 2015-10-29 20:50:02 +00:00
Fabian Jakobs 0c280207fb cleanup 2015-10-29 15:18:16 +00:00
Fabian Jakobs 4c6eb793de extract into module 2015-10-29 15:13:31 +00:00
Fabian Jakobs b340c081af add unit tests for domain mappings 2015-10-23 13:02:16 +00:00
Fabian Jakobs 7e1613d4ab add user-content service 2015-10-23 13:00:32 +00:00
DanaIv 956aae8f1b Merge pull request +10017 from c9/fix-invalid-analytics-userid
Fix invalid analytics userid
2015-10-23 14:02:21 +02:00
Matthijs van Henten 9f2ecc3c3b Merge pull request +9896 from c9/fix-c9-url
restructure not to be architect plugin
2015-10-23 13:49:42 +02:00
Dana f0c944db31 some refactoring and add tests 2015-10-23 11:46:43 +00:00
Dana 08f9cae23a fix typo in internal domain check for email and add tests 2015-10-23 11:36:18 +00:00
DanaIv 95a576abea Merge pull request +9892 from c9/filter-test-accounts-client-side
Filter test accounts client side
2015-10-20 16:06:26 +02:00
Matthijs van Henten 6960ab7b0e Merge pull request +9895 from c9/fix-profile-base-url
Fix profile base url
2015-10-20 14:19:32 +02:00
Lennart Kats 5fa6a0ca78 Add documentation
or some attempt at documentation
2015-10-20 10:24:15 +02:00
Matthijs van Henten 01e56ab0af restructure not to be architect plugin 2015-10-19 22:30:12 +00:00
Dana 374205d1e3 Add further filtering client side 2015-10-19 16:22:43 +00:00
Fabian Jakobs 043984c8e1 Revert "Put user content on a different domain" 2015-10-19 17:22:19 +02:00
Fabian Jakobs cfeb3724bc Merge pull request +9793 from c9/user-domain
Put user content on a different domain
2015-10-19 13:47:02 +02:00
Tim Robinson 30ea37fecf Merge pull request +9668 from c9/workspace-not-found
Log out whether the user is logged in when Workspace not found error occurs
2015-10-16 15:50:56 +02:00
Dana f7ed5dff99 Rename blacklist file to something more descriptive 2015-10-15 12:13:29 +00:00
Dana 53a222db34 Fix function export error 2015-10-15 08:21:18 +00:00
Dana d39a09dcc1 fix tests 2015-10-14 15:46:27 +00:00
Fabian Jakobs b0e10d15b5 secure redirect 2015-10-14 14:53:53 +00:00
Fabian Jakobs 8224fb8c66 add user content moved page 2015-10-14 13:31:30 +00:00
Dana 30853212c7 move internal domain check outside analytics 2015-10-14 10:22:36 +00:00
Fabian Jakobs 95012eb90a add to makefile 2015-10-13 11:56:55 +00:00
Tim Robinson 4054d149b2 oberr is just a function 2015-10-01 10:42:51 +00:00
Tim Robinson 54fa807ed2 Turned oberr into a seperate module so we can use it client side 2015-10-01 10:40:17 +00:00
Harutyun Amirjanyan 2ee3cbf307 Revert "Revert "Fix various sdk issues"" 2015-09-04 12:24:07 +04:00
Alex Brausewetter 1fa1c01ddd Revert "Fix various sdk issues" 2015-09-03 15:59:24 -07:00
nightwing 220c267e44 fix loading pty.js in local version 2015-09-03 12:42:40 +04:00
Lennart Kats ae6e89f36b Merge pull request +8808 from c9/fix-sdk
Fix missing node_module error in sdk and add test
2015-08-21 13:56:44 +02:00
nightwing 31dbc16d90 ensure we never use node_modules outside of root dir 2015-08-19 20:14:52 +04:00
Fabian Jakobs 24748e5f53 link to github 2015-08-19 12:02:36 +00:00
Fabian Jakobs 8c86f46c25 Revert "Use open for repos" 2015-08-18 12:21:10 +02:00
Fabian Jakobs 6dfec5299b fix ssh check 2015-08-17 09:15:08 +00:00
Lennart Kats 7431dee3de Only show git login/signup for supported domains 2015-08-01 12:55:23 +00:00
Fabian Jakobs 9fca7a6cd3 rewrite URL and let proxy listen on port 80 2015-07-21 14:12:47 +00:00
Lennart kats b232c0d1e8 Fix undefined.replace() 2015-07-02 12:07:50 +00:00
Lennart kats 4477a5f124 Fix circular json error 2015-07-01 08:44:44 +00:00
Lennart kats ea585fd0e8 Fix not passing host 2015-07-01 08:20:12 +00:00
Lennart kats 15742463d0 Work on multi-domain support in IDE and apps-proxy 2015-07-01 07:50:36 +00:00
Lennart kats 959d6c275d Fix broken cookie 2015-07-01 07:50:36 +00:00
Lennart kats eabf2027c5 Make ide opening flow partly aware of multiple domains 2015-07-01 07:50:36 +00:00
Lennart kats e252cb3a18 Add multi-domain support to most of the sign-in flow 2015-07-01 07:50:36 +00:00
Lennart kats aaeceb921f Make profile client multi-domain aware 2015-07-01 07:50:35 +00:00
Lennart kats 9eeccd6d05 Make profile multi-domain aware 2015-07-01 07:50:35 +00:00
Lennart kats 23f3e6e809 Extend urls.js 2015-07-01 07:50:35 +00:00
Lennart kats d19366c653 Move urls into node_modules/c9 2015-07-01 07:50:34 +00:00
nightwing 5d404b50fe fix handling of root modules in setup_paths 2015-06-29 19:38:48 +04:00
Lennart kats a74faf23a8 Restore setup_paths.js 2015-06-28 13:12:11 +00:00
Lennart kats 6dd0764e91 Make sure generated tokens are never valid JavaScript 2015-06-25 10:47:30 +00:00
Fabian Jakobs 429814667d cleanup 2015-06-16 12:52:21 +00:00
Fabian Jakobs 999f0a08b0 Merge remote-tracking branch 'origin/master' into clone-workspaces
Conflicts:
	plugins/c9.api.project/resize.js
	plugins/c9.api.project/resize_test.js
	plugins/c9.api.project/routes.js
	plugins/c9.db.redis/user_test.js
	plugins/c9.docker/d9/archive.sh
	plugins/c9.docker/d9/backup.sh
	plugins/c9.docker/d9/check.sh
	plugins/c9.docker/d9/d9.sh
	plugins/c9.docker/daemon.js
2015-06-16 10:46:08 +00:00
Lennart kats 00f48eb9ab Store internal IP in docker host 2015-06-10 16:08:10 +00:00
Fabian Jakobs 60360f8598 document req timeout 2015-05-29 08:50:49 +00:00
Fabian Jakobs aac904b65e add timeout handler to rest client 2015-05-28 12:35:12 +00:00
Tim Robinson ee44507ced Misc restore fixes to fix large restores failing 2015-05-12 10:11:14 +00:00
Tim Robinson e592c05f74 Adding error logging to raygun for failed cloning. Fixed bugs with registering project api functions 2015-04-24 13:52:40 +00:00
Fabian Jakobs cb368e4ab9 fix scm detection for specific git urls 2015-04-02 08:40:49 +00:00
Fabian Jakobs 298c5518f1 fix c9/ssh 2015-03-31 13:42:17 +00:00
Fabian Jakobs 61c7ae04b8 rename git_url_parse into scm_url_parse and make it more generic 2015-03-31 13:34:03 +00:00
Fabian Jakobs 80867587eb cleanups 2015-03-17 10:22:41 +00:00
Fabian Jakobs f1b14e0117 fix datadog test 2015-03-17 09:55:49 +00:00
Matthijs van Henten 9f09732f15 gets rid of warnings, update to current version 2015-03-10 10:35:39 +00:00
Lennart Kats 3f2dd4cf25 Revert "Revert "Merge pull request +6023 from c9/profile-integration""
This reverts commit e6fc5d467d.
2015-03-05 09:54:49 +01:00
Lennart Kats e6fc5d467d Revert "Merge pull request +6023 from c9/profile-integration"
This reverts commit 584e691a3f, reversing
changes made to 7af49ff62b.

Conflicts:
	configs/monitor.js
	scripts/makestatic.js
	scripts/makestatic.sh
2015-02-27 14:26:25 +01:00