Commit graph

8842 commits

Author SHA1 Message Date
Simon Detheridge
1a9bb5f4eb Merge pull request #1088 from sharelatex/ta-fix-entity-id-scope
Fix Scope Bug in Group Access Control

GitOrigin-RevId: 7d2cb5fc08e0c7e4bd1b70c03b62620bb7dd8d41
2018-10-30 10:16:25 +00:00
Simon Detheridge
c18ca779ba Merge pull request #1073 from sharelatex/spd-bonus-page-ui
Add links and update UI for Bonus page

GitOrigin-RevId: e993d4b7dc59f5ea145892e9cddb87f2193ae013
2018-10-30 10:16:20 +00:00
Douglas Lovell
b1bda995a6 Merge branch 'deploy-20181029a'
GitOrigin-RevId: c51d4da706319564bd31514370fe13413655b6cf
2018-10-29 15:01:41 +00:00
Brian Gough
207b0d84c7 Merge pull request #1074 from sharelatex/bg-fail-gracefully-on-copy-project-error
handle failure in parallel copy

GitOrigin-RevId: 67ad5ab9f31689ef66ea2cce75c99c72bf23df41
2018-10-29 13:57:02 +00:00
Brian Gough
707a258d5b Merge pull request #1040 from sharelatex/bg-start-history-in-v2-for-old-projects
allow creating v2 history for existing project without v2 history

GitOrigin-RevId: 2ccbe55f5c203c37d37be00306de5e265555f909
2018-10-29 13:56:55 +00:00
Timothée Alby
3d94be22b1 Merge pull request #1065 from sharelatex/ta-manage-group-members
Manage Group Members

GitOrigin-RevId: f0b120630ded1874dfc0352055633afff0015da9
2018-10-25 15:26:00 +00:00
Timothée Alby
aa549dd0d4 Merge pull request #1063 from sharelatex/ta-remove-add-user-to-group
Remove addUserToGroup Action

GitOrigin-RevId: 4f0cbf3dce47ee317b14784402128960a2caffa1
2018-10-25 15:25:55 +00:00
Timothée Alby
aff47a4b11 Merge pull request #1062 from sharelatex/ta-metric-authorization
Use UserMembership Authorization Middlewear for Metrics

GitOrigin-RevId: a145527723539696c2659baa16c507ab54f629a3
2018-10-25 15:25:50 +00:00
Timothée Alby
edd832b1f2 Merge pull request #1067 from sharelatex/ta-add-missing-mock
Add Missing Test Mock

GitOrigin-RevId: 69a08a1a13a72fe180ab11d1001eca424b149d1f
2018-10-25 15:25:44 +00:00
Timothée Alby
2421e15d7a Merge pull request #1060 from sharelatex/ja-remove-v2-banner
Remove unneeded v2 banner

GitOrigin-RevId: 972afc2bd07ab64b0dd558cf1f15c0272f575b87
2018-10-25 15:25:35 +00:00
Timothée Alby
fd8b7fbb6c Merge pull request #1068 from sharelatex/jel-link-to-tab
Fix .link-to-tab when link within a tab

GitOrigin-RevId: b2d5482771caef5abc4afa4d270f64598f72f0d7
2018-10-25 15:25:29 +00:00
Alasdair Smith
f442fd65e3 Merge pull request #1043 from sharelatex/as-increase-heading-line-height
Increase line-height of headings

GitOrigin-RevId: 57d1c87f4c480fb6de0a1ca24f7e80edfe748a68
2018-10-25 12:51:28 +00:00
Alasdair Smith
39a7c80b07 Merge pull request #1066 from sharelatex/as-add-templates-nav
Fix navbar collapsing too late at small screen sizes

GitOrigin-RevId: 8bfe1dbe89cf8721bc72b0a632533776873459b7
2018-10-25 12:51:23 +00:00
Alasdair Smith
27fd090075 Merge pull request #1064 from sharelatex/as-fix-500-on-teams
Fix 500 on /teams route

GitOrigin-RevId: 9f554f9b77fb7fea64db1ad9c4d8635f47efff9e
2018-10-25 12:51:18 +00:00
Timothée Alby
27475bd980 Merge pull request #1059 from sharelatex/ja-ignore-modules-makefiles
gitignore module makefiles

GitOrigin-RevId: e8473b8e23f59ecfb27b449a503f8a7b023533a2
2018-10-24 14:03:16 +00:00
Timothée Alby
7af86b0704 Merge pull request #1045 from sharelatex/bg-fix-missing-next-in-subscription-group-controller
fix missing next argument

GitOrigin-RevId: 290741a98a3fb7463d6a6dd052f90c8ffe4e62ce
2018-10-24 14:03:02 +00:00
Timothée Alby
b123f830ff Merge pull request #1042 from sharelatex/ta-user-membership-access
User Membership Access Refactor

GitOrigin-RevId: 23e8d342bc4829450625146213ff92cb042550dd
2018-10-24 14:02:55 +00:00
Timothée Alby
3abfe36279 Merge pull request #1057 from sharelatex/ja-update-git-ignore
Don't gitignore new module directories

GitOrigin-RevId: f6c4a65af6fa98c879c0ceb952f3161d6f395dee
2018-10-24 12:49:53 +00:00
James Allen
eecbbc045d Merge pull request #1044 from sharelatex/ja-merge-modules
Merge modules into web monorepo

GitOrigin-RevId: 742df73bff72010b01c93e20759a489969b04ed3
2018-10-24 10:29:57 +00:00
Brian Gough
d75d8ee079 Merge pull request #1035 from sharelatex/bg-fix-github-sync-filetypes
check the filetype before syncing file

GitOrigin-RevId: ec1a309e2423c6ff2c73202dcabae610edce4f6e
2018-10-23 13:16:30 +00:00
Simon Detheridge
8b55643f7e Merge pull request #1030 from sharelatex/spd-bonus-program
Implement bonus program

GitOrigin-RevId: a18dd8a916c6f317a11661f106cdb4a2983c4ad8
2018-10-23 11:36:17 +00:00
Jessica Lawshe
24a2cafc33 Merge pull request #1038 from sharelatex/jel-style-improvements
Content pages style improvements

GitOrigin-RevId: 6cb212deba561ebfa6349bdfcf16e309679be275
2018-10-19 14:12:35 +00:00
Jessica Lawshe
7a03fbeb06 Merge pull request #1018 from sharelatex/jel-track-changes-info-page
Styling for track changes info page and add existence checks for metadata

GitOrigin-RevId: 86a6b178e8107c75ef5b877acc1aaa3d8d1ebd80
2018-10-19 14:12:30 +00:00
James Allen
1aecd0be3d Merge pull request #1039 from sharelatex/ja-copybara
Sync to OSS repo using copybara

GitOrigin-RevId: 5ce0c08d614f3d84e7c3e1f9b3413681e5049103
2018-10-19 12:46:51 +00:00
Paulo Jorge Reis
6dd9680af8 Merge pull request #1036 from sharelatex/pr-fix-i18n-breaking-layout
Fix single-quotes breaking layout directive
2018-10-19 11:30:59 +01:00
Paulo Jorge Reis
6f86e32898 Merge pull request #1031 from sharelatex/pr-fetch-branding-data
Fetch branding data for branded projects, inject it into the editor frontend
2018-10-19 11:30:38 +01:00
Paulo Reis
00a489a000 Fetch brand variation details for branded projects; inject details into the editor page front-end.
Test brand variation details.

Rename BrandVariationsController to BrandVariationsHandler.

Use the V1 API helper.

Do not swallow errors when fetching brand details for project load.

Fix indentation.
2018-10-19 10:47:02 +01:00
Paulo Reis
a957593b62 Avoid adding custom toggler attributes when the feature flag is false. 2018-10-19 10:34:07 +01:00
Paulo Reis
4232732646 Avoid using Angular eval for user-provided strings in the layout directive. 2018-10-19 10:00:52 +01:00
Jessica Lawshe
a1fa48b3ed Merge pull request #1033 from sharelatex/jel-portal-default-bg
Add default portal background
2018-10-18 10:31:07 -05:00
Jessica Lawshe
96b24a80ca Merge pull request #944 from sharelatex/jel-linkable-tabs
Linkable tabs directive
2018-10-18 10:30:58 -05:00
Brian Gough
c6ec31c773 Merge pull request #1024 from sharelatex/bg-avoid-duplicate-project-names
avoid duplicate project names for templates and zips
2018-10-18 13:51:05 +01:00
Jessica Lawshe
88f3fce26e Add default portal background 2018-10-17 17:00:50 -05:00
Jessica Lawshe
1362da710b Watch for hash change for tabs 2018-10-17 09:31:48 -05:00
Jessica Lawshe
97fdf72346 If hash not empty and remove unused file 2018-10-17 09:31:48 -05:00
Paulo Reis
1424ae686a Add scrollIntoView behaviour. 2018-10-17 09:31:48 -05:00
Paulo Reis
399a9ed604 Create bookmarkable tabs directive. 2018-10-17 09:31:48 -05:00
Alasdair Smith
baf8b599d7 Handle hash-bang urls used sometimes in v1 2018-10-17 09:31:48 -05:00
Jessica Lawshe
8e99142537 Add main CMS controller
Main is in index now, and blog controller moved to separate file
2018-10-17 09:31:48 -05:00
Jessica Lawshe
bec50892de Linkable tabs 2018-10-17 09:31:48 -05:00
Simon Detheridge
6ad16c9406 Merge pull request #1028 from sharelatex/spd-no-github-for-new-users
retry: Don't add old v1 features for new accounts
2018-10-17 14:51:46 +01:00
Brian Gough
ad6b3a625a use generateUniquename to create names with timestamps 2018-10-16 14:43:40 +01:00
Hugh O'Brien
3b766bf523 Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id
Create projects with brand variation id
2018-10-16 11:17:09 +01:00
Hugh O'Brien
876663f94b Merge pull request #1006 from sharelatex/hb-v2-affiliations-callback
Add affiliations on university domain confirmation
2018-10-16 11:17:01 +01:00
Simon Detheridge
0f54bc2c52 Add additional tests for V1SubscriptionManager
One call was not returning the v1Id correctly. These tests check for that case. Also added some more generic tests for the v1 API call.

bug: overleaf/sharelatex#1014
2018-10-16 10:15:42 +01:00
Simon Detheridge
6fc6c44605 Don't add old v1 features for new accounts
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.

Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.

bug: overleaf/sharelatex#1014
2018-10-16 09:45:16 +01:00
Simon Detheridge
8c1c3f4eb3 Merge pull request #1027 from sharelatex/revert-1022-spd-no-github-for-new-users
Revert "Don't add old v1 features for new accounts"
2018-10-15 17:47:14 +01:00
Simon Detheridge
ec9c38df57 Revert "Don't add old v1 features for new accounts" 2018-10-15 17:46:48 +01:00
Simon Detheridge
85f097343f Merge pull request #1022 from sharelatex/spd-no-github-for-new-users
Don't add old v1 features for new accounts
2018-10-15 15:28:34 +01:00
Timothée Alby
c41fb5c9f4 Merge pull request #942 from sharelatex/pr-dismiss-email-confirmation
Email confirmation notification UI fixes
2018-10-15 14:49:06 +02:00