Merge branch 'release/1.0.1' (cf3cb74f) · Commits · Simão Pedro Patrício da Silva / fenixedu-spaces

Commit cf3cb74f authored 10 years ago by

sergiofbsilva

Browse files

Merge branch 'release/1.0.1'

parents 541338f8 7cdd327d

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 5 additions, 0 deletions

.gitignore
pom.xml 7 additions, 2 deletions

pom.xml
src/main/java/org/fenixedu/spaces/core/service/NotificationService.java 11 additions, 0 deletions

...org/fenixedu/spaces/core/service/NotificationService.java
src/main/java/org/fenixedu/spaces/domain/Space.java 3 additions, 5 deletions

src/main/java/org/fenixedu/spaces/domain/Space.java
src/main/java/org/fenixedu/spaces/domain/SpaceDomainException.java 1 addition, 1 deletion

...java/org/fenixedu/spaces/domain/SpaceDomainException.java
src/main/java/org/fenixedu/spaces/domain/occupation/requests/OccupationComment.java 8 additions, 4 deletions

.../spaces/domain/occupation/requests/OccupationComment.java
src/main/java/org/fenixedu/spaces/services/SpaceBlueprintsDWGProcessor.java 64 additions, 39 deletions

...fenixedu/spaces/services/SpaceBlueprintsDWGProcessor.java
src/main/java/org/fenixedu/spaces/ui/ListOccupationsController.java 2 additions, 1 deletion

...ava/org/fenixedu/spaces/ui/ListOccupationsController.java
src/main/java/org/fenixedu/spaces/ui/OccupationController.java 7 additions, 3 deletions

...ain/java/org/fenixedu/spaces/ui/OccupationController.java
src/main/java/org/fenixedu/spaces/ui/OccupationRequestsController.java 92 additions, 7 deletions

.../org/fenixedu/spaces/ui/OccupationRequestsController.java
src/main/java/org/fenixedu/spaces/ui/SpacesController.java 90 additions, 7 deletions

src/main/java/org/fenixedu/spaces/ui/SpacesController.java
src/main/java/org/fenixedu/spaces/ui/services/OccupationService.java 76 additions, 10 deletions

...va/org/fenixedu/spaces/ui/services/OccupationService.java
src/main/java/org/fenixedu/spaces/ui/services/UserInformationService.java 16 additions, 0 deletions

...g/fenixedu/spaces/ui/services/UserInformationService.java
src/main/resources/resources/FenixEduSpacesResources.properties 5 additions, 1 deletion

...in/resources/resources/FenixEduSpacesResources.properties
src/main/resources/resources/FenixEduSpacesResources_en.properties 14 additions, 11 deletions

...resources/resources/FenixEduSpacesResources_en.properties
src/main/resources/resources/FenixEduSpacesResources_pt.properties 3 additions, 0 deletions

...resources/resources/FenixEduSpacesResources_pt.properties
src/main/webapp/WEB-INF/occupations/calendar.jsp 4 additions, 3 deletions

src/main/webapp/WEB-INF/occupations/calendar.jsp
src/main/webapp/WEB-INF/occupations/requests/single.jsp 26 additions, 1 deletion

src/main/webapp/WEB-INF/occupations/requests/single.jsp
src/main/webapp/WEB-INF/occupations/requests/view.jsp 7 additions, 0 deletions

src/main/webapp/WEB-INF/occupations/requests/view.jsp
src/main/webapp/WEB-INF/occupations/searchcreate.jsp 5 additions, 4 deletions

src/main/webapp/WEB-INF/occupations/searchcreate.jsp

with 446 additions and 99 deletions

Please register or to comment