Commit graph

5 commits

Author SHA1 Message Date
Paulo Reis
3dda383d70 Use promise method signatures, instead of old HTTP service ones. 2017-06-20 16:04:06 +01:00
Paulo Reis
155f515a50 Use standard promises with the http service. 2017-06-20 11:50:23 +01:00
James Allen
52f3fe7303 Show different users changes in different colours 2016-10-20 12:15:22 +01:00
James Allen
9682af3981 Merge branch 'master' into ja-track-changes
Conflicts:
	public/coffee/ide/history/HistoryManager.coffee
2016-10-10 17:10:10 +01:00
James Allen
1c9abd35f8 Rename track-changes -> history on the client
Conflicts:
	app/views/project/editor/history.jade
2016-10-10 16:59:25 +01:00
Renamed from services/web/public/coffee/ide/track-changes/TrackChangesManager.coffee (Browse further)