23 commits

Author	SHA1	Message	Date
Paulo Reis	8e5032fb34	Merge branch 'master' into pr-v2-history-ui	2018-06-05 10:55:42 +01:00
Paulo Reis	7cb4280a4d	Remove commented-out code.	2018-05-30 15:18:15 +01:00
Shane Kilkelly	105d858155	Move waitFor into an angular service	2018-05-25 13:02:58 +01:00
Shane Kilkelly	cfc17d56e8	Use a promise (with Angular's $q) in waitFor	2018-05-25 11:42:13 +01:00
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
Paulo Reis	fb33fc6c30	Add loading indicators; handle binary files; keep selected file across points in time.	2018-05-23 12:14:27 +01:00
Paulo Reis	81c93e11d0	History file tree integration with the backend.	2018-05-21 15:13:34 +01:00
Paulo Reis	a716f9ccd3	Integrate history file tree in the UI.	2018-05-21 15:12:47 +01:00
Paulo Reis	9f6dc12658	Add custom styling; add code to handle point-in-time selection.	2018-05-01 17:27:51 +01:00
Paulo Reis	8249f4e17e	Wrap copies of existing history UI elements in components.	2018-04-27 11:22:20 +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	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	17a5dfa5a5	Inject v2 user details into project-history updates and diffs	2018-01-11 11:32:16 +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	155f515a50	Use standard promises with the http service.	2017-06-20 11:50:23 +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