Commit Graph

778 Commits

Author SHA1 Message Date
Ramon Wenger a5b05c5faa Add refresh on room page 2019-05-14 09:53:49 +02:00
Ramon Wenger 175b517e75 Add form for editing project entries 2019-05-13 17:57:21 +02:00
Ramon Wenger dda9f75011 Disable task content block creation for students 2019-05-09 10:20:26 +02:00
Ramon Wenger 28f96f8517 Force http on links 2019-05-09 09:18:21 +02:00
Ramon Wenger 545f3adb41 Fix wording 2019-05-09 09:13:01 +02:00
Ramon Wenger c8f02ec6b2 Fix room entry widget height 2019-05-09 09:12:42 +02:00
Ramon Wenger bd1286abba Prevent double saving on entity creation 2019-05-08 14:42:58 +02:00
Ramon Wenger 2a6d2fe693 Add document block to room entry 2019-05-07 16:17:33 +02:00
Ramon Wenger e88b9a07db Hide assignment block type on room entry form 2019-05-07 15:50:19 +02:00
Ramon Wenger a0b49a752b Display documents in projects in a more useful manner 2019-05-07 15:27:21 +02:00
Christian Cueni 6513da19cf Fix url in cypress test 2019-04-25 12:41:19 +02:00
Ramon Wenger 96ffc7f484 Fix typos 2019-04-25 12:01:00 +02:00
Christian Cueni ed38e73f5b Merged in feature/profile-image (pull request #16)
Feature/profile image

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-04-25 09:23:37 +00:00
Christian Cueni 4688a29122 Clean up code 2019-04-25 10:57:13 +02:00
Christian Cueni 55364cb067 Merged in feature/user-widget-no-link (pull request #15)
Move profile link to parent elements

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-04-25 06:09:09 +00:00
Christian Cueni 1da5c4bb29 Use background image instead of img 2019-04-24 17:06:11 +02:00
Christian Cueni 979b732583 Move profile link to parent elements 2019-04-24 14:50:00 +02:00
Christian Cueni aca8bd0d2d Add possibility to upload avatars 2019-04-24 14:23:54 +02:00
Ramon Wenger d7a3dd74c2 Add document upload to project entry 2019-04-24 10:41:27 +02:00
Ramon Wenger 244f7405f6 Fix portfolio on mobile 2019-04-23 16:38:24 +02:00
Christian Cueni b0d52e55b4 Merge branch 'hotfix/pw-reset' into develop 2019-04-23 11:13:06 +02:00
Christian Cueni 502f73e7d2 Hide password reset link 2019-04-23 11:12:31 +02:00
Christian Cueni 6b0a2e0d59 update text 2019-04-16 14:25:14 +02:00
Christian Cueni f869b0141f show add entry button only to owner, don’t allow project entries from other users 2019-04-16 12:48:54 +02:00
Christian Cueni 69c9ecafd8 fix white background in projects, add screenshots to gitignore 2019-04-16 11:16:27 +02:00
Christian Cueni e9bb8844e7 update hamburger icon 2019-04-16 08:33:20 +02:00
Christian Cueni d7cd5d2809 Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2019-04-16 08:22:39 +02:00
Christian Cueni 6ae6a7cbdb clean up some copy and css 2019-04-16 08:22:23 +02:00
Ramon Wenger 83721de7ea Fix cypress test 2019-04-15 12:56:55 +02:00
Christian Cueni 40a0c3ecbe Merge branch 'feature/pw-reset' into develop 2019-04-15 10:31:14 +02:00
Christian Cueni 807005e164 truncate activity text 2019-04-15 10:29:24 +02:00
Christian Cueni 2051395e7b fix scrolling 2019-04-15 09:36:56 +02:00
Ramon Wenger 67370f7b4f Fix some more IE11 issues 2019-04-14 21:09:56 +02:00
Ramon Wenger d7b9fa0106 Make tooltip wrappable 2019-04-11 17:03:06 +02:00
Christian Cueni 59d88d5143 use activity data in frontent 2019-04-11 17:00:59 +02:00
Ramon Wenger 0fd1e928ae Add tooltip for help text 2019-04-11 16:47:46 +02:00
Ramon Wenger e525e0d3de Add correct color to portfolio project page 2019-04-11 14:31:09 +02:00
Ramon Wenger 6853cc8734 Update last module in a mutation instead of the query 2019-04-11 14:15:36 +02:00
Ramon Wenger 09d20e346d Add test for current module 2019-04-11 14:15:36 +02:00
Christian Cueni fa98141f3c add myActivity query 2019-04-11 10:12:15 +02:00
Christian Cueni f8c1f372cb merge develop into feature/pw-reset 2019-04-11 08:14:08 +02:00
Christian Cueni f51924330c add new components with dummy data 2019-04-10 15:50:14 +02:00
Christian Cueni afe29f3f0c Merged in feature/share-portfolio (pull request #13)
Feature/share portfolio

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-04-10 07:51:19 +00:00
Christian Cueni aca36b8a66 resolve conflicts 2019-04-10 09:37:42 +02:00
Christian Cueni 42c579b047 use me query, add components 2019-04-09 16:24:05 +02:00
Ramon Wenger 78bc046462 Add back button on submissions page 2019-04-09 14:50:16 +02:00
Ramon Wenger 26981f3125 Fix cypress test 2019-04-09 14:37:21 +02:00
Ramon Wenger 8a57e7ae48 Merged in feature/mobile-navigation (pull request #14)
Feature/mobile navigation

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-04-09 10:58:07 +00:00
Ramon Wenger 4a2492ef50 Clean up code 2019-04-09 12:57:05 +02:00
Christian Cueni 8b53d2fa7e add my schoolclasses query, fix test 2019-04-09 11:27:30 +02:00