DMC/scipro
7
0
Fork 0
Code Issues 30 Pull Requests 1 Actions Projects 1 Wiki Activity
3,057 Commits 5 Branches 413 Tags
Commit Graph

3057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mariana Simion Rönngårdh
edc8830c22 Added Icons used in Daisy 2011-07-27 14:33:56 +02:00
Robin Eklund
0b28f53e42 Initial UI changes 2011-07-27 14:18:22 +02:00
Fredrik Norberg
37fdba3cbe Merge branch 'activityplan' into develop 
* activityplan:
  a new version of saving schedules as templates that supports simultaneus events
  started to add paralell schedule events
  added daysOffset to projecteventtemplate
 2011-07-27 12:11:19 +02:00
Fredrik Norberg
19a3962a0c Merge branch 'activityplan' of ssh://git.dsv.su.se/git/scipro/personal/fn into activityplan 
* 'activityplan' of ssh://git.dsv.su.se/git/scipro/personal/fn:
  a new version of saving schedules as templates that supports simultaneus events
  started to add paralell schedule events
  added daysOffset to projecteventtemplate
 2011-07-27 11:42:41 +02:00
Fredrik Norberg
2bcb9d03ba a new version of saving schedules as templates that supports simultaneus events 2011-07-27 11:29:55 +02:00
Fredrik Norberg
3a7314ed61 started to add paralell schedule events 2011-07-26 17:24:26 +02:00
Robin Eklund
1f8425dce7 Merge branch 'ssoAdaptations' into develop 2011-07-26 11:18:55 +02:00
Robin Eklund
cf575b43cd More scanning for attributes 2011-07-26 11:05:40 +02:00
Robin Eklund
7c23588724 Added more scanning for external-auth attributes 2011-07-26 10:31:22 +02:00
Fredrik Norberg
3b25bed168 added daysOffset to projecteventtemplate 2011-07-25 16:20:36 +02:00
joha-asc
56d2501704 Merge branch 'checklists' of ssh://git.dsv.su.se/git/scipro/personal/fn into develop 2011-07-25 15:13:06 +02:00
Fredrik Norberg
94133f4bac added base classes for dynamic checklists 2011-07-25 14:58:46 +02:00
joha-asc
348781af53 Merge branch 'develop' 2011-07-22 16:33:34 +02:00
joha-asc
265fd6a8da Merge branch 'notification' into develop 2011-07-22 16:24:23 +02:00
joha-asc
a31d7218c5 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-07-22 16:24:01 +02:00
joha-asc
9bd9610526 getabsoluteurl 
Change-Id: I377449fbfb16fc275b665ee67c31e90141688470
 2011-07-22 16:21:14 +02:00
joha-asc
6f06dbb7ba notificationscontroller 
Change-Id: Ibf8ce4d27665b40977e9a8c24fe235de63734c6d
 2011-07-22 16:19:56 +02:00
joha-asc
5db061e81c notfitionan controller oxh getAbsoluteURL 
Change-Id: Ie73f92185c8978dffbeef1ffbccd884d7d184154
 2011-07-22 16:19:26 +02:00
joha-asc
332391fc04 getAbsoluteURL 
Change-Id: I6888c5f28206710ac4663a8856ff7c80c0607887
 2011-07-22 16:19:06 +02:00
joha-asc
325d31900b formatfix 
Change-Id: I3a112c575c39f9b3528a7d6f69e6b5c5e0eaa3e6
 2011-07-22 16:18:04 +02:00
joha-asc
69ac7ad61a format fix 
Change-Id: Ia1cc0959060078a57549b0dc734642fb093d9b93
 2011-07-22 16:17:28 +02:00
joha-asc
804d035a0d getabsoulteurl och peer notifications 
Change-Id: Ie110885d4a8b79ae438426f52d1e31ff721826da
 2011-07-22 16:17:05 +02:00
joha-asc
04ae4cbaef getabsoulteurl 
Change-Id: I543ce104ef423b5ea1015ddded70c34010ff1e41
 2011-07-22 16:16:45 +02:00
joha-asc
ef8ad610b5 getabsoulteurl 
Change-Id: I8638a28b22c6ee6dfc4d0dc26f9efdb1242fceef
 2011-07-22 16:16:37 +02:00
joha-asc
a380c0f1cd cant post message vith zero length 
Change-Id: Ia92804670207972dd5ea5ac5f0b14fae01547cb0
 2011-07-22 16:06:37 +02:00
joha-asc
0b7e46434d getAbsoluteURL 
Change-Id: Idf8187723746f79b605097436ab7ced5e2e67db5
 2011-07-22 16:06:19 +02:00
joha-asc
a31147d46c added feedbackpanel cant post message with zero length text 
Change-Id: Ide88e6abd9304cafdfa6baece4df114c86365c80
 2011-07-22 16:05:04 +02:00
joha-asc
3c479a9998 made processnotifiaction private 
Change-Id: Ifdc2116b2c97c3e32e1a6212895fb38978cce1cb
 2011-07-22 16:03:41 +02:00
joha-asc
7589a2a6a9 format fix 
Change-Id: I24023b36dac310eaccc6ccaaeeabb145022d7178
 2011-07-22 16:02:33 +02:00
joha-asc
76e8c992b7 Moved all create notifiavtions to notifiactioncontroller and added 
notifications to finalseminarcontroller

Change-Id: I85022739718296f67b64daf3299992b34419bcc0
 2011-07-22 16:02:02 +02:00
joha-asc
0135f410d9 Uses notification on sending new message 
Change-Id: If24fce8c10c85347094b3e02f382e507018ed2b0
 2011-07-22 16:01:27 +02:00
joha-asc
d928d0de4e Bugfix and uses notifications on sending and replying private messages 
Change-Id: I1dc386b2c9d337d39989bdcbfa45e2f00fe04871
 2011-07-22 16:01:08 +02:00
joha-asc
be51065103 Uses notifications on uploading thesis, oppoistions and editig final 
seminar

Change-Id: I11b9787fb6f2bb11d471820d5a5f10d3f9fc3242
 2011-07-22 16:00:44 +02:00
joha-asc
fdd0e8b6aa Fix for hiding components 
Change-Id: I2bedb0dd65fe8dbb9a5e06805fed9a1ced21421c
 2011-07-22 16:00:16 +02:00
joha-asc
453924ce12 Get absolutesurl 
Change-Id: I7cd0702dee3573254ab9d2a2f89392f517df92a9
 2011-07-22 15:59:55 +02:00
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
2247d44151 Merge branch 'unit_testing' into develop 
* unit_testing:
  modified unit test for latestreviewers
 2011-07-22 14:10: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
3f03a936ef Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  commentthread
  commentthread
  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 10:41:26 +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
joha-asc
b31891ec7a Merge branch 'develop' 2011-07-21 17:03:24 +02:00
joha-asc
45a236474c rename commentread 2011-07-21 17:03:10 +02:00
joha-asc
e82edea9f2 Merge branch 'master' of ssh://git.dsv.su.se/git/scipro/scipro 2011-07-21 17:00:09 +02:00