Wykres commitów

1006 Commity (527ece8c9a3b8c14c43adbe31f4669c4c066ce0f)

Autor SHA1 Wiadomość Data
Ruben Daniels 11a5af9fce Merge pull request +10610 from c9/revert-10609-revert-10468-fix/loading-screen
Restore "New adaptive loading screen"
2015-11-26 05:24:45 -08:00
Ruben Daniels 6b6e74fd67 Merge pull request +10751 from c9/fix/various
Fix c9 open
2015-11-26 05:14:40 -08:00
nightwing 9ab693af9b do not break tree menu if c9.readonly is undefined 2015-11-26 01:19:02 +04:00
nightwing 223b4dfcc4 Revert "Merge branch 'master' of github.com:c9/newclient"
This reverts commit 4c3e3af194, reversing
changes made to c2ab338d29.
2015-11-25 17:50:26 +04:00
nightwing 4c3e3af194 Merge branch 'master' of github.com:c9/newclient 2015-11-25 16:52:55 +04:00
nightwing 099ac56457 open file in all connected ides 2015-11-25 14:56:50 +04:00
Ruben Daniels 90ea21381a show branch in log 2015-11-24 16:41:44 +00:00
Matthijs van Henten d980692c30 blacklist more tests 2015-11-23 16:07:11 +00:00
Matthijs van Henten 0886ad47bf disables a test that times out a lot 2015-11-23 15:44:35 +00:00
Matthijs van Henten 16be016d0b remove flaky test 2015-11-23 15:20:32 +00:00
Fabian Jakobs f18077cd9b fix: Cannot call method 'setUser' of undefined
fixes https://github.com/c9/newclient/issues/10691
2015-11-23 11:41:21 +00:00
Ruben Daniels 6dc9e37db4 Add moved json-stream.js 2015-11-20 22:14:34 +00:00
Ruben Daniels def889f732 Move status parsing to git 2015-11-20 22:14:06 +00:00
Tim Robinson acacbc4ae4 Increasing test timeout of metadata_test 2015-11-20 21:26:01 +00:00
Tim Robinson 3b50f576de Increasing test timeouts 2015-11-20 19:54:47 +00:00
Ruben Daniels 4e5f32395e Merge branch 'master' of github.com:c9/newclient into feature/scm 2015-11-20 19:52:10 +00:00
Fabian Jakobs a49de556c2 fix logout 2015-11-20 09:38:37 +00:00
Ruben Daniels 37f7a454f5 Add a commit dialog and integrate with commit button 2015-11-20 01:02:17 +00:00
Ruben Daniels 44332321fd Merge branch 'master' of github.com:c9/newclient into feature/scm
Conflicts:
	plugins/c9.ide.server/views/flat-load-screen.html
	plugins/c9.ide.server/views/load-screen.ejs
2015-11-19 21:42:17 +00:00
Ruben Daniels 33f0390701 move things to hideLoader 2015-11-19 20:17:21 +00:00
Ruben Daniels 296052a5e9 remove the need for keyframes.css 2015-11-19 20:13:37 +00:00
Ruben Daniels 95742ea433 Added missing files and WIP localchanges dialog 2015-11-19 19:52:14 +00:00
Ruben Daniels 6307de10df update css 2015-11-19 19:47:00 +00:00
Ruben Daniels 10a52ff2aa use document.body and don't use DOM events 2015-11-19 19:39:26 +00:00
Ruben Daniels 178c5955a2 missing file 2015-11-19 19:35:49 +00:00
Ruben Daniels 1e8dce6ed9 rename to loading.css 2015-11-19 19:35:20 +00:00
nightwing 20c78516d7 update markdown lib name 2015-11-19 18:22:06 +00:00
Harutyun Amirjanyan f62fee2a98 Revert "Revert "New adaptive loading screen"" 2015-11-19 15:01:50 +04:00
Harutyun Amirjanyan abe54f8a28 Revert "New adaptive loading screen" 2015-11-19 14:47:02 +04:00
Ruben Daniels 715f06a3f8 Delete branches 2015-11-18 23:22:19 +00:00
Ruben Daniels 22205c133a Delete remote branches. Keep filter when refreshing 2015-11-18 23:00:11 +00:00
Ruben Daniels 86c944c46c styling for the switcher button 2015-11-18 22:09:01 +00:00
Ruben Daniels 1ded4a2872 Add variable height rows 2015-11-18 19:09:20 +00:00
nightwing d02c48e7bf fix preview in standalone version 2015-11-18 22:28:27 +04:00
Ruben Daniels a92e104a95 Merge pull request +10477 from c9/revert-10476-revert-markdown
Restore new markdown preview
2015-11-18 10:18:57 -08:00
Ruben Daniels 1b15868de1 Merge branch 'master' of github.com:c9/newclient into feature/scm 2015-11-18 18:11:24 +00:00
Lennart Kats 2469d9cc37 Merge pull request +10468 from c9/fix/loading-screen
New adaptive loading screen
2015-11-18 18:08:31 +01:00
Ruben Daniels 4cf70e9a56 Merge branch 'master' of github.com:c9/newclient into feature/scm
Conflicts:
	.c9/project.settings
2015-11-18 16:44:12 +00:00
Ruben Daniels ad3b6aa5f4 Merge branch 'master' of github.com:c9/newclient into revert-10476-revert-markdown
Conflicts:
	.c9/project.settings
2015-11-18 16:24:48 +00:00
Lennart Kats dd223c8d38 Merge pull request +10552 from c9/improve-dogfooding
Better, faster dogfooding
2015-11-18 15:46:08 +01:00
Lennart Kats 4d53f45d8f More ports! 2015-11-18 08:29:11 +00:00
Ruben Daniels 712dd7bd22 Merge branch 'master' of github.com:c9/newclient into feature/scm 2015-11-17 15:50:44 +00:00
Fabian Jakobs 9a04db6908 Merge pull request +10415 from c9/vfs-worker-raygun
VFS worker raygun
2015-11-17 16:37:14 +01:00
Lennart Kats 2da803b9db Serve unpacked content over 3 ports 2015-11-17 11:40:34 +00:00
Ruben Daniels eb2c5fcd2c Merge branch 'master' of github.com:c9/newclient into feature/scm
Conflicts:
	.c9/project.settings
2015-11-16 23:38:16 +00:00
Ruben Daniels 5c4c65e82e Committer mode with filtering 2015-11-16 20:14:06 +00:00
Ruben Daniels d5b1a42bed Added filtering to branches panel 2015-11-16 05:11:51 +00:00
Ruben Daniels 9d87d18f55 Add new branches panel 2015-11-16 02:19:46 +00:00
Ruben Daniels 31bfccd308 Add setting for project path find in files. Fixes +3655 2015-11-14 01:45:12 +00:00
Ruben Daniels 57ec419e86 don't expect e to be defined 2015-11-14 01:26:30 +00:00