09c92c0b69
don't encode /
2018-09-14 16:09:24 +01:00
2e4d3d7aab
change links to v1 to sign user in first
2018-09-14 14:26:16 +01:00
b14fe82c1c
Merge pull request #921 from sharelatex/ta-remove-unused-call
...
Remove Unused Call to UserGetter.getUser
2018-09-14 12:43:44 +01:00
0051e59309
remove unused call to UserGetter.getUser
2018-09-13 17:39:30 +01:00
14b77a2060
Merge pull request #916 from sharelatex/revert-900-ja-show-last-modified
...
Revert "Record and show last modified by user for projects"
2018-09-13 14:01:36 +01:00
ef11161ddb
Revert "Record and show last modified by user for projects"
2018-09-13 14:00:30 +01:00
078575b236
Merge pull request #900 from sharelatex/ja-show-last-modified
...
Record and show last modified by user for projects
2018-09-13 13:19:25 +01:00
5dbebc0693
Translate 'by'
2018-09-13 10:38:52 +01:00
ab871b9ba7
Fix tabs vs spaces
2018-09-13 10:38:52 +01:00
dd4b85b809
Combine v1 and v2 projects into item.pug
2018-09-13 10:38:52 +01:00
225d30ffd2
Add missed lines from rebase
2018-09-13 10:38:52 +01:00
c072961183
Update project-list list to a table and show last updated user
2018-09-13 10:38:52 +01:00
ab10336110
Record last update time and user from project-history
2018-09-13 10:38:52 +01:00
24c479e984
Merge pull request #885 from sharelatex/hb-ip-matcher-notifications
...
IP matcher affiliation CTA notifications
2018-09-13 08:59:25 +01:00
c799502145
Merge pull request #911 from sharelatex/jel-tab-style
...
Custom tab styling
2018-09-13 08:59:14 +01:00
75a6b8f32b
Move custom tab styling to file
...
Custom tab styling was nested within a portal class. This styling is also needed on the CMS pages.
2018-09-12 16:34:38 -05:00
47a7d2eaa9
Merge pull request #909 from sharelatex/bg-fix-typo-in-error-definitions
...
fix typo in Errors, only two underscores in __proto__
2018-09-12 10:56:20 +01:00
6d54e843e8
fix typo in Errors, only two underscores in __proto__
2018-09-12 10:45:50 +01:00
f7e4750df6
Merge pull request #903 from sharelatex/as-cursor-position-change-editor
...
Store cursor & line position when switching editor
2018-09-11 10:44:24 -05:00
820e2de699
Merge pull request #906 from sharelatex/jel-cms-pages
...
Images on Wiki and CMS pages
2018-09-11 10:44:11 -05:00
66e288864b
Wiki and CMS images height and width
2018-09-11 07:46:38 -05:00
ffcbda1efe
Merge pull request #876 from sharelatex/ew-collabratec2
...
Redo Reverted Deploy
2018-09-10 09:00:56 -04:00
7d3e17651f
set options and method for request, pass cookies and form body
2018-09-10 06:10:36 -04:00
dd056e36ae
add overleaf method
2018-09-10 06:10:36 -04:00
b6a4bb74f8
Store cursor & line position when switching editor
...
When tearing down the source editor, we need to store the updated cursor
position, so that the position can be moved to when opening the rich
text editor.
2018-09-10 11:02:08 +01:00
1e04a09ec6
remove unnecessary error returns and ip fetching
2018-09-07 18:15:32 +01:00
eba14ee7d6
Merge pull request #874 from sharelatex/dcl-olsl760b
...
Stylesheet for publish modal
2018-09-07 10:27:11 +01:00
55f9cd4851
Merge pull request #837 from sharelatex/cmg-gallery-improvements
...
Improve styling of the v2 gallery pages
2018-09-06 11:49:51 -05:00
0d283f103a
Move remaining new styles to v2-templates
2018-09-06 15:21:19 +01:00
f3c47320cf
Tidy up
2018-09-06 15:21:19 +01:00
6c7301fb09
Templates detail page
2018-09-06 15:20:03 +01:00
59ae0efad7
Templates index page
2018-09-06 15:20:03 +01:00
aa2f6ad0dd
Merge pull request #880 from sharelatex/jel-v2-launch-plans
...
Launch v2 Plans Page
2018-09-06 08:51:05 -05:00
0739bdd8de
Merge pull request #891 from sharelatex/jel-v2-plans-quotes
...
Add quotes to plans page
2018-09-06 08:50:37 -05:00
29e9d5a1e6
Merge pull request #899 from sharelatex/sk-account-delete-confirm-delete-sharelatex
...
Add another confirmation checkbox to account-delete.
2018-09-06 11:57:34 +01:00
3d369b725c
Add another confirmation checkbox to account-delete.
...
This confirms the user understands they will lose both their OL v2 and SL
accounts, and their projects.
2018-09-06 11:35:28 +01:00
8ef90a0dcb
move call for creating ip matched notifcation to project controller
2018-09-05 15:40:59 +01:00
c3c2e524f5
Add quotes
2018-09-05 08:14:32 -05:00
40a412b6b9
Remove plans message about v2 beta
2018-09-05 08:14:05 -05:00
65b2715e62
Remove unused layout for v2 plans
2018-09-05 08:14:05 -05:00
a4956294c1
Remove plans redirect
2018-09-05 08:14:05 -05:00
f0d17c1db7
Merge pull request #894 from sharelatex/as-fix-homepage-cta
...
Fix height issue on homepage for smaller screens
2018-09-05 11:47:02 +01:00
9b37b0e66f
Merge pull request #895 from sharelatex/ta-add-method-alias
...
add userHasSubscriptionOrIsGroupMember alias
2018-09-05 11:43:49 +01:00
9ec60a128a
add userHasSubscriptionOrIsGroupMember alias
2018-09-05 11:37:37 +01:00
5605e1c5c3
update copy for ip match notifications
2018-09-05 11:22:26 +01:00
23e6292fd7
updating tests for ip matcher logic
2018-09-05 11:22:26 +01:00
f20d27986b
create ip match notifications without forcing replacement
2018-09-05 11:22:26 +01:00
d950e14b3f
use new routes and params from v1 ip matcher endpoint
2018-09-05 11:22:26 +01:00
bf2ea4e7b3
test against ip matcher for notification on login if different from previous ip
2018-09-05 11:22:26 +01:00
de83df2703
adding tests for ip matching notifications
2018-09-05 11:22:25 +01:00
Tim Alby