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

4375 Commits

Author SHA1 Message Date
joha-asc
3ee953076d test projectconferencepage 
Change-Id: I502c2c0ab68d83559f550d1dfb5a6ad64ce67d91
 2011-07-22 15:59:27 +02:00
joha-asc
9d8719fac4 new text for notifications 
Change-Id: I4107866d792dfb27ff097311c94ef0fe5cf5c8a9
 2011-07-22 15:59:12 +02:00
joha-asc
2a991b8091 get absolute url for pages 
Change-Id: Iab35a47b44f046966da38a0996d0775e0bd2500c
 2011-07-22 15:58:35 +02:00
Fredrik Norberg
3142cc3331 started to improve the traffic lights 2011-07-22 15:31:38 +02:00
Emil Siverhall
7b72b2878c switched to deployment in web.xml 2011-07-22 14:30:38 +02:00
Emil Siverhall
0593938ade Merge branch 'develop' into unit_testing 
* develop:
  Redesigned UpcomingEventsPanel
  daily commit
  Worked on some design for edit levels in admin pages
  Removed unused line
  Fixed bug where message Already exists was shown when editing
  Added info printing and a duplicate check when creating a new project class
  Added a undelete function in admin projectclass settings
  Added panels in for editing and deleting panels
  Added new page Level settings to Admin->Settings page. Used to add/edit project classes
 2011-07-22 14:10:11 +02:00
Emil Siverhall
0eaf15b39b modified unit test for latestreviewers 2011-07-22 14:09:12 +02:00
Fredrik Norberg
816f29ee28 Merge branch 'activityplan' into develop 
* activityplan:
  Redesigned UpcomingEventsPanel
  daily commit
 2011-07-22 10:41:33 +02:00
Fredrik Norberg
a2036ab5ec Redesigned UpcomingEventsPanel 2011-07-22 10:39:56 +02:00
Marcus Höjvall
8f8d8854c0 Merge branch 'dynmaic_project_classes' into develop 
Added a page where you're able to add more project classes(levels) under
Admin -> Settings -> Edit levels

There is no test for this page yet.

  dynmaic_project_classes:
  Worked on some design for edit levels in admin pages
  Fixed bug where message Already exists was shown when editing
  Added info printing and a duplicate check when creating a new project class
  Added a undelete function in admin projectclass settings
  Added panels in for editing and deleting panels
  Added new page Level settings to Admin->Settings page. Used to add/edit project classes
 2011-07-22 10:25:06 +02:00
Fredrik Norberg
ad0ed5b84b daily commit 2011-07-21 16:54:22 +02:00
joha-asc
ff8d5d09db commentthread 2011-07-21 16:31:14 +02:00
joha-asc
c7b8d1a9d1 commentthread 2011-07-21 16:30:10 +02:00
joha-asc
b4e05aebf3 upcoming event to left column 
Change-Id: I82daa6615ec5289140b97d5916d2bf077ee5e923
 2011-07-21 16:20:55 +02:00
joha-asc
7c0d43a96f hide heading 
Change-Id: I0177c1b31afee01d2b064f05a316401d47dde390
 2011-07-21 16:14:29 +02:00
joha-asc
d76d3c5982 authorization and format fix 
Change-Id: I7576293a854bf7d1dbff665899a1b37bb7885c8d
 2011-07-21 16:10:34 +02:00
joha-asc
f86d2718dc null pointer exception for supervisore 
Change-Id: I9034ba1a587982285e75b1a0b9bd1e8065a5dac9
 2011-07-21 14:55:33 +02:00
joha-asc
2bb09965a1 deletedcommentethrad 2011-07-21 14:21:44 +02:00
joha-asc
7caa388ca9 deletedcommentethrad 2011-07-21 14:14:44 +02:00
joha-asc
e627d4b249 null check 
Change-Id: Iea427c704a3684162badae44fc4cba6d6244f9fa
 2011-07-21 14:12:56 +02:00
joha-asc
925278efc8 remove projectconferencetest 
Change-Id: I3b8502da98b21dfb583200111e1697f20b8bc934
 2011-07-21 14:12:25 +02:00
joha-asc
c9e0d5b890 namechange 
Change-Id: I4cee62cd29207e2de3375e16940ca5605e38368d
 2011-07-21 13:56:12 +02:00
joha-asc
1d8447d3b9 Merge branch 'develop' into newz 2011-07-21 13:49:32 +02:00
joha-asc
a00ec56cb9 dito 
Change-Id: Ie3915d6f75e23aac60940ffe0e731dc5f7c43a59
 2011-07-21 11:54:01 +02:00
joha-asc
96d4d6b154 deletes textarea after submitg 
Change-Id: Ifd128ec85ad014cf0d3002b2ea8c964dd61c554d
 2011-07-21 11:51:55 +02:00
joha-asc
1757957dba format fix 
Change-Id: Ia345933c892b0a9856abf488a660b07931cd74ad
 2011-07-21 11:45:49 +02:00
joha-asc
5bad95a58f hide set all read and pagfinator 
Change-Id: I5dc916501b6276ecbe34554c0b91ada3b818f689
 2011-07-21 11:44:07 +02:00
Fredrik Norberg
b88d319140 ignored a test that indicated db changes 2011-07-21 11:22:03 +02:00
joha-asc
33501a3ab4 text 
Change-Id: Iea620bfc1ffd98977921e7adde67b5798725ac60
 2011-07-21 11:19:24 +02:00
joha-asc
f503d95e3e format fix 
Change-Id: I7a161f4c40f27b89b382c23085b77f5e1cc51103
 2011-07-21 11:16:33 +02:00
joha-asc
9f133859c8 Support for restinterface for comments 
Change-Id: Ie85022e2f32878f283bdcfdbb4440f47d972e1bb
 2011-07-21 11:15:31 +02:00
joha-asc
aea255173d Add rest possiblity 
Change-Id: I8dca30af8d6a029bc594eab8474cba24962497aa
 2011-07-21 11:14:33 +02:00
Fredrik Norberg
ef1b67701f Merge branch 'activityplan' into develop 
* activityplan:
  implemented the functionality to save activityplans as templates
  Almost done with saving schedules as templates
  daily commit
 2011-07-21 11:06:43 +02:00
Fredrik Norberg
b8fdeee59c implemented the functionality to save activityplans as templates 2011-07-21 11:05:16 +02:00
Fredrik Norberg
fe70e0f861 fixed db config 2011-07-21 09:51:15 +02:00
Marcus Höjvall
c52c798c60 Bad password in persistence.xml 2011-07-21 09:43:49 +02:00
Emil Siverhall
6acc1d35f2 Merge branch 'develop' into peer_reviewdate_feature 
* develop:
  Changes to build dependencies and config files to support automated builds
  Done with upcomingEventPanel
  events now order properly
  Refactored some XML-related stuff to make it more reusable
  daily commit
  weekend commit
  fixed an issue where a test behaved differently on windows and linux
  Added upcomingeventpanel
 2011-07-21 09:08:17 +02:00
Emil Siverhall
4ae5f9e9d7 Added unit test for findLatestReviewers 2011-07-21 09:04:39 +02:00
Robin Eklund
707df5e2ff Changes to build dependencies and config files to support automated builds 2011-07-20 17:33:01 +02:00
Fredrik Norberg
f6bff289b9 Almost done with saving schedules as templates 2011-07-20 17:17:38 +02:00
joha-asc
5ae70ce57a name change from relativePath, to absolute 2011-07-20 17:13:07 +02:00
joha-asc
d453e02ae2 name change from relativePath, to absolute 2011-07-20 17:10:20 +02:00
joha-asc
e0928de5bf removed sysout 
Change-Id: Ic0744c3cf55c3de371c5c79c1b96124f5d8d68f6
 2011-07-20 17:05:05 +02:00
joha-asc
804ea46ca4 ta bort sysouts 2011-07-20 17:02:31 +02:00
joha-asc
4005e3d6e7 scipro pighleef 
Change-Id: Idf8b714a19be038b8565e42386c989756360e2a2
 2011-07-20 16:56:35 +02:00
joha-asc
c0ee4748d3 removed order by in count 
Change-Id: I5eb6379c98157d4792a519d4a17ce5b7ba319854
 2011-07-20 16:54:33 +02:00
joha-asc
8a171e8107 Testfixar på projectpartner 
Change-Id: Ibe3b27f7bb2e71418132b538a14f6818571b18c4
 2011-07-20 16:54:06 +02:00
joha-asc
cfabfec340 Conflitct fixes 2011-07-20 16:45:57 +02:00
joha-asc
5f88e45484 deleted fiels 2011-07-20 15:25:53 +02:00
joha-asc
2db1ac12d0 heading css change 
Change-Id: I10bdb85ca572e2dd372d2ae5dbfdbbb49e42668e
 2011-07-20 15:22:35 +02:00