Commit Graph

  • d57660aeb5 Merge pull request #632 from sharelatex/jel-plans-pricing-fix Jessica Lawshe 2018-06-08 07:17:28 -05:00
  • 59688efb56 Merge remote-tracking branch 'origin/master' into afc-email-tokens Alberto Fernández Capel 2018-06-08 12:21:17 +01:00
  • e7e429a963 Merge pull request #605 from sharelatex/afc-update-user-references Alberto Fernández-Capel 2018-06-08 11:29:25 +01:00
  • 57775e60b1 Merge remote-tracking branch 'origin/master' into afc-update-user-references Alberto Fernández Capel 2018-06-08 11:28:58 +01:00
  • 10da4fc5f7 Merge pull request #585 from sharelatex/afc-team-overleaf-id Alberto Fernández-Capel 2018-06-08 11:27:15 +01:00
  • c53ff0fa84 Merge pull request #618 from sharelatex/as-toolbar-btns Alasdair Smith 2018-06-08 10:09:27 +01:00
  • c45b4463bb Fix unit test Alberto Fernández Capel 2018-06-08 10:05:26 +01:00
  • 5159f6f33d Check the subscription is in a group plan before adding new members Alberto Fernández Capel 2018-06-08 09:58:51 +01:00
  • 27bd7a16b2 Merge pull request #643 from sharelatex/revert-603-ta-use-multi-emails Timothée Alby 2018-06-07 18:45:49 +02:00
  • 7cdcd725fd Revert "Use Multiple Emails" Timothée Alby 2018-06-07 18:44:59 +02:00
  • c4250e601e Minor copy change Registered -> Accepted invite Alberto Fernández Capel 2018-06-07 16:53:19 +01:00
  • 85f4a31585 Proper coffee syntax Alberto Fernández Capel 2018-06-07 16:49:17 +01:00
  • 6c92238f37 Fix analytics event label for when shouldABTestPlans: false Jessica Lawshe 2018-06-06 10:05:43 -05:00
  • 484ee9ad61 Should not AB test when signed up before 2018-06-06 Jessica Lawshe 2018-06-05 16:04:20 -05:00
  • a3bb99d755 Honour invited_emails for the team being Alberto Fernández Capel 2018-06-07 16:22:38 +01:00
  • 670f24ef6f Simplify method name Alberto Fernández Capel 2018-06-07 15:35:18 +01:00
  • 30b935befd Prevent double rendering error Alberto Fernández Capel 2018-06-07 15:05:04 +01:00
  • d1b1e6c299 Do not include the Licence ending in domain invites Alberto Fernández Capel 2018-06-07 15:01:48 +01:00
  • 88d12b43ac Make CTA message match regular message Alberto Fernández Capel 2018-06-07 14:21:53 +01:00
  • 5e70825c94 Rename view variable to invite Alberto Fernández Capel 2018-06-07 14:10:01 +01:00
  • 6f5c777163 Merge pull request #622 from sharelatex/hb-take-emis-names-as-input Hugh O'Brien 2018-06-07 15:52:33 +01:00
  • 0516a7ed79 Merge pull request #630 from sharelatex/ta-multi-emails-script Timothée Alby 2018-06-07 15:40:55 +02:00
  • f422b7242d Merge pull request #603 from sharelatex/ta-use-multi-emails Timothée Alby 2018-06-07 15:40:43 +02:00
  • c4c9441995 Adjust caret down Alasdair Smith 2018-06-05 14:55:32 +01:00
  • ad13eccfa7 Flatten rules for readability Alasdair Smith 2018-06-01 15:09:15 +01:00
  • 9ae92dbeef Small icon & math icon styling Alasdair Smith 2018-06-01 13:45:47 +01:00
  • ea18d606c4 Nicer v2 styles Alasdair Smith 2018-06-01 13:19:00 +01:00
  • 12d7eb8a46 Adjust styling to work with wrapper Alasdair Smith 2018-05-31 17:47:55 +01:00
  • 611a6f9c0b Reduce width of overflowed button menu Alasdair Smith 2018-05-31 16:26:40 +01:00
  • c5f62d3aa3 Style dropdown & clean up naming Alasdair Smith 2018-05-31 16:10:40 +01:00
  • aaf5da877e Style different buttons Alasdair Smith 2018-05-31 13:31:24 +01:00
  • 7384cfba1a Style wrapped buttons so the toolbar can be resized Alasdair Smith 2018-05-29 16:56:38 +01:00
  • bfaa6d8dcc Improve styling of buttons Alasdair Smith 2018-05-29 11:41:08 +01:00
  • 6639f61a43 Remove extra space between rows Alberto Fernández Capel 2018-06-07 14:05:10 +01:00
  • c2ef93b212 Merge pull request #610 from sharelatex/ja-sync-from-v2 James Allen 2018-06-07 13:30:34 +01:00
  • c684fc3383 fix first/last name check bug hugh-obrien 2018-06-07 12:57:01 +01:00
  • 959db80177 Check all emails to prevent invite duplicates Alberto Fernández Capel 2018-06-07 12:49:46 +01:00
  • 3fa6f4743d Merge pull request #637 from sharelatex/as-fix-clone-owner Alasdair Smith 2018-06-07 11:54:09 +01:00
  • 87f6c65b99 Merge pull request #625 from sharelatex/hof-container-teardown-timeout Hayden Faulds 2018-06-07 11:50:16 +01:00
  • f3c871a972 Merge pull request #640 from sharelatex/as-fix-leave-quick-action Alasdair Smith 2018-06-07 11:44:36 +01:00
  • 89ecb9f01b Merge pull request #641 from sharelatex/as-fix-autocomplete-blur Alasdair Smith 2018-06-07 11:44:25 +01:00
  • 566c41cafd Merge remote-tracking branch 'origin/master' into afc-email-tokens Alberto Fernández Capel 2018-06-07 11:40:03 +01:00
  • 4a1c2cf0e0 Set cloned project's owner to current user Alasdair Smith 2018-06-06 13:44:02 +01:00
  • 458650d456 create script to backfill secondary emails Tim Alby 2018-06-06 15:30:33 +02:00
  • 0900559579 Fix blurrly autocomplete highlight on Chrome Alasdair Smith 2018-06-06 17:19:12 +01:00
  • 1fc047d08e Fix invitation resend Alberto Fernández Capel 2018-06-06 17:11:25 +01:00
  • 8f71b104c5 Fix bug where unowned project would show archive quick action instead of leave Alasdair Smith 2018-06-06 16:59:13 +01:00
  • 4885b70016 Better translation key Alberto Fernández Capel 2018-06-06 16:33:01 +01:00
  • 06efe1910b Replace hardcoded string Alberto Fernández Capel 2018-06-06 15:30:40 +01:00
  • b308dcef63 Clean up markup Alberto Fernández Capel 2018-06-06 15:24:24 +01:00
  • 553878064b Resend email if the user has already been invited Alberto Fernández Capel 2018-06-06 15:13:49 +01:00
  • 16cb5e0d35 Propagate the error further up the stack Alberto Fernández Capel 2018-06-06 12:49:02 +01:00
  • 8a317b5bfe Better wording Alberto Fernández Capel 2018-06-06 12:47:59 +01:00
  • e753ef3af5 Invite users in the invited_emails array Alberto Fernández Capel 2018-06-06 12:35:13 +01:00
  • e6568a26e7 Merge pull request #636 from sharelatex/ta-add-emails-filter Timothée Alby 2018-06-06 16:21:48 +02:00
  • 3cb499a3c2 add comment Tim Alby 2018-06-06 15:46:41 +02:00
  • 7726314e7c add test to explicitely check filter Tim Alby 2018-06-06 15:45:12 +02:00
  • e4da748257 add filter to query on emails attribute Tim Alby 2018-06-06 14:52:09 +02:00
  • 813289f5de use multiple emails when relevant Tim Alby 2018-05-28 16:09:22 +02:00
  • c5530163f5 add emails attribute on user creation Tim Alby 2018-05-28 16:08:37 +02:00
  • 5681a76f4c Merge pull request #634 from sharelatex/ta-remove-emails-default Timothée Alby 2018-06-06 11:37:17 +02:00
  • 1f6fcafce6 remove default emails attribute on user model Tim Alby 2018-06-06 11:11:57 +02:00
  • 679d91c4d2 Update default plans view conditional Jessica Lawshe 2018-06-05 12:58:18 -05:00
  • e64a704341 Merge pull request #602 from sharelatex/ta-add-multi-emails Timothée Alby 2018-06-05 17:07:12 +02:00
  • 26385718e6 only suggest thebibliography once Nate Stemen 2018-06-05 11:02:03 -04:00
  • 6fb6119ca8 Merge remote-tracking branch 'origin' into afc-email-tokens Alberto Fernández Capel 2018-06-05 15:42:17 +01:00
  • 613c9193e3 implement multi emails logic Tim Alby 2018-05-25 13:04:09 +02:00
  • b63384cbf1 Merge pull request #537 from sharelatex/jel-pricing-plans Jessica Lawshe 2018-06-05 09:30:43 -05:00
  • 863128a030 only suggest one document environment in project Nate Stemen 2018-06-05 10:08:27 -04:00
  • 1f19e0e7da Merge pull request #627 from sharelatex/hof-fix-tk-in-tests Paulo Jorge Reis 2018-06-05 14:15:34 +01:00
  • bfad95ae61 File restore button needs to be smaller to fit the new toolbar height. Paulo Reis 2018-06-05 13:59:27 +01:00
  • 62a10f25f2 move tk call to before sandboxed module call Hayden Faulds 2018-06-05 13:54:05 +01:00
  • 0bb37d4991 move tk call to before sandboxed module call Hayden Faulds 2018-06-05 13:41:17 +01:00
  • aeefd0752b Merge pull request #612 from sharelatex/pr-v2-history-ui Paulo Jorge Reis 2018-06-05 13:24:21 +01:00
  • be0fd9a446 reduce container teardown timeout to 0 Hayden Faulds 2018-06-05 11:30:48 +01:00
  • 4088c164c9 Update translations; use underscores for keys. Paulo Reis 2018-06-05 11:15:39 +01:00
  • 8e5032fb34 Merge branch 'master' into pr-v2-history-ui Paulo Reis 2018-06-05 10:55:42 +01:00
  • 1624639bc8 Merge branch 'pr-v2-history-ui' of github.com:sharelatex/web-sharelatex-internal into pr-v2-history-ui Paulo Reis 2018-06-05 10:32:06 +01:00
  • f858786f2d Add i18n. Paulo Reis 2018-06-05 10:14:16 +01:00
  • 8b672dea0d Add unit tests Jessica Lawshe 2018-05-31 16:01:01 -05:00
  • b1c988e4c1 Add hover and scroll events Jessica Lawshe 2018-05-30 11:42:44 -05:00
  • 10cf5825a5 Add plans variant Jessica Lawshe 2018-04-12 16:11:52 -05:00
  • b4a989f0b7 Add contentful Jessica Lawshe 2018-05-21 17:34:58 -05:00
  • 64ead238e4 Add meta tags Jessica Lawshe 2018-05-21 17:31:19 -05:00
  • 54ce196500 test custom first and last name for exports hugh-obrien 2018-06-04 11:11:40 +01:00
  • b02eea1e7e update tests for exports name options hugh-obrien 2018-06-04 11:07:47 +01:00
  • 4c5f186ca2 take custom first and last names from export UI hugh-obrien 2018-06-04 11:05:47 +01:00
  • 63482e0ea0 Merge pull request #617 from sharelatex/hb-check-for-folders-clientside Hugh O'Brien 2018-06-04 12:07:25 +01:00
  • d83cb63c8d Merge pull request #621 from sharelatex/as-fix-restore Alasdair Smith 2018-06-04 10:49:08 +01:00
  • 7898a1deca Fix missed snake_case to camelCase, causing bug where projects couldn't be restored Alasdair Smith 2018-06-04 10:45:23 +01:00
  • 58c4e72b2a Update references to UserLocator Alberto Fernández Capel 2018-06-01 16:50:00 +01:00
  • 25d7196570 Merge remote-tracking branch 'origin/master' into afc-email-tokens Alberto Fernández Capel 2018-06-01 16:49:47 +01:00
  • b0b2546e43 Remove dead code Alberto Fernández Capel 2018-06-01 16:45:36 +01:00
  • a73a869d03 I can haz some grammar Alberto Fernández Capel 2018-06-01 16:17:11 +01:00
  • 7fcdf68296 Remove dead code Alberto Fernández Capel 2018-06-01 16:05:44 +01:00
  • 3bd18715db Add some tests Alberto Fernández Capel 2018-06-01 15:37:09 +01:00
  • 89735f4b8e Keep method name for compatibility Alberto Fernández Capel 2018-06-01 15:36:00 +01:00
  • cfbb5c8f24 Remove some dead code James Allen 2018-06-01 14:55:07 +01:00
  • a79c9b94a8 Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web Hugh O'Brien 2018-06-01 11:29:36 +01:00
  • 9b18e58b68 Choose a better method name Alberto Fernández Capel 2018-06-01 11:28:06 +01:00