DMC/scipro
7
0
Fork 0
Code Issues 20 Pull Requests 8 Actions Projects 1 Wiki Activity
4,123 Commits 11 Branches 410 Tags 74 MiB
2012-05-07
Commit Graph

4123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fredrik Friis
47e5210013 added isthesisfile boolean attribute to node type definition 2012-04-17 12:34:05 +09:00
Emil Siverhall
810bf7cd84 Merge branch 'removeMySettings' into develop 2012-04-16 12:38:38 +02:00
Emil Siverhall
1c5d4401bc removed My settings tab from service menu panel. Did not remove the class file yet if we need settings page in the future. 2012-04-16 12:36:12 +02:00
Emil Siverhall
ef8094ff3c Merge branch 'opponentBugFix' into develop 2012-04-16 11:35:27 +02:00
Emil Siverhall
e3cc5b63a9 fixed rendering bug on project opposition page 2012-04-16 11:35:07 +02:00
Emil Siverhall
c00c7e7b22 Merge branch 'studentMyProjects' into develop 2012-04-16 11:22:55 +02:00
Emil Siverhall
b8b426a9b9 removed unused imports and unused class file 2012-04-16 11:21:01 +02:00
Emil Siverhall
65aa8195a4 automatically redirect authors with 1 or 0 projects to appropriate project details page or project idea page 2012-04-16 11:20:59 +02:00
Emil Siverhall
8695d5ef38 code cleanup and restructuing of the options in tab menu panels 2012-04-16 11:20:57 +02:00
Emil Siverhall
3c7be4a34d more removal of scipro sesssion get active project code 2012-04-16 11:20:55 +02:00
Emil Siverhall
91515f7d15 changes to project opposition page to avoid using the sessions active project 2012-04-16 11:20:53 +02:00
Emil Siverhall
e4e4cdb30d mounted url for new project details sub page 2012-04-16 11:20:49 +02:00
Emil Siverhall
070be3c864 added opposition page to sub menu 2012-04-16 11:20:47 +02:00
Emil Siverhall
5aab5c27f4 added correct menu highlighting to peer pages as well 2012-04-16 11:20:45 +02:00
Emil Siverhall
19a2fa072b added correct menu highlighting for sub tabs in author - my projects 2012-04-16 11:20:43 +02:00
Emil Siverhall
44e672c1c2 changes to project checklist page to make them render with new hierarchy 2012-04-16 11:20:41 +02:00
Emil Siverhall
4206503b00 more major refactoring work of the author part of scipro. still a lot to be done, but my projects exist with sub tabs for each project 2012-04-16 11:20:39 +02:00
Emil Siverhall
04fdd8e5f4 added spring data repos for projects and student roles. also some service implementations in the project service class 2012-04-16 11:20:37 +02:00
Emil Siverhall
98f0224929 started with major refactoring work of the author view with my projects interaction 2012-04-16 11:13:23 +02:00
Tom Vahlman
433a36c0d6 Removed code that not are used because the JPQL is replaced with SQL. 2012-04-16 10:47:50 +02:00
Tom Vahlman
7615f51958 Removed code that not are used because the JPQL is replaced with SQL. 2012-04-16 10:41:48 +02:00
Fredrik Friis
29411b3059 removed unneccessary div tag 2012-04-16 15:03:19 +09:00
Fredrik Friis
1b671405e5 made page even wider 2012-04-16 15:00:55 +09:00
Fredrik Friis
7792af8737 gui improvements on my requests and reviews 2012-04-16 14:58:54 +09:00
Fredrik Friis
6d8af8a179 gui improvements on my requests and reviews 2012-04-16 14:55:19 +09:00
Fredrik Friis
189975b030 made page wider 2012-04-16 14:40:45 +09:00
Fredrik Friis
ed06b63335 some cleanup of the test 2012-04-16 13:55:04 +09:00
Fredrik Friis
2add49eec2 added checklistanswerrepo and service layer, switch from dao to new service in test, all good 2012-04-16 13:53:07 +09:00
Fredrik Friis
9ec293f811 added checklistquestionrepo and service layer, changed from checklistquestiondao to checklistquestionservice in test, all good 2012-04-16 13:48:02 +09:00
Fredrik Friis
84af071d1e switched from projectdao to projectservice in test, all good 2012-04-16 13:41:45 +09:00
Fredrik Friis
1b648f650f added project repo and service layer 2012-04-16 13:40:03 +09:00
Tom Vahlman
0810bc0c4a The sorting SQL:s now returns the same number of employees when sorting on keyword as returned when sorting on last name. 2012-04-14 11:33:59 +02:00
Tom Vahlman
439c6d7774 The sorting SQL:s now returns the same number of employees when sorting on keyword as returned when sorting on last name. 2012-04-14 11:23:09 +02:00
Tom Vahlman
b60f3d61c8 The sorting SQL:s now returns the same number of employees when sorting on keyword as returned when sorting on last name. 2012-04-14 11:20:59 +02:00
Tom Vahlman
cdc50fae90 The sorting SQL:s now returns the same number of employees when sorting on keyword as returned when sorting on last name. 2012-04-14 11:18:02 +02:00
Fredrik Friis
3ad8621ae9 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2012-04-13 22:03:20 +09:00
Fredrik Friis
081cfac35a Merge branch 'feature' into develop 2012-04-13 22:02:13 +09:00
Fredrik Friis
7849c8ff54 actually it works, you just need to add some waiting in between updating dates 2012-04-13 22:01:00 +09:00
Fredrik Friis
68f76ae00b testing, one method doesnt seem to work 2012-04-13 21:38:02 +09:00
Tom Vahlman
b7c092aaaa The sorting should always be in descending order for numbers when first clicking on a new search term, i. e. another Keyword type (area or regular). SQl (and not HQL) must be used in the database tier because of the implementation of Employee#keywords. 2012-04-13 14:36:48 +02:00
Tom Vahlman
1ed21f3b75 The sorting should always be in descending order for numbers when first clicking on a new search term, i. e. another Keyword type (area or regular). 2012-04-13 14:35:13 +02:00
Fredrik Friis
335125dc32 added sql to current sql 2012-04-13 19:16:00 +09:00
Fredrik Friis
29d25873a8 using capital letters for indications to make them more visible 2012-04-13 19:06:21 +09:00
Fredrik Friis
66889d017e changed indication text to new answer instead of change 2012-04-13 18:57:48 +09:00
Fredrik Friis
9d0314c77d works for supervisor too. made supervisor project checklist page a bit wider. 2012-04-13 18:55:01 +09:00
Fredrik Friis
ce82fe1bb9 indication is removed if the user is the one who makes a change in the checklist 2012-04-13 18:45:05 +09:00
Fredrik Friis
d50681c2b7 indication is now removed when user opens the checklist 2012-04-13 18:33:25 +09:00
Fredrik Friis
6aaa4dd4f2 mail got nice url 2012-04-13 11:40:51 +09:00
Emil Siverhall
f2e572876e Merge branch 'logFix' into develop 
* logFix:
  added logger for successful mail events
 2012-04-12 08:30:59 +02:00
Emil Siverhall
ae33f381fd added logger for successful mail events 2012-04-12 08:30:29 +02:00