3572 Commits

Author SHA1 Message Date
Ruben Daniels
e6604acbc3 update todo 2015-11-23 14:07:55 +00:00
Ruben Daniels
f2ff2818de Merge branch 'feature/scm' of github.com:c9/newclient into feature/scm 2015-11-23 06:21:22 +00:00
nightwing
9050f6f85f show log in the middle 2015-11-23 04:13:23 +04:00
Ruben Daniels
40da2dba40 Merge branch 'feature/scm' of github.com:c9/newclient into feature/scm 2015-11-22 20:34:58 +00:00
nightwing
d2d08e1fb1 fix log view columns 2015-11-23 00:33:48 +04:00
Ruben Daniels
1115cc4e92 Implement menu functions of commit menu 2015-11-22 20:12:06 +00:00
Ruben Daniels
ba1d78baf1 Add syncing 2015-11-22 19:59:35 +00:00
Ruben Daniels
5287d4c6be Add syncing 2015-11-22 19:57:43 +00:00
Ruben Daniels
f01bc41639 Add syncing 2015-11-22 19:56:44 +00:00
Ruben Daniels
d540f8d7dc Hit enter to check out branch 2015-11-22 19:34:37 +00:00
nightwing
5f1dce444b fix unnecessary indentation in log view 2015-11-22 20:56:32 +04:00
Ruben Daniels
459934ecda Make the log viewer work again. 2015-11-21 00:44:44 +00:00
Ruben Daniels
3f19e73f0a Merge branch 'feature/scm' of github.com:c9/newclient into feature/scm 2015-11-21 00:39:40 +00:00
Ruben Daniels
ef8abf7fa4 Add dynamic button caption 2015-11-21 00:33:14 +00:00
Ruben Daniels
701e18f991 Add dynamic button caption 2015-11-21 00:32:40 +00:00
Ruben Daniels
265c306fdc Add dynamic button caption 2015-11-21 00:30:41 +00:00
nightwing
7fa1c60fba tweak log view 2015-11-21 04:29:37 +04:00
Ruben Daniels
49bfcb87fe Add listening service for git status 2015-11-21 00:10:49 +00:00
Ruben Daniels
bcfa932010 Add listening service for git status 2015-11-21 00:09:16 +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
Ruben Daniels
4e5f32395e Merge branch 'master' of github.com:c9/newclient into feature/scm 2015-11-20 19:52:10 +00:00
Ruben Daniels
61c3ad27e3 update todo 2015-11-20 19:51:31 +00:00
c9bot
36c769d894 c9-auto-bump 3.1.470 2015-11-20 16:05:49 +01:00
c9bot
57da6d0abc c9-auto-bump 3.1.469 2015-11-20 16:05:09 +01:00
c9bot
7ea04ba4c1 c9-auto-bump 3.1.468 2015-11-20 15:44:00 +01:00
c9bot
20e86f0cfc c9-auto-bump 3.1.467 2015-11-20 15:06:14 +01:00
c9bot
a7340d164d c9-auto-bump 3.1.466 2015-11-20 13:44:06 +01:00
Nikolai Onken
cbaaa5333b Merge pull request +10651 from c9/test-split
Divide SF tests to workflow and ide
2015-11-20 13:43:49 +01:00
basdewachter
c825dd4900 ignore cfresult files 2015-11-20 12:48:58 +01:00
c9bot
5bc2d4cb23 c9-auto-bump 3.1.465 2015-11-20 12:42:34 +01:00
c9bot
c9f4644341 c9-auto-bump 3.1.464 2015-11-20 12:32:05 +01:00
c9bot
7a202780b0 c9-auto-bump 3.1.463 2015-11-20 11:32:35 +01:00
c9bot
9e3661cf3a c9-auto-bump 3.1.462 2015-11-20 11:15:45 +01:00
c9bot
eadccbcd17 c9-auto-bump 3.1.461 2015-11-20 10:49:05 +01:00
Fabian Jakobs
a49de556c2 fix logout 2015-11-20 09:38:37 +00:00
c9bot
5c7da14367 c9-auto-bump 3.1.460 2015-11-20 09:54:28 +01:00
Ruben Daniels
9ee758d7d0 Yay! 2015-11-20 02:19:53 +00:00
Ruben Daniels
3d74a9e9d4 Working button... would've used amend if that was implemented :) 2015-11-20 01:56:08 +00:00
Ruben Daniels
af88c8a103 Close after committing 2015-11-20 01:34:34 +00:00
Ruben Daniels
d32b9bf14b Auto add and commit when no staged files 2015-11-20 01:33:50 +00:00
Ruben Daniels
0b45cf659f Additional fixes for committing 2015-11-20 01:04:13 +00:00
Ruben Daniels
37f7a454f5 Add a commit dialog and integrate with commit button 2015-11-20 01:02:17 +00:00
Ruben Daniels
27ffcf4c9e Allow stage manipulation for scm button 2015-11-19 23:34:06 +00:00
c9bot
51bd0dd55d c9-auto-bump 3.1.459 2015-11-19 23:55:13 +01:00
c9bot
9da2e496fd c9-auto-bump 3.1.458 2015-11-19 23:44:07 +01:00
c9bot
094fa73361 c9-auto-bump 3.1.457 2015-11-19 23:08:26 +01:00
c9bot
c2a0e99f07 c9-auto-bump 3.1.456 2015-11-19 23:06:07 +01:00
Ruben Daniels
44df05cbf4 optimization 2015-11-19 21:51:37 +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