github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-17 20:51:13 -05:00
Code Issues Projects Releases Packages Wiki Activity
4886 commits 3 branches 7 tags 206 MiB
Commit graph

4751 commits

Author SHA1 Message Date
Paulo Reis
35de3ee0ab Fix typo in ng-repeat directive. 2017-07-19 10:34:50 +01:00
Shane Kilkelly
a4992891d0 Add an error handler to Raven loader. 
This should allow app to continue to work if loading Raven
times out.
 2017-07-18 14:41:44 +01:00
Shane Kilkelly
70e5279ba2 Don't autocomplete for commands like \\, \[, \:, etc 2017-07-14 13:52:18 +01:00
Shane Kilkelly
f66982dd8b Consistently delete back to last backslash 2017-07-13 10:23:45 +01:00
Shane Kilkelly
75b0e0cf51 Don't offer autocomplete for double-backslash 2017-07-13 10:22:51 +01:00
Shane Kilkelly
952a765235 Inteligently rank exact match highest 2017-07-12 11:33:45 +01:00
Shane Kilkelly
c8a21cdcf5 WIP: sort definite real commands from possible incidentals 2017-07-12 09:25:39 +01:00
Shane Kilkelly
1fb036811a Temporarily remove up-ranking of exact match 2017-07-11 11:34:31 +01:00
Shane Kilkelly
0b84caa730 Add new auto-pair behaviour to mode-latex_beta 2017-07-10 10:52:18 +01:00
Paulo Reis
0c28c6cc3a Add translation keys. 2017-07-07 10:38:13 +01:00
Paulo Reis
a2e583edb8 Remove debug statement. 2017-07-07 10:38:13 +01:00
Paulo Reis
6cfa10d511 Add a per-user TC notice dialog. 2017-07-07 10:38:13 +01:00
Paulo Reis
12ace746fc Add per-user TC notice assets. 2017-07-07 10:38:13 +01:00
Paulo Reis
d69a7577f5 Check in Analytics if user has already been informed about per-user TC. 2017-07-07 10:38:13 +01:00
Paulo Reis
8925dc5a78 Revert "Show simpler UI when there is only one user." 
This reverts commit 48300bd5b2ef01651e64dad3183e65d5d5798955.
 2017-07-07 10:38:13 +01:00
Paulo Reis
dae5381af7 Show simpler UI when there is only one user. 2017-07-07 10:38:13 +01:00
Paulo Reis
139c2ab1fd Consolidate members list. 2017-07-07 10:38:13 +01:00
Paulo Reis
e421b6550a Filter out read-only users from TC users list. 2017-07-07 10:38:13 +01:00
Paulo Reis
bc88dbd0f8 Handle read-only permissions; allow read-only users to see state but not change it. 2017-07-07 10:38:13 +01:00
Paulo Reis
71e0a6935f Readd feature flag handling. 2017-07-07 10:38:13 +01:00
Paulo Reis
7bf203c77f Styling. 2017-07-07 10:38:13 +01:00
Paulo Reis
e7dd4874ad Add collapse state indicator. 2017-07-07 10:38:13 +01:00
Paulo Reis
e40b8500d7 Keep user state persistent on the client. 2017-07-07 10:38:13 +01:00
Paulo Reis
c701711eab Support a default value when undefined in the review panel toggles. 2017-07-07 10:38:13 +01:00
Paulo Reis
8e6265e3d2 Enable global setting. 2017-07-07 10:38:13 +01:00
Paulo Reis
1ae53a243a Correctly fetch users from project info. 2017-07-07 10:38:13 +01:00
Paulo Reis
f4bdd5eb2b Control sync state with server. 2017-07-07 10:38:13 +01:00
Paulo Reis
0ac52e7f19 Disable individual users TC control when TC is on for everyone; add styling for disabled toggles. 2017-07-07 10:38:13 +01:00
Paulo Reis
1fa7338baf Wire up TC widget to controller methods. 2017-07-07 10:38:13 +01:00
Paulo Reis
dc2085c6e1 Basic widget for toggling TC state. 2017-07-07 10:38:13 +01:00
James Allen
710c89a629 Support per user track changes (proof of concept) 2017-07-07 10:38:13 +01:00
Shane Kilkelly
b799bbc695 Merge branch 'sk-auto-pair-braces' into sk-ac-improvements-integration 2017-07-06 14:56:03 +01:00
Shane Kilkelly
cc8499ba48 update to latest latex mode 2017-07-06 14:55:37 +01:00
Shane Kilkelly
04c94760f5 Merge branch 'sk-auto-pair-braces' into sk-ac-improvements-integration 2017-07-06 14:39:28 +01:00
Shane Kilkelly
330e3dccc3 Merge branch 'sk-ac-rank-exact-match-highest' into sk-ac-improvements-integration 2017-07-06 14:39:08 +01:00
Shane Kilkelly
611f8825d7 Merge branch 'sk-ac-prevent-double-insertion' into sk-ac-improvements-integration 2017-07-06 14:39:00 +01:00
Shane Kilkelly
9ac15c9d47 Merge branch 'sk-ac-more-eager-trigger' into sk-ac-improvements-integration 2017-07-06 14:38:44 +01:00
Shane Kilkelly
98f96d6087 Merge branch 'sk-ac-disable-for-existing-environments' into sk-ac-improvements-integration 2017-07-06 14:38:07 +01:00
Shane Kilkelly
c99109751e Merge branch 'sk-ac-ignore-comments' into sk-ac-improvements-integration 2017-07-06 14:37:54 +01:00
Shane Kilkelly
009cadb8b8 Change translation for autoPairDelimiters setting 2017-07-06 14:32:30 +01:00
James Allen
01d709dff5 Remove latex beta mode 2017-07-06 11:59:44 +01:00
James Allen
4276f1544d Update ace latex worker to include context reporting 2017-07-06 11:56:20 +01:00
Shane Kilkelly
34b2012727 Enable (optional) auto-pairing for latex mode 2017-07-06 11:06:51 +01:00
Brian Gough
0ae93db08b use ApiErrorHandler on public api 2017-07-05 15:06:23 +01:00
Brian Gough
1dbeebabd2 move status and health checks to public api router 2017-07-05 14:50:38 +01:00
Brian Gough
845ee51a67 rename apiRouter -> privateApiRouter in router 2017-07-05 14:43:41 +01:00
Brian Gough
bd83d94f64 rename apiRouter -> privateApiRouter in Modules 2017-07-05 14:41:14 +01:00
Brian Gough
29b40ad824 add public api router 2017-07-05 14:32:55 +01:00
Brian Gough
3e8ad69f3c make loading of module routes more robust 2017-07-05 11:46:29 +01:00
Brian Gough
5ad3fd769d preserve original /status message 2017-07-04 12:42:54 +01:00
Brian Gough
b2f676af5a avoid duplicate routes for /status 2017-07-04 12:41:51 +01:00
Brian Gough
9417266966 fix health checks for web/web-api split 2017-07-04 10:32:31 +01:00
Brian Gough
dbbc4966d8 Merge pull request #513 from sharelatex/bg-split-web-and-web-api 
split web and web api
 2017-07-04 08:51:00 +01:00
Shane Kilkelly
68c942582f Clean up the custom insertMatch function 2017-07-04 08:48:45 +01:00
Shane Kilkelly
08faa64b57 Add comment explaining the custom insertMatch 2017-07-03 15:20:36 +01:00
Shane Kilkelly
96d269e348 Use existential operator to check existence 2017-07-03 15:13:27 +01:00
Shane Kilkelly
415de9e2ec Experimental handling of completion for existing commands 2017-07-03 15:12:15 +01:00
Shane Kilkelly
127d5ded86 Remove erroneous log 2017-07-03 13:37:25 +01:00
Shane Kilkelly
7ecadb14f6 Add a skeleton of a custom insertMatch function 2017-07-03 13:36:24 +01:00
Paulo Reis
a9b104f674 Relocate qProvider setup. 2017-07-03 11:19:13 +01:00
Paulo Reis
55476f1693 Disable erroring behaviour for unhandled rejections. 2017-07-03 10:42:39 +01:00
Paulo Reis
86e66bbed1 Merge branch 'master' into pr-angular-1.6.x 2017-07-03 09:50:01 +01:00
Shane Kilkelly
bb3c5e7a34 Reverse direction, don't ignore commands in comments 2017-06-30 15:05:21 +01:00
Shane Kilkelly
bd88adb621 Account for mid-line comments 2017-06-30 14:03:34 +01:00
Shane Kilkelly
da286438be Don't trigger autocomplete when editing existing environment 2017-06-30 11:22:11 +01:00
Shane Kilkelly
c2fcbbeb72 Fix parsing, so it accurately captures command args 2017-06-30 10:55:10 +01:00
Shane Kilkelly
e2bff06aeb Add comment about ignoring comments 2017-06-30 08:42:03 +01:00
Shane Kilkelly
cfe51089f6 Ignore commands within comments when parsing document 2017-06-29 16:04:52 +01:00
Shane Kilkelly
db80f8ca1c Don't trigger autocomplete if we're on a comment line. 2017-06-29 14:42:08 +01:00
Shane Kilkelly
c9cda16a5e Refactor score calculation 2017-06-29 11:13:59 +01:00
Paulo Reis
699ec419aa Fix bug where announcements were undefined. 2017-06-29 11:04:52 +01:00
Shane Kilkelly
936278b045 Bring score into line with new policy 2017-06-29 10:55:05 +01:00
Shane Kilkelly
cbae1857e7 Allow exact match to be ranked higher than any other result 2017-06-29 10:54:07 +01:00
Shane Kilkelly
3deebc8642 Change the scoring system for autocomplete, scale 0-100 2017-06-29 10:53:52 +01:00
Shane Kilkelly
1490b4a0da Remove Shift-Space autocomplete trigger, far to easy to misfire 2017-06-29 10:02:49 +01:00
Shane Kilkelly
69796bd835 also trigger autocomplete if last character is backslash 2017-06-28 15:48:21 +01:00
Shane Kilkelly
c9678ad699 Trigger autocomplete with Shift-Space, in addition to existing triggers 2017-06-28 15:24:37 +01:00
Shane Kilkelly
b73b78e570 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2017-06-27 08:24:24 +01:00
Paulo Reis
f993966935 Typo in gruntfile. 2017-06-26 16:27:12 +01:00
Paulo Reis
7e7bfa866d Ignore map files in git. 2017-06-26 16:15:28 +01:00
Paulo Reis
5b9e5ecd13 Update grunt tasks to generate source maps. 2017-06-26 16:14:03 +01:00
Paulo Reis
3bc4beee07 Add Angular source maps and unminified bundle. 2017-06-26 16:13:05 +01:00
Shane Kilkelly
0d5d59bb66 Remove user field from log, var not in scope 2017-06-26 13:56:22 +01:00
Paulo Reis
1bc38b2ea7 Use Angular minified bundle. 2017-06-26 10:07:15 +01:00
Paulo Reis
9ffec6eb16 Correctly access response parameters. 2017-06-26 10:00:47 +01:00
Henry Oswald
3da5ef818c null check subscription for group admin panel 2017-06-22 14:07:07 +01:00
Paulo Reis
33be384206 Avoid implicitly returning from a directive controller constructor function. 2017-06-21 16:00:56 +01:00
Shane Kilkelly
1112a1f085 Instantiate the ses client if explicitly specified. 
This allows end-users to use AWS features such as instance roles,
avoiding the use of explicit crendentials
 2017-06-21 10:57:13 +01:00
Paulo Reis
ddee75e479 Use a getterSetter to manage int values in settings. 2017-06-20 17:08:53 +01:00
Paulo Reis
669c705d32 Also refactor signatures from methods wrapping the HTTP service. 2017-06-20 16:27:05 +01:00
Paulo Reis
3dda383d70 Use promise method signatures, instead of old HTTP service ones. 2017-06-20 16:04:06 +01:00
Paulo Jorge Reis
2dda430691 Merge pull request #522 from sharelatex/bg-hide-textlayer-for-performance 
set text layer to display:none for faster scroll
 2017-06-20 13:58:20 +01:00
Shane Kilkelly
8b7a1bd4d9 Merge branch 'sk-labels-ac-debounce' 2017-06-20 13:53:23 +01:00
Paulo Reis
155f515a50 Use standard promises with the http service. 2017-06-20 11:50:23 +01:00
Paulo Reis
eab00c95df Include Angular 1.6. 2017-06-20 11:49:33 +01:00
Paulo Reis
97f3f7c2db Add latest Angular bundles. 2017-06-20 10:38:56 +01:00
Shane Kilkelly
3d2d7652c6 Simplified and faster blanking 2017-06-20 08:46:47 +01:00
Shane Kilkelly
b4e2dcf7ef Match prefixes of ref and cite up to 16 characters 2017-06-20 08:46:28 +01:00
Shane Kilkelly
a299af12e8 Remove debug helper 2017-06-20 08:46:18 +01:00
Brian Gough
bac275962f put /ip on web router 2017-06-19 15:54:57 +01:00
Brian Gough
d32a3fbaf5 support status and health check on web and web-api 2017-06-19 15:54:14 +01:00
Brian Gough
02cb0f2295 make compiler health check available on web 2017-06-19 15:52:04 +01:00
Brian Gough
412c823483 remove the red highlighting of the text layer 2017-06-19 14:58:22 +01:00
Shane Kilkelly
85ddff15cb Move command-matching regex to the class level 2017-06-16 10:20:55 +01:00
Shane Kilkelly
0163ffc4bd Extend, and clean up the command-matching regex 2017-06-16 10:17:30 +01:00
Shane Kilkelly
1d905bd5ff Clean up string replacement 2017-06-16 09:49:16 +01:00
Shane Kilkelly
d9aff3c3f4 Blacklist more commands 2017-06-16 09:41:40 +01:00
Shane Kilkelly
a1d2d5b313 WIP: blank out label commands before running spell-check 2017-06-16 09:20:35 +01:00
Paulo Reis
af2cbf5a51 Force return true on a jquery handler; returning falsy values may have unexpected results. 2017-06-15 16:17:21 +01:00
Paulo Reis
fcf0a96933 Use selection.isCollapsed to check for empty selections. 2017-06-15 16:16:30 +01:00
Paulo Reis
b9797dbc42 Make sure clicks on labels dont stop the event propagation to buttons. 2017-06-15 16:14:06 +01:00
Brian Gough
62d6933886 use settings instead of ENV for web/api split 2017-06-15 16:11:20 +01:00
Brian Gough
503822deb0 avoid possible exception if selection is undefined 
defensive programming only
 2017-06-15 14:32:00 +01:00
Brian Gough
b9804823f3 handle off-screen selection 
when toggling the logs button the selection is off-screen and
selection.toString() is empty even when there is a selected range.  Can
check for selection.type being "Range" instead.
 2017-06-15 14:21:42 +01:00
Brian Gough
b04288ed44 avoid getting duplicate handlers for mouseup 2017-06-15 14:21:42 +01:00
Shane Kilkelly
403d822174 Alter labels debouncer to handle transitions between docs 2017-06-15 14:09:49 +01:00
Brian Gough
76dcde4dae hide the text layer on reload 2017-06-15 13:42:19 +01:00
Paulo Reis
fbaa918927 Do not show the text layer when the user clicks outside pages. Remove some debug statements. 2017-06-15 12:32:04 +01:00
Paulo Reis
4985f7ca1c Different approach: render all text layers while selecting (WIP). 2017-06-15 12:32:04 +01:00
Paulo Reis
786659dc1b Render text layer on hovered pages (and adjacent ones). 2017-06-15 12:32:04 +01:00
Paulo Reis
1b07dda1b9 Use less specific (i.e. faster) selectors. 2017-06-15 12:32:04 +01:00
Paulo Reis
f0a940df35 Make the PDF text layer non-renderable by default. 2017-06-15 12:32:04 +01:00
Brian Gough
cb1cacebb5 set text layer to display:none for faster scroll 2017-06-15 12:32:03 +01:00
Brian Gough
1ecabaa611 Revert "update pdfjs to v1.8.188" 
This reverts commit 189e48dcc00f530eff674cc4a2b87c06814d45ff.
 2017-06-15 11:14:01 +01:00
Shane Kilkelly
69471c4f74 Remove old references to services/labels 2017-06-15 09:27:00 +01:00
Shane Kilkelly
b0bb4b3e47 Merge branch 'sk-ref-variants' 2017-06-15 09:17:48 +01:00
Shane Kilkelly
5a6415d3f8 Add logging for Labels http actions 2017-06-15 08:56:48 +01:00
Shane Kilkelly
9607174b64 Merge branch 'master' into sk-server-side-labels-loading 2017-06-15 08:49:14 +01:00
Shane Kilkelly
3f1a440d66 Support variations of \ref{}, such as \cref{}, \eqref{}, etc.. 2017-06-14 15:15:07 +01:00
Shane Kilkelly
b0ff8e0745 Fix a typo: prefxi => prefix 2017-06-14 15:14:38 +01:00
Shane Kilkelly
5e37b1dac1 Move logic for selectively loading labels. 
Only load labels if the user has write permission
 2017-06-14 13:26:02 +01:00
Brian Gough
e1efc3a7b5 Merge pull request #521 from sharelatex/bg-reduce-pdf-memory-usage 
Revert "use a single pdfjs worker, rotated to avoid leaks"
 2017-06-13 16:46:58 +01:00
Brian Gough
9687daf97f Merge pull request #520 from sharelatex/bg-upgrade-pdfjs-1.8.188 
upgrade pdfjs 1.8.188
 2017-06-13 16:46:10 +01:00
Brian Gough
b123b033ab Merge pull request #519 from sharelatex/bg-remove-pdfjs-1.6.210p2 
remove old version of pdfjs
 2017-06-13 16:45:25 +01:00
Shane Kilkelly
3b066758bb Don't load labels for anonymous/read-only users 2017-06-13 14:06:00 +01:00
Shane Kilkelly
954c53aec6 Move the labels event logic into ide/labels/LabelsManager 2017-06-13 13:29:03 +01:00
Shane Kilkelly
a04eb1197d Move labels service to /ide/labels/services/labels 2017-06-13 11:43:25 +01:00
Shane Kilkelly
b97becc7a2 Change getLabelsForDoc to broadcastLabelsForDoc 2017-06-13 11:38:15 +01:00
Shane Kilkelly
a3dbb16e50 Flush project before getting all project labels 2017-06-13 11:15:26 +01:00
Shane Kilkelly
bd6133aadb Remove callback-pattern from label parsers 2017-06-13 11:10:21 +01:00
Shane Kilkelly
c25b6b792d Namespace the document route under /doc/ 2017-06-13 10:57:51 +01:00
Shane Kilkelly
d1a85304d2 Add comment 2017-06-12 15:47:31 +01:00
Shane Kilkelly
26be4f84d0 Re-use parser 2017-06-12 15:15:14 +01:00
Shane Kilkelly
debb0c06a4 Clearer logic for triggering labels-loading 2017-06-12 14:23:29 +01:00
Shane Kilkelly
0a491a4f13 Add comment, explain flushing of doc to mongo 2017-06-12 13:09:13 +01:00
Shane Kilkelly
ff4991284d Change docLabelsUpdated socket event to broadcastDocLabels 2017-06-12 13:06:56 +01:00
Shane Kilkelly
234a2d0e21 Remove cruft 2017-06-12 11:37:34 +01:00
Shane Kilkelly
9f9468d0e0 Use lowercase project_id 2017-06-12 11:37:05 +01:00
Shane Kilkelly
c9432a1238 Fix unit tests 2017-06-12 10:09:33 +01:00
Shane Kilkelly
1bb065344c Move labels into an Angular Service 2017-06-12 09:44:32 +01:00
Shane Kilkelly
56385a798b Use ide.$http, rather than jquery 2017-06-09 11:41:35 +01:00
James Allen
7137ab643f Merge pull request #523 from sharelatex/ja-removing-group-holding-accounts 
Use an email based invite system for groups, not holding accounts
 2017-06-09 11:36:42 +01:00
Shane Kilkelly
5443b92e7d Move state management into LabelsMaster on the ide 2017-06-09 11:28:27 +01:00
James Allen
ba3822d1ae Encode email for URL when deleting invited group email 2017-06-09 10:39:48 +01:00
James Allen
69bc6fc8e4 Maintain backwards compatibility with old holding accounts in removal end points 2017-06-08 16:53:22 +01:00
Paulo Reis
cc7f44737e Tell Angular to avoid parsing the value attribute. 2017-06-08 16:02:28 +01:00
Shane Kilkelly
965a46291b Only fetch labels for uploaded docs, not files 2017-06-08 15:55:17 +01:00
Shane Kilkelly
ff7955dfdb Update labels when docs are uploaded or removed 2017-06-08 15:12:18 +01:00
James Allen
4cecbae6b6 Use an email based invite system for groups, not holding accounts 2017-06-08 12:12:08 +01:00
Shane Kilkelly
feb1d87de1 Add test for LablesHandler 2017-06-08 10:25:39 +01:00
Shane Kilkelly
3c4a6f06be Add unit tests for LabelsController 2017-06-08 09:22:26 +01:00
Shane Kilkelly
c7dbd21cd1 use flag on aceEditor to enable autocomplete features 2017-06-08 09:22:08 +01:00
Paulo Reis
240d6d6f6b Resolve timing issue when triggering selection-related logic. 2017-06-07 14:21:05 +01:00
Paulo Reis
53b18e041f Trigger selection-related logic after accepting or rejecting changes. 2017-06-07 14:03:58 +01:00
Brian Gough
aa8974dcd6 Revert "use a single pdfjs worker, rotated to avoid leaks" 
This reverts commit f270ef54911acd800d2ffd577080b50ea2fe4aff.

Use a new worker on each reload to free up memory.
 2017-06-07 13:29:10 +01:00
Paulo Reis
19ecffd654 Merge branch 'master' into pr-aggregate-insert-delete 2017-06-06 17:04:31 +01:00
Paulo Reis
34796b18c5 Add translation keys. 2017-06-06 16:46:36 +01:00
Paulo Reis
afa011c813 Avoid flickering when elements enter the review panel. 2017-06-06 16:11:00 +01:00
Brian Gough
e417a72e0a remove old version of pdfjs 2017-06-06 15:06:09 +01:00
Paulo Reis
73a67c6617 Add a note on the need of reverse sorting changes when rejecting. 2017-06-06 13:34:48 +01:00
Brian Gough
ecf0857756 update pdfjs to v1.8.188 2017-06-06 12:19:13 +01:00
Brian Gough
ff7e383f08 add compatibility.js from pdfjs repo 2017-06-06 12:18:58 +01:00
Paulo Reis
4504f77aa3 Do bulk rejects in reverse order. 2017-06-06 12:06:43 +01:00
Brian Gough
5aa1e4cc2a add pdfjs-1.8.188 2017-06-06 11:47:30 +01:00
Paulo Reis
81a5a5311d Clear selection after bulk actions. 2017-06-06 10:03:33 +01:00
Paulo Reis
af93fc1869 Make aggregate entries work when the review panel is minimised. 2017-06-06 10:00:50 +01:00
Brian Gough
b277ee3254 Merge pull request #511 from sharelatex/bg-handle-web-api-errors 
use a separate error handler for api router errors
 2017-06-06 09:22:28 +01:00
Paulo Reis
5a75663a0c Do bulk rejects in reverse order. 2017-06-05 17:17:47 +01:00
Paulo Reis
e616a62d68 Save entry ids inside entry object, not only as the key. 2017-06-05 16:29:55 +01:00
Shane Kilkelly
f7ad4a4786 WIP: basically working, with client sync 2017-06-05 14:48:50 +01:00
James Allen
cb1745a1e6 Fix redirect in clone project modal 2017-06-05 13:33:32 +01:00
James Allen
d7981fd2d4 Merge pull request #512 from sharelatex/ja-project-name-validation 
Refactor project name validation into one place and restrict /s
 2017-06-05 11:55:39 +01:00
Shane Kilkelly
51881dbbcc Only load labels from current doc if change is local 2017-06-05 11:09:58 +01:00
Paulo Reis
d4ac91f75e Use correct handlers in directives. 2017-06-05 10:52:11 +01:00
Paulo Reis
6c3cdbcc3a Remove dead code, backend does not send single change events anymore. 2017-06-05 10:43:03 +01:00
Paulo Reis
8d8bcab1e8 Consolidate change accept and reject code. 2017-06-05 10:41:59 +01:00
Shane Kilkelly
f29320dd93 Add ability to load labels from single document 2017-06-05 09:26:13 +01:00
Shane Kilkelly
4cb41a988a WIP: initial work on server-side labels 2017-06-02 15:12:59 +01:00
Paulo Reis
e2edf4184f Explicit naming. 2017-06-02 11:43:43 +01:00
Shane Kilkelly
0e498d5e65 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2017-06-02 09:55:30 +01:00
Shane Kilkelly
51e3a6b3a3 Don't use String.startsWith, use slice instead. 
- String.startsWith is not supported in IE
 2017-06-02 09:54:48 +01:00
Paulo Reis
26260fc11f Prevent aggregation of changes from different users. 2017-06-01 16:33:50 +01:00
Paulo Reis
b2a7686204 DRYness. 2017-06-01 15:28:37 +01:00
Paulo Reis
2a0454f2f1 Integrate aggregate changes with bulk actions. 2017-06-01 15:18:43 +01:00
Paulo Reis
1490ea7b04 Change aggregated change model: the main change is now the insertion, deletion is stored in metadata. 2017-06-01 15:03:37 +01:00
Paulo Reis
11c0644490 Aggregate changes; make accept and reject work. 2017-06-01 11:47:55 +01:00
Shane Kilkelly
6feb6959a3 Merge pull request #517 from sharelatex/pr-fix-error-banner-clicks 
Make the alert container a zero-height static element, to avoid capt…
 2017-06-01 09:15:46 +01:00
Shane Kilkelly
6b746f757e Merge pull request #514 from sharelatex/ja-update-raven 
Update Raven (Sentry lib) to 3.15.0 in client
 2017-06-01 09:13:40 +01:00
Shane Kilkelly
5847973615 Merge pull request #515 from sharelatex/ja-editable-asy-files 
Make .asy files editable when uploaded
 2017-06-01 09:13:25 +01:00
Shane Kilkelly
9a15420c4e Merge branch 'master' into sk-labels-autocomplete 2017-06-01 08:34:56 +01:00