Emil Siverhall
|
a39b64a673
|
Merge branch 'mailMessageExceptions' into develop
* mailMessageExceptions:
Changes to our mail sender to make partial sending possible, when some of the recipients is invalid.
|
2012-03-28 13:27:05 +02:00 |
|
Emil Siverhall
|
f4c0ed35e0
|
Changes to our mail sender to make partial sending possible, when some of the recipients is invalid.
|
2012-03-28 13:26:50 +02:00 |
|
Fredrik Friis
|
f07d362242
|
fixed conflicts
|
2012-03-28 12:09:28 +09:00 |
|
Fredrik Friis
|
beb3fd3aeb
|
removed unneccessary service class, wired methods to repo instead
|
2012-03-28 10:00:37 +09:00 |
|
Tom Vahlman
|
0c346f70a2
|
The EmployeeAutoComplete should be used for the search term userName <email>.
|
2012-03-27 23:17:44 +02:00 |
|
Tom Vahlman
|
e658de0ed5
|
Revert previous change because of Jenkins complaints.
|
2012-03-27 23:04:23 +02:00 |
|
Tom Vahlman
|
3a76999fe8
|
The EmployeeAutoComplete should be used for the search term userName <email>.
|
2012-03-27 22:48:19 +02:00 |
|
Emil Siverhall
|
5519782b05
|
Merge branch 'mailProjectClass' into develop
* mailProjectClass:
changed project class selection from dropbox to radio choice in the admin mail panel, so the user may pick more than one level
|
2012-03-27 22:16:59 +02:00 |
|
Emil Siverhall
|
4b55377ca2
|
changed project class selection from dropbox to radio choice in the admin mail panel, so the user may pick more than one level
|
2012-03-27 22:10:28 +02:00 |
|
Tom Vahlman
|
af41fcea82
|
The no active project page should use the panel in the settings package instead of the deprecated panel.
|
2012-03-27 19:01:29 +02:00 |
|
Tom Vahlman
|
9ceea3ca60
|
The no active project page should use the panel in the settings package instead of the deprecated panel.
|
2012-03-27 18:53:24 +02:00 |
|
Tom Vahlman
|
a5097387fb
|
We should open the user settings from the menu instead from the cog wheel icon.
|
2012-03-27 17:03:35 +02:00 |
|
Emil Siverhall
|
54d8982c19
|
Merge branch 'workerScheduler' into develop
|
2012-03-27 13:51:06 +02:00 |
|
Emil Siverhall
|
45856989b3
|
changed startup time for the supervisor and projects import worker from 23.00 to 00.05
|
2012-03-27 13:50:39 +02:00 |
|
Emil Siverhall
|
078eb23516
|
Merge branch 'commentForStudent' into develop
|
2012-03-27 12:29:36 +02:00 |
|
Emil Siverhall
|
7d93f1b2f8
|
added dialog with refuse comment for authors to read under my project ideas page
|
2012-03-27 12:27:45 +02:00 |
|
Emil Siverhall
|
2ad03a4761
|
added new panel where admin should write a comment for the authors when refusing a project idea
|
2012-03-27 11:33:00 +02:00 |
|
Fredrik Friis
|
5baf4e2507
|
reconnected findname request from gui from repo to service
|
2012-03-27 11:41:00 +09:00 |
|
Fredrik Friis
|
1e48a6de1d
|
good separation of code now
|
2012-03-27 11:38:37 +09:00 |
|
Emil Siverhall
|
c684abaabf
|
Merge branch 'ajaxRefactoring' into develop
|
2012-03-26 15:17:00 +02:00 |
|
Emil Siverhall
|
cb10a46c48
|
minor styling change
|
2012-03-26 15:12:52 +02:00 |
|
Emil Siverhall
|
f2a7405354
|
fixed bug that made dialog close when sorting project dataview. a lot of refactoring of the use of dialogs to make the page load much faster
|
2012-03-26 15:12:50 +02:00 |
|
Emil Siverhall
|
97e72bb6b4
|
research area and unit filtering on match - supervisor settings now uses new filter panel to save space
|
2012-03-26 15:12:48 +02:00 |
|
Emil Siverhall
|
a1be79e4e5
|
filter keyword dropdown now returns list of the selected keywords
|
2012-03-26 15:12:46 +02:00 |
|
Emil Siverhall
|
621d163b37
|
started to work on new component for keyword filtering used in supervisor settings tab. using dropdown to save space and render list of choices underneath
|
2012-03-26 15:12:43 +02:00 |
|
Emil Siverhall
|
ee1f668baf
|
started with some refactoring work on admin - supervisor settings
|
2012-03-26 15:12:42 +02:00 |
|
Emil Siverhall
|
c7f681cda7
|
removed some hardcoded project class values
|
2012-03-26 15:12:39 +02:00 |
|
Tom Vahlman
|
75ecb358e2
|
Changed size of window for adding supervisor interest + refactored a complicated method.
|
2012-03-26 13:51:21 +02:00 |
|
Fredrik Friis
|
7914adc5a7
|
some gui improvements
|
2012-03-26 18:50:38 +09:00 |
|
Tom Vahlman
|
93b2db6a59
|
The new data tables are now created automatically so we dont need this property any more.
20120326
|
2012-03-26 11:44:57 +02:00 |
|
Fredrik Friis
|
8b420811fa
|
changed name of page
|
2012-03-26 18:41:45 +09:00 |
|
Tom Vahlman
|
158c53ef7a
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminStatisticsPage.java
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaPage.java
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorUnmatchedProjectIdeaPage.java
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java
|
2012-03-26 11:37:04 +02:00 |
|
Tom Vahlman
|
64b6b2a4ef
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
Conflicts:
src/test/java/se/su/dsv/scipro/configuration/TestDeployConfiguration.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestActivityPlanDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestBoardMessageDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestCategoryDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestCheckListTemplateDao.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestCheckPlagiarismEventDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestCommentThreadDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestFinalSeminarDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestMessageBoardDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestPeerReviewDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestPrivateMessageDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestProjectDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestProjectPartnerDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestRatableDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestRecipientDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestResourceDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestRoleDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestScheduleTemplateDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestStringResourceDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestTagDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestUserDaoJPA.java
src/test/java/se/su/dsv/scipro/dao/jpa/TestWebNotificationDaoJPA.java
src/test/java/se/su/dsv/scipro/data/dao/jpa/TestQuery.java
src/test/java/se/su/dsv/scipro/data/dao/jpa/TestQuerySet.java
src/test/java/se/su/dsv/scipro/dataproviders/TestSortableDataProvider.java
src/test/java/se/su/dsv/scipro/match/TestGreedyMatchingAlgorithm.java
src/test/java/se/su/dsv/scipro/match/TestMatcher.java
src/test/java/se/su/dsv/scipro/match/dao/TestApplicationPeriodDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestAuthorDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestExemptionDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestKeywordDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestMatchDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestProjectIdeaDao.java
src/test/java/se/su/dsv/scipro/match/dao/TestSupervisorDao.java
src/test/java/se/su/dsv/scipro/match/dataobject/TestProjectIdea.java
|
2012-03-26 11:36:34 +02:00 |
|
Tom Vahlman
|
08e5a59e4e
|
Added a feedback panel to give users information when a supervisor has reported interest to supervise a project idea + removed text area which we not should use.
|
2012-03-26 11:36:19 +02:00 |
|
Fredrik Friis
|
625e3fd1e3
|
new improvements
|
2012-03-26 18:25:54 +09:00 |
|
Tom Vahlman
|
1065fd4131
|
Embeddable class Watson should be in a stand alone class file.
|
2012-03-26 11:12:10 +02:00 |
|
Tom Vahlman
|
7bedf545e0
|
Embeddable class Watson should be in a stand alone class file.
|
2012-03-26 10:54:08 +02:00 |
|
Emil Siverhall
|
ac500e5347
|
Merge branch 'importLinkFix' into develop
|
2012-03-26 09:34:46 +02:00 |
|
Emil Siverhall
|
8971e299df
|
changed api url to make supervisor and reviewer imports work correctly
|
2012-03-26 09:34:12 +02:00 |
|
Fredrik Friis
|
fbf4023c09
|
some markup improvements
|
2012-03-26 15:34:51 +09:00 |
|
Fredrik Friis
|
25f9417c5e
|
project idea status matrix pretty complete
|
2012-03-26 15:30:03 +09:00 |
|
Fredrik Friis
|
d26cc80920
|
implementing new service method
|
2012-03-26 15:25:08 +09:00 |
|
Fredrik Friis
|
a4c1279b8c
|
service class seems to work
|
2012-03-26 14:19:15 +09:00 |
|
Fredrik Friis
|
affdf0d2f7
|
adding a service to a panel now works
|
2012-03-26 14:11:02 +09:00 |
|
Fredrik Friis
|
f83fb79543
|
some refactoring
|
2012-03-26 13:36:11 +09:00 |
|
Fredrik Friis
|
64c8be3954
|
spring error when adding bean to a panel
|
2012-03-26 13:27:15 +09:00 |
|
Fredrik Friis
|
7518bc62cd
|
trying implementing a method
|
2012-03-26 13:22:16 +09:00 |
|
Fredrik Friis
|
8f8b70e7cf
|
new separation
|
2012-03-26 13:18:37 +09:00 |
|
Fredrik Friis
|
d6349d1497
|
redoing
|
2012-03-26 13:16:28 +09:00 |
|
Fredrik Friis
|
8654731f43
|
beginning to implement new panel, starting with service
|
2012-03-26 12:51:15 +09:00 |
|