github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity
6648 commits 3 branches 7 tags 221 MiB
Commit graph

28 commits

Author SHA1 Message Date
Shane Kilkelly
8be4279165 Fix a broken if-else-if statement 2018-05-25 10:56:32 +01:00
Shane Kilkelly
e33b7b1a49 Use waitFor when restoring a file in v2 history 2018-05-25 10:37:04 +01:00
James Allen
87cc08569a Fix bad if statement sending doc open into infinite loop 2018-04-16 17:03:18 +01:00
James Allen
9e525702c1 Merge branch 'master' into ja-restore-files 2018-04-16 16:14:31 +01:00
Jessica Lawshe
18c6802b84 Revert "Revert "Merge pull request #480 from sharelatex/jel-remove-old-exp"" 
This reverts commit 5c3f391041303456aeb800522c0fdcfe900625ac.
 2018-04-12 13:53:26 -05:00
Jessica Lawshe
5290c29ce1 Revert "Merge pull request #480 from sharelatex/jel-remove-old-exp" 
This reverts commit c5919be6d2e880ac4d3f5820c38211b1c88812ff, reversing
changes made to 3c8772cf020738c767b6f7a956bd002b47988932.
 2018-04-12 13:25:42 -05:00
Jessica Lawshe
be5f95ba69 Remove "history-discount" experiment 2018-04-12 10:18:15 -05:00
James Allen
11d47fcc31 Use updated project-history response format 2018-04-06 15:20:18 +01:00
James Allen
415be6b4e0 Open file after restoring 2018-04-06 10:30:13 +01:00
James Allen
0a1c543841 Hook up front end to restore documents 2018-04-06 10:30:13 +01:00
James Allen
4754f1e78a Use bare objects without prototypes for tracking filenames 2018-02-15 11:06:40 +00:00
James Allen
17a5dfa5a5 Inject v2 user details into project-history updates and diffs 2018-01-11 11:32:16 +00:00
James Allen
692182c784 Show apology message instead of raw binary files 2018-01-04 10:53:49 +00:00
James Allen
940b22ef95 Remove debug line 2017-12-20 16:42:09 +00:00
James Allen
d0fee7e76c Show a file tree of changed paths, so we can work with renamed and deleted files 2017-12-20 16:22:32 +00:00
James Allen
b4a5e5a041 Tidy up HistoryV2Manager 2017-12-19 13:58:47 +00:00
James Allen
8a3fadbfc1 Style the edit/add/rename options 2017-12-19 13:58:47 +00:00
James Allen
50b12e88a2 Add HistoryV2Manager alongside existing HistoryManager 2017-12-19 13:58:47 +00:00
James Allen
8ea779af58 Add some front end tests for HistoryManager 2017-12-19 13:58:47 +00:00
James Allen
4691a6e85c Get diffs showing in client 2017-12-19 13:58:47 +00:00
James Allen
a1615e6d84 Prototype of requesting history information by doc path, while tracking renames 2017-12-19 13:58:47 +00:00
Hayden Faulds
96a129a860 show user.name in history if available 2017-09-27 10:54:06 +01:00
Paulo Reis
9ffec6eb16 Correctly access response parameters. 2017-06-26 10:00:47 +01:00
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