Commit Graph

3255 Commits

Author SHA1 Message Date
James Allen f7532e5854 Merge pull request #619 from sharelatex/afc-email-tokens
Use emails with tokens for team invites
2018-06-12 08:30:23 +01:00
Jessica Lawshe ba5b3bb06a Merge pull request #581 from sharelatex/jel-add-cms
Add CMS
2018-06-08 07:18:03 -05:00
Jessica Lawshe d57660aeb5 Merge pull request #632 from sharelatex/jel-plans-pricing-fix
Plans and Pricing fixes
2018-06-08 07:17:28 -05:00
Alberto Fernández Capel 59688efb56 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-08 12:21:17 +01:00
Jessica Lawshe 6c92238f37 Fix analytics event label for when shouldABTestPlans: false 2018-06-07 10:30:21 -05:00
Jessica Lawshe 484ee9ad61 Should not AB test when signed up before 2018-06-06 2018-06-07 10:30:21 -05:00
Alberto Fernández Capel 5e70825c94 Rename view variable to invite
Makes the meaning more explicit
2018-06-07 16:12:02 +01:00
Alasdair Smith c4c9441995 Adjust caret down 2018-06-07 14:13:19 +01:00
Alasdair Smith ad13eccfa7 Flatten rules for readability 2018-06-07 14:13:19 +01:00
Alasdair Smith 9ae92dbeef Small icon & math icon styling 2018-06-07 14:13:19 +01:00
Alasdair Smith ea18d606c4 Nicer v2 styles 2018-06-07 14:13:19 +01:00
Alasdair Smith 12d7eb8a46 Adjust styling to work with wrapper 2018-06-07 14:13:19 +01:00
Alasdair Smith 611a6f9c0b Reduce width of overflowed button menu 2018-06-07 14:13:19 +01:00
Alasdair Smith c5f62d3aa3 Style dropdown & clean up naming 2018-06-07 14:13:19 +01:00
Alasdair Smith aaf5da877e Style different buttons 2018-06-07 14:10:33 +01:00
Alasdair Smith 7384cfba1a Style wrapped buttons so the toolbar can be resized 2018-06-07 14:09:02 +01:00
Alasdair Smith bfaa6d8dcc Improve styling of buttons 2018-06-07 14:05:21 +01:00
Alasdair Smith 3fa6f4743d Merge pull request #637 from sharelatex/as-fix-clone-owner
Set the owner object to the current user when cloning a project
2018-06-07 11:54:09 +01:00
Alasdair Smith f3c871a972 Merge pull request #640 from sharelatex/as-fix-leave-quick-action
Show leave quick action instead of archive for unowned projects
2018-06-07 11:44:36 +01:00
Alasdair Smith 4a1c2cf0e0 Set cloned project's owner to current user
Fixes a bug where cloning a project then selecting to delete it, the wrong
button for deletion is shown (leave instead of archive/delete). This is
because we are using the owner object (which was undefined after cloning) to
determine which button to show
2018-06-07 11:19:11 +01:00
Alasdair Smith 0900559579 Fix blurrly autocomplete highlight on Chrome
The blurrly text shadow is back on Chrome. I suspect it maybe intended, not a
bug, so I've fixed it for all versions of Chrome.

I've replaced with font-weight: bold, which visually has the same appearance
2018-06-06 17:19:12 +01:00
Alasdair Smith 8f71b104c5 Fix bug where unowned project would show archive quick action instead of leave
If the user does not own the project, the project can only be left, not
archived. Previously the quick action button was only showing the archive icon
but clicking the button would correctly leave the project. This is confusing,
so this commit corrects to show the leave icon for projects not owned by the
current user
2018-06-06 16:59:13 +01:00
Alberto Fernández Capel 6fb6119ca8 Merge remote-tracking branch 'origin' into afc-email-tokens 2018-06-05 15:42:17 +01:00
Jessica Lawshe b63384cbf1 Merge pull request #537 from sharelatex/jel-pricing-plans
Plans and pricing variant
2018-06-05 09:30:43 -05:00
Paulo Reis 8e5032fb34 Merge branch 'master' into pr-v2-history-ui 2018-06-05 10:55:42 +01:00
Paulo Reis 1624639bc8 Merge branch 'pr-v2-history-ui' of github.com:sharelatex/web-sharelatex-internal into pr-v2-history-ui 2018-06-05 10:32:06 +01:00
Paulo Reis f858786f2d Add i18n. 2018-06-05 10:14:16 +01:00
Jessica Lawshe b1c988e4c1 Add hover and scroll events 2018-06-04 14:42:26 -05:00
Jessica Lawshe 10cf5825a5 Add plans variant
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “

Also, move repeated elements to partials
2018-06-04 14:42:26 -05:00
Hugh O'Brien 63482e0ea0 Merge pull request #617 from sharelatex/hb-check-for-folders-clientside
Add function to check for existence of folders
2018-06-04 12:07:25 +01:00
Alasdair Smith 7898a1deca Fix missed snake_case to camelCase, causing bug where projects couldn't be restored 2018-06-04 10:45:23 +01:00
Alberto Fernández Capel 25d7196570 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-01 16:49:47 +01:00
hugh-obrien 063187b5fc add function to check for existance of folders 2018-05-31 17:03:41 +01:00
Alberto Fernández Capel d262de14d6 Use team invites to join domain licensed teams 2018-05-31 16:15:47 +01:00
Alberto Fernández Capel 39c8595c27 Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
2018-05-31 14:25:47 +01:00
Alberto Fernández Capel 11edfde153 Accept & revoke team invites 2018-05-31 11:54:50 +01:00
Shane Kilkelly d3ae276091 Merge pull request #579 from sharelatex/sk-linked-files-from-project
Linked Files from Project
2018-05-31 11:08:08 +01:00
Alasdair Smith 57c56a0853 Merge pull request #565 from sharelatex/as-dash-action-btns
Add action buttons to v2 dash
2018-05-31 10:11:20 +01:00
Alasdair Smith cc9d18d991 Merge pull request #600 from sharelatex/as-refactor-rt-load
Refactor loading rich text
2018-05-31 10:11:01 +01:00
Alasdair Smith 00808dfc9a Merge pull request #599 from sharelatex/sk-less-border-radius-on-selects-v2
On v2, use smaller (default) border radius on select inputs
2018-05-31 10:10:49 +01:00
Alasdair Smith 5ec238cae8 Switch archive button with restore button for archived projects 2018-05-31 10:05:39 +01:00
Alasdair Smith 7dffc56804 Clone project action button 2018-05-31 10:05:04 +01:00
Alasdair Smith 2354f4156b Download project action button 2018-05-31 10:04:59 +01:00
Alasdair Smith ffc06f2a3b Archive project action button 2018-05-31 10:04:50 +01:00
Alasdair Smith a2dff4bfbb Right align actions header 2018-05-31 09:59:35 +01:00
Alasdair Smith 2d1bcda9ff Style action buttons, and hide on smaller screens 2018-05-31 09:58:39 +01:00
Jessica Lawshe be35e37d29 Style for CMS pages 2018-05-30 15:54:10 -05:00
James Allen 4f5148e668 Wrap text like normal 2018-05-30 17:55:47 +01:00
Paulo Reis 6e7e76a3ce Margin and padding adjustments. 2018-05-30 17:34:46 +01:00
Paulo Reis 7cb4280a4d Remove commented-out code. 2018-05-30 15:18:15 +01:00