Commit Graph

4843 Commits

Author SHA1 Message Date
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
Fredrik Norberg
ad0ed5b84b daily commit 2011-07-21 16:54:22 +02:00
Fredrik Norberg
4c46988337 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (125 commits)
  upcoming event to left column
  hide heading
  authorization and format fix
  removed commentthread
  null pointer exception for supervisore
  deletedcommentethrad
  deletedcommentethrad
  null check
  remove projectconferencetest
  namechange
  dito
  deletes textarea after submitg
  format fix
  hide set all read and pagfinator
  text
  format fix
  Support for restinterface for comments
  Add rest possiblity
  name change from relativePath, to absolute
  name change from relativePath, to absolute
  ...
2011-07-21 16:47:47 +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
a3e43b7a89 commentthread 2011-07-21 15:49:28 +02:00
joha-asc
ccfd19dd25 removed commentthread 2011-07-21 15:44:19 +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