DMC/scipro
7
0
Fork 0
Code Issues 27 Pull Requests 4 Actions Projects 1 Wiki Activity
14,332 Commits 8 Branches 416 Tags
Commit Graph

14332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fred-fri
a7f88e02b6 fixes 2014-04-16 19:27:38 +09:00
fred-fri
ed5b695285 column fixes 2014-04-16 19:19:03 +09:00
fred-fri
c1abd96382 icon fixes 2014-04-16 19:16:23 +09:00
fred-fri
213d70800a Merge remote-tracking branch 'origin/develop' into develop 2014-04-16 18:50:35 +09:00
fred-fri
b78f73beec icon fixes 2014-04-16 18:50:19 +09:00
Emil Siverhall
c383d2ef26 Merge remote-tracking branch 'origin/develop' into develop 2014-04-16 11:06:29 +02:00
Emil Siverhall
d82725055e make sure we can't add supervisor as revewier through table cells auto complete 2014-04-16 11:04:59 +02:00
fred-fri
f12569e817 Merge remote-tracking branch 'origin/develop' into develop 2014-04-16 17:20:13 +09:00
fred-fri
1dd5d1d089 fixed info icon jumping 2014-04-16 17:19:53 +09:00
Emil Siverhall
dcde75f12c changed log level on re-import failures so we don't have to delete tickets every morning 2014-04-16 09:45:00 +02:00
Golrokh Moattar
8d7dbb1167 Titles in Export excel got fixed 2014-04-15 16:59:14 +02:00
Golrokh Moattar
0cc7b12443 GenericColumn added so that all type of columns will be exportable 2014-04-15 16:48:30 +02:00
Golrokh Moattar
5cf5b39295 GenericColumn added so that all type of columns will be exportable 2014-04-15 16:48:18 +02:00
Golrokh Moattar
c9828fc37d table styling 2014-04-15 15:55:25 +02:00
Golrokh Moattar
77840028ff GenericDataPanel used in supervisor->all students ideas 2014-04-15 15:19:28 +02:00
Golrokh Moattar
3edcf1ff28 Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 14:38:28 +02:00
Golrokh Moattar
3a925740d0 GenericDataPanel used in author->ideas 2014-04-15 14:34:06 +02:00
Emil Siverhall
f48a8b3dc6 Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 14:28:18 +02:00
Emil Siverhall
9282e8cfd2 activity plan uploads now counts as project files 2014-04-15 14:28:04 +02:00
fred-fri
b1e0098031 Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 21:06:32 +09:00
fred-fri
8bd0d5c3fa fixes 2014-04-15 21:06:16 +09:00
Golrokh Moattar
4a3ac4d286 Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 13:52:04 +02:00
Golrokh Moattar
48527afcf1 GenericDataPanel used in Admin->Match->Keywords and Research areas->Research areas popup2 2014-04-15 13:50:17 +02:00
fred-fri
a87b850862 Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 20:46:36 +09:00
fred-fri
bf91231a35 fixes 2014-04-15 20:46:20 +09:00
Golrokh Moattar
009446e012 fixing errors 2014-04-15 13:41:47 +02:00
Emil Siverhall
e81bc4df6d FileSource.ACTIVITY_PLAN 2014-04-15 13:40:27 +02:00
Golrokh Moattar
215b0835d1 Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 13:35:28 +02:00
Emil Siverhall
d8319c6be9 moved FileSource from FileDescription to ProjectFile since it's only being used for these files and default all uploaded files got FileSource.FILES. 2014-04-15 12:59:06 +02:00
fred-fri
3aae6ee775 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java
	view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java
 2014-04-15 19:47:35 +09:00
fred-fri
4569453878 changed to infopanel 2014-04-15 19:44:46 +09:00
Golrokh Moattar
f657890ff3 GenericDataPanel used in Admin->Match->Keywords and Research areas->Research areas popup 2014-04-15 12:13:12 +02:00
Golrokh Moattar
47ed92053a Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 12:00:58 +02:00
Emil Siverhall
ce8cd2b073 Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 11:59:15 +02:00
Emil Siverhall
fb6563a348 deactivatable date picker to project management 2014-04-15 11:58:56 +02:00
Golrokh Moattar
febcdc2b0b GenericDataPanel used in Admin->Match->Ideas->Match history 2014-04-15 11:57:17 +02:00
Golrokh Moattar
93d8304ab3 Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 11:42:52 +02:00
Golrokh Moattar
fdaee4a2a3 GenericDataPanel used in Admin->Statistics->Milestones 2014-04-15 11:42:03 +02:00
Emil Siverhall
a95ab9e615 date commenced -> commenced, date approved -> approved 2014-04-15 11:41:38 +02:00
Emil Siverhall
0f424bbc74 date created -> created 2014-04-15 11:34:21 +02:00
fred-fri
e705e7b6bf changed to smartlinkmultilinelabel 2014-04-15 18:27:27 +09:00
Emil Siverhall
083fc3ddab project -> title 2014-04-15 11:20:52 +02:00
Emil Siverhall
322054bcba merge 2014-04-15 11:02:45 +02:00
Emil Siverhall
e38f563d44 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java
 2014-04-15 11:02:31 +02:00
Emil Siverhall
c7d5150743 project title -> title 2014-04-15 11:02:12 +02:00
Golrokh Moattar
7bcb6dfcbb Test fixed 2014-04-15 10:52:09 +02:00
Golrokh Moattar
83590db80b GenericDataPanel used in Supervisor->All projects->Final seminars 2014-04-15 10:30:37 +02:00
Emil Siverhall
15a7c9d638 project type -> type 2014-04-15 10:18:04 +02:00
Emil Siverhall
aced12e6cb Merge remote-tracking branch 'origin/develop' into develop 2014-04-15 10:15:03 +02:00
Emil Siverhall
7a2c0817b1 project type -> type 2014-04-15 10:14:52 +02:00