github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-23 02:55:13 -04:00
Code Issues Projects Releases Packages Wiki Activity
19809 commits 3 branches 7 tags 188 MiB
Commit graph

19809 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Allen
88699491c7 Merge pull request #13 from sharelatex/ja-delete-refactor 
Include deleted docs when archiving
 2016-12-06 15:08:17 +00:00
Paulo Reis
6a9ab1f525 Style adjusments; make announcements close when backdrop is clicked. 2016-12-06 14:17:30 +00:00
Shane Kilkelly
a5d2183441 if Recurly error, parse body xml rather than using regex match 2016-12-06 10:39:59 +00:00
Shane Kilkelly
58280bf6ee Merge branch 'master' into sk-user-delete-with-cancelled-sub 2016-12-06 09:31:42 +00:00
James Allen
6fa8b89154 Be explicit about the data we return from mongo 2016-12-05 17:27:31 +00:00
James Allen
a6ec672d84 Merge branch 'ja-delete-refactor' into ja-track-changes 
Conflicts:
	test/acceptance/coffee/ArchiveDocsTests.coffee
 2016-12-05 16:58:29 +00:00
James Allen
3d195de3e9 Improve testing of archiving and be explicit about include_deleted parameter 2016-12-05 16:48:01 +00:00
James Allen
7717625534 Include deleted docs when archiving 2016-12-05 16:31:51 +00:00
James Allen
2985cb587a Add tests for RangeManager 2016-12-05 15:38:38 +00:00
Paulo Reis
a00acd7458 Add animations and state toggling. 2016-12-05 15:32:38 +00:00
James Allen
b8a97731e4 Merge branch 'master' into ja-track-changes 
Conflicts:
	test/acceptance/coffee/GettingAllDocsTests.coffee
 2016-12-05 14:58:57 +00:00
James Allen
bd5086c054 Don't return deleted docs with all project docs 2016-12-05 14:37:44 +00:00
James Allen
0a65a5eabf Set and get ranges along with lines 2016-12-05 14:21:49 +00:00
James Allen
ca96d168dd Make attributes that can be set in mongo flexible 2016-12-02 15:22:08 +00:00
James Allen
144bae3a55 Add an error guard around the version being present 2016-12-02 15:17:38 +00:00
Shane Kilkelly
06c9ebdd72 Add updateUserDetailsOnLogin options to ldap and saml. 2016-12-02 15:12:57 +00:00
James Allen
ab527c3c5d remove code left over from migration 2016-12-02 15:02:54 +00:00
Shane Kilkelly
afcd6b9f53 Add a dummy rollback, clean up. 2016-12-02 14:12:52 +00:00
Shane Kilkelly
e2570a06d2 Merge branch 'master' into sk-user-features 2016-12-02 14:01:46 +00:00
Shane Kilkelly
cc878e4caf Add an update_user_features migration. 2016-12-02 14:01:19 +00:00
James Allen
3ea2e07993 Add tests for fetching and flushing track changes entries to persistence layer 2016-12-02 12:01:23 +00:00
James Allen
418405e8b9 Return track changes entries in HTTP request 2016-12-02 11:37:27 +00:00
James Allen
4fadd75ef3 Track changes based on flag on op, not global setting 2016-12-02 11:04:21 +00:00
James Allen
f43355b74d Fix UpdateManager tests 2016-12-01 18:19:47 +00:00
James Allen
ce93a76e7f Fix ShareJsUpdateManager tests 2016-12-01 18:11:03 +00:00
James Allen
e7ff05e792 Fix UpdateManager tests 2016-12-01 18:06:33 +00:00
James Allen
889f5fdf9f Fix ShareJsDB tests 2016-12-01 17:14:40 +00:00
James Allen
b6c93c718d Update TrackChangesManagerTests -> HistoryManagerTests 2016-12-01 16:50:55 +00:00
James Allen
d878dd5758 Fix RedisManagerTests 2016-12-01 16:49:53 +00:00
James Allen
9ee913be39 Update PersistenceManagerTests 2016-12-01 16:40:15 +00:00
James Allen
fb39e37fe0 Update DocumentManager tests 2016-12-01 16:27:40 +00:00
James Allen
d36f1a86f1 Merge branch 'master' into ja-track-changes 
Conflicts:
	app/coffee/PersistenceManager.coffee
 2016-12-01 16:06:13 +00:00
James Allen
d518b93902 Merge pull request #12 from sharelatex/ja-no-mongo 
Set version via docstore, not directly in mongo
 2016-12-01 14:48:52 +00:00
James Allen
3da4c104c2 Merge pull request #380 from sharelatex/ja-set-version-in-docstore 
Proxy version number to and from docstore
 2016-12-01 09:59:12 +00:00
James Allen
48cc5a992f Merge branch 'master' into ja-set-version-in-docstore 2016-12-01 09:30:53 +00:00
Shane Kilkelly
e03d16e0cd Deleting user: if subscription is already cancelled, ignore and proceed. 2016-11-30 16:03:18 +00:00
James Allen
dcc9a5de32 Merge pull request #382 from sharelatex/sk-spellcheck-underline-retina 
Sk spellcheck underline retina
 2016-11-30 15:51:34 +00:00
James Allen
34276520d8 Merge pull request #379 from sharelatex/sk-show-user-email 
Add a `user_email` option to the nav "Account" dropdown.
 2016-11-30 15:49:34 +00:00
James Allen
ddb956a647 Merge pull request #381 from sharelatex/sk-roll-sessions 
Add the `rolling` option to session
 2016-11-30 15:48:53 +00:00
James Allen
e156d8017c Be explicit in version filter 2016-11-30 15:29:43 +00:00
James Allen
9b0cef808a Merge pull request #12 from sharelatex/ja-set-version-in-docstore 
Don't look up version in mongo if not needed
 2016-11-30 15:27:59 +00:00
James Allen
8b95a04a36 Don't look up version in mongo if not needed 2016-11-30 15:08:56 +00:00
Shane Kilkelly
e081409b09 Update to modern images 2016-11-30 14:34:50 +00:00
James Allen
0677bcb110 Merge pull request #11 from sharelatex/ja-set-version-in-docstore 
Set version in docstore, not doc-updater
 2016-11-30 14:28:11 +00:00
Shane Kilkelly
ef115e2f91 add a 2x version of the spellcheck-underline image. 2016-11-30 11:25:47 +00:00
Shane Kilkelly
d38890e9f4 Add the rolling option to session 2016-11-30 09:41:58 +00:00
James Allen
7ede096903 Merge branch 'master' into ja-set-version-in-docstore 2016-11-29 17:24:53 +00:00
James Allen
eb648b9bc8 Proxy version number to and from docstore 2016-11-29 17:16:56 +00:00
James Allen
efab68e6b2 Add in guards on bad data from web API 2016-11-29 17:13:16 +00:00
James Allen
546d9e9cee Remove left over test 2016-11-29 17:13:07 +00:00