| Diff | Revision | Date | Message | Lines | Author | Branch |
|---|---|---|---|---|---|---|
| 1.104 | 11 Feb 11 |
- checkstyle configuration ... ... [X] clean up according to the checkstyle rules - smoke test passed: mvn clean package install |
+90 -72 | Patrick Brunner | MAIN | |
| 1.103 | 11 Feb 11 |
- checkstyle configuration ... [X] formatting step only - smoke test passed: mvn clean package install |
+78 -101 | Patrick Brunner | MAIN | |
| 1.102 | 16 Dec 10 |
OLAT-6003: if user does not have account on IM server create and try once more. |
+3 -3 | schnider | MAIN | |
| 1.101 | 13 Dec 10 |
OLAT-5941 removed unwanted paste |
-1 | matthai | MAIN | |
| 1.100 | 07 Dec 10 |
OLAT-5941 modified polling to slow down during user inactivity (mouse/keyboard) ... and several small corrections in IM |
+14 -14 | matthai | MAIN | |
| 1.99 | 30 Jul 10 |
OLAT-5679: decouples synchrounous session count on IM server from login by an async call each 30s or upon request |
+19 | schnider | MAIN | |
| 1.98 | 15 Mar 10 |
config and startup refactoring to spring only |
+2 -2 | schnider | MAIN | |
| 1.97 | 16 Jul 09 |
non-jira: remove invalid @Override: override is not the same as implement! please check your eclipse settings. |
-1 | gnaegi | MAIN | |
| 1.96 | 16 Jul 09 |
OLAT-4146: cleanup of added log stuff plus doing connection.close in separate taskexecutorthread |
+19 -5 | eglis | MAIN | |
| 1.95 | 28 Apr 09 |
OLAT-3979: close connection in error case |
+2 -2 | schnider | MAIN | |
| 1.94 | 18 Dec 08 |
OLAT-3659: Presence unavilable was sent with prio info which caused an "duplicate entry" error on the IM server. |
+2 -1 | schnider | MAIN | |
| 1.93 | 25 Aug 08 |
OLAT-1796 Boilerplate: replaced "Copyright (c) 1999-200[0-9]" with "Copyright (c) since 2004" |
+1 -1 | Alexander Schneider | MAIN | |
| 1.92 | 25 Aug 08 |
olat-2878: no longer allow im connection task to access db |
+16 -1 | schnider | MAIN | |
| 1.91 | 14 Aug 08 |
OLAT-2878: new IM junit tests |
+3 -3 | schnider | MAIN | |
| 1.90 | 12 Aug 08 |
OLAT-2878: smaller api, testing ability without olat |
+3 -3 | schnider | MAIN | |
| 1.89 | 04 Aug 08 |
OLAT-2878: first version of new OLAT-Openfire communication service. The new version is based on the same protocol (XMPP) which is also used for the chat/groupchat stuff. |
+1 -1 | schnider | MAIN | |
| 1.88 | 27 Jun 08 |
OLAT-3220: MERGED to HEAD: Change InstantMessaging to use one single jabber-server together with other OLAT-instances - allowing @ in usernames (needs to be configured) - see comments in build.properties / olat_config.xml |
+10 -2 | rhaag | MAIN | |
| 1.87 | 27 May 08 |
merge with Branch 6.0 |
+19 | schnider | MAIN | |
| 1.86 | 23 Apr 08 |
OLAT-2725 XHTML compliance: image tags, br's, wrong form labels etc |
+9 -9 | gnaegi | MAIN | |
| 1.85 | 28 Aug 07 |
olat-2433: as preparation for later merging: first merge branch 5_2_x to HEAD |
+65 -290 | fjost | MAIN | |
| 1.84 | 18 Jul 07 |
olat-2143: make sure all smack treads are closing on logout |
+44 -45 | schnider | MAIN | |
| 1.83 | 13 Jul 07 |
OLAT-2428: removed flash based im stuff from head |
+14 -13 | schnider | MAIN | |
| 1.82 | 20 Jun 07 |
olat-2278 now not in branch anymore, but spring-ified in HEAD. Work: - rename olatresourceableeventcenter to olatsystembus - extract interface and let spring implement by di - created singleVM and Cluster version of the olat system bus - organize imports work still in progress for the cluster version, the standard version is ok. |
-1 | fjost | MAIN | |
| 1.81 | 30 May 07 |
OLAT-2143: html chat; working protoype |
+7 -4 | schnider | MAIN | |
| 1.80 | 15 May 07 |
OLAT-2143: html chat; working protoype |
+57 -55 | schnider | MAIN | |
| 1.79 | 10 May 07 |
OLAT-2143: first draft of new html IM client, to test toggle implementation in SmackInstantMessagingImpl |
+63 -60 | schnider | MAIN | |
| 1.78 | 23 Apr 07 |
OLAT-2143: Prototype of new instant messaging integration into course chat |
+4 | schnider | MAIN | |
| 1.77 | 20 Mar 07 |
updated comment |
+2 -2 | schnider | MAIN | |
| 1.76 | 31 Oct 06 |
olat-1563: changed usage of Tracing.logError() either to throwing exception or logWarn() |
+8 -8 | schnider | MAIN | |
| 1.75 | 29 Sep 06 |
OLAT-1796 update to apache 2.0 license boiler plate |
+20 -12 | Patrick Brunner | MAIN | |
| 1.74 | 22 Sep 06 |
OLAT-1807: fix redscreen when leaving test with im status unavailable |
+5 -1 | schnider | MAIN | |
| 1.73 | 14 Sep 06 |
OLAT-1760: fixed sending of wrong status string in unavailable mode. Bug was introduced when updating to latest smack lib recently |
+1 -1 | schnider | MAIN | |
| 1.72 | 23 Aug 06 |
http://bugs.olat.org/jira/browse/OLAT-1640: fix possible redscreen when leaving a test |
+2 -2 | schnider | MAIN | |
| 1.71 | 10 Aug 06 |
OLAT-1463: upgrade to latest smack lib to solve login delay. Upgrade needed lots of code change due to new handling of constants (enum types) |
+23 -22 | schnider | MAIN | |
| 1.70 | 27 Jul 06 |
OLAT-1587: fix broken onlinetime |
+1 | schnider | MAIN | |
| 1.69 | 08 Jun 06 |
OLAT-869 finally --- Tracing refactoring is finished. --- please read to the end. -!!!- sorry for changing the method signature of the logXYZ methods, but I think it enhances readability -- this may give you some errors now. -!!!- Code from the sysinfocontroller is now available to public from Tracing -!!!- log messages generated by classes which are not triggered by user request, e.g. Module inits, servlet inits, print out now long list of "n/a" This is not nice, but o.k. from my point of view. - only blabliblupTest classes have remaining references to log4j.Logger - unified use of logDebug(..) it is now always surrounded with an IF to check if we really should string-concatenate (expensive op) and log debug. - logError, logWarn, logInfo, logDebug... everything goes through Tracing now. - classes no longer need to instantiate a logger, logging is now done by one line call with the calling.class as parameter. - log messages are bound to the logging class -> log shows which class is logging and not always that Tracing class is logging. thx for reading :-) |
+11 -11 | Patrick Brunner | MAIN | |
| 1.68 | 07 Jun 06 |
OLAT-869 work in progress of replacing all log4j.Logger references |
+1 -2 | Patrick Brunner | MAIN | |
| 1.67 | 06 Jun 06 |
OLAT-869 - replacing all log.error(...); calls by Tracing.logError(clazz,...) calls - touched classes were also refactored to use Util.isDebugEnabled(clazz) instead of log.isDebugEnabled() - replacing all log.debug(..) calls by Tracing.logDebug(clazz,...) calls in touched classes. - replacing all log.info(..) calls by Tracing.logInfo(clazz,...) calls in touched classes. introduced Util.isDebugEnabled(class) and Util.isInfoEnabled(class) and also added Tracing.logDebug(..) and Tracing.logInfo(..) Still open is to replace all references to log4j.Logger except in Tracing and Util --------- The GOAL ...to have all log calls to go through Tracing.class as it holds lots of cool information in its thread local variable which would not be accessibel outside in the different classes generating log entries. |
+13 -15 | Patrick Brunner | MAIN | |
| 1.66 | 15 May 06 |
OLAT-1463: updated smack IM lib |
+1 -2 | schnider | MAIN | |
| 1.65 | 09 May 06 |
OLAT-1509 moved org.olat.util to org.olat.core.util |
+1 -1 | fjost | MAIN | |
| 1.64 | 05 Apr 06 |
header cleanup, license stuff has to be on top above package otherwise its included in javadoc every time! |
+15 -11 | schnider | MAIN | |
| 1.63 | 25 Oct 05 |
OLAT-1194: added new private var that hold the last statusMode bevor disableChat and use it in enableChat again for keeping the recent status. |
+18 -33 | schnider | MAIN | |
| 1.62 | 14 Sep 05 | +3 -1 | schnider | MAIN | ||
| 1.61 | 12 Sep 05 | +7 -7 | schnider | MAIN | ||
| 1.60 | 05 Sep 05 | +5 -1 | schnider | MAIN | ||
| 1.59 | 23 Aug 05 |
fixing possible nullpointer if IM server crashes. |
+2 -1 | schnider | MAIN | |
| 1.58 | 22 Aug 05 |
added time consumption for connecting to IM server and fetching roster |
+3 -1 | schnider | MAIN | |
| 1.57 | 09 Aug 05 |
OLAT-854: jabber config applied to connected user list |
+8 -4 | schnider | MAIN | |
| 1.56 | 09 Aug 05 |
OLAT-810: fix for bug |
+731 -795 | schnider | MAIN | |
| 1.55 | 19 Jul 05 |
removed warnings |
+18 -36 | schnider | MAIN | |
| 1.54 | 19 Jul 05 |
OLAT-805: moved message listener in front of connection listener. Now offline messages are received by the olat im client. |
+4 -4 | schnider | MAIN | |
| 1.53 | 20 May 05 |
fixes from watching the errorlog.. (rare errors) |
+9 -1 | fjost | MAIN | |
| 1.52 | 02 May 05 |
removing system.out |
+1 -2 | schnider | MAIN | |
| 1.51 | 20 Apr 05 |
fixing bug # 1477. Messages without a body do net get displayed in OLAT |
+26 -25 | schnider | MAIN | |
| 1.50 | 12 Apr 05 |
more comments |
+2 -1 | schnider | MAIN | |
| 1.49 | 12 Apr 05 |
fix for Bug: 1456 und enhancement, dass user im status "nicht verfügbar" gar nicht mehr auf der liste erscheinen. |
+6 -5 | schnider | MAIN | |
| 1.48 | 22 Mar 05 |
fix for problem with chatting while collaboration disabled (chanching status was still possible) |
+10 -19 | schnider | MAIN | |
| 1.47 | 21 Mar 05 |
dont show messages (several messages by one user) if collaboration disabled |
+5 -1 | schnider | MAIN | |
| 1.46 | 21 Mar 05 |
concurrent modification problems when several users receives messages and will show them in olat |
+800 -699 | schnider | MAIN | |
| 1.45 | 19 Mar 05 |
- fixing the online users list. number of online users is now correct - fixed cyclic call of destroyInstantMessagingClient method: user got disconnected twice (first because of disposal of the instant messaging controller and second because ot the triggered connection close event) - changed dispose order in olat chief controller. IM controller must be disposed as last controller, otherwhise sending of presence messages (as done in the dispose of the course run main controller) generates a new instant messaging client lazy... http://bugzilla.olat.org/show_bug.cgi?id=1217 |
+6 -2 | gnaegi | MAIN | |
| 1.44 | 17 Mar 05 |
groups are not shown per default |
+2 -2 | schnider | MAIN | |
| 1.43 | 16 Mar 05 |
removed unused reconnector code |
+5 -14 | gnaegi | MAIN | |
| 1.42 | 16 Mar 05 |
avoid stacktrace. error occurs if a logout/login of the same person happens within 3 seconds or so. |
+2 -2 | fjost | MAIN | |
| 1.41 | 15 Mar 05 |
toggling offliners in 2 different translations, not yet finished version of toggling groups |
+14 -1 | schnider | MAIN | |
| 1.40 | 15 Mar 05 |
better error log |
+2 -2 | fjost | MAIN | |
| 1.39 | 14 Mar 05 |
showing all messages from one user, deleting all messages form one user. Both with one click in one overdiv. |
+61 -9 | schnider | MAIN | |
| 1.38 | 10 Mar 05 |
some comment |
+8 -2 | schnider | MAIN | |
| 1.37 | 08 Mar 05 |
formatting |
+276 -273 | fjost | MAIN | |
| 1.36 | 24 Feb 05 |
reconnector thread disabled due to memory problems |
+5 -5 | schnider | MAIN | |
| 1.35 | 22 Feb 05 |
small changes |
+3 -3 | schnider | MAIN | |
| 1.34 | 22 Feb 05 |
auto reconnect upon instant messagaing server crash |
+5 -6 | schnider | MAIN | |
| 1.33 | 21 Feb 05 |
new connection listener, new thread that gets startet if connection fails and tries to reconnect |
+4 -4 | schnider | MAIN | |
| 1.32 | 21 Feb 05 |
new connection listener, new thread that gets startet if connection fails and tries to reconnect |
+64 -4 | schnider | MAIN | |
| 1.31 | 14 Feb 05 |
if user receives several messges, not only the newest one ist visible in the olat gui, the get added to a queue and delievered one by one |
+13 -15 | schnider | MAIN | |
| 1.30 | 10 Feb 05 |
toggle between showing offline users or not in roster now enabeld |
+15 -2 | schnider | MAIN | |
| 1.29 | 08 Feb 05 |
defaut messages are now no longer "Defaut statusmessage" |
+13 -3 | schnider | MAIN | |
| 1.28 | 08 Feb 05 |
changed visibility from methode because is needed in velocity |
+4 -3 | schnider | MAIN | |
| 1.27 | 07 Feb 05 |
cleaning up TODO's , adding more erro logging, comments |
+15 -6 | schnider | MAIN | |
| 1.26 | 04 Feb 05 |
open flash client does now only change isFlashClientRunning=true to the user itself and not to all users on the buddy list |
+5 -5 | schnider | MAIN | |
| 1.25 | 25 Jan 05 |
refractoring of instant messaging: Get rid of unnecessary config stuff in build.properties (please adjust to properties.default), auto disable of chat if entering course test. |
+4 -4 | schnider | MAIN | |
| 1.24 | 25 Jan 05 |
refractoring of instant messaging: by chanching the server to "idmels3test" and setting the classname for the AccountCreation right, the new IM accouts get now successful created by olat |
+4 -3 | schnider | MAIN | |
| 1.23 | 20 Jan 05 |
refractoring of instant messaging, new wrapper class for IMClient (solves interator velocity issue) |
+32 -32 | schnider | MAIN | |
| 1.22 | 19 Jan 05 |
refractoring of instant messaging |
+5 -2 | schnider | MAIN | |
| 1.21 | 10 Jan 05 |
listening to presence packets with type= unavailable and resource "xiff" generates a clear event when the user closes the second browser window with the flash client |
+24 -2 | schnider | MAIN | |
| 1.20 | 21 Dec 04 |
added try catch block on all connection.sendPacket statements because they can fail if the server has an error |
+46 -18 | schnider | MAIN | |
| 1.19 | 17 Dec 04 |
additional comments |
+9 -3 | schnider | MAIN | |
| 1.18 | 16 Dec 04 |
cleaning up and flash stuff debuged: presence now works again, starting with jid chanches to chat clientmodus |
+29 -32 | schnider | MAIN | |
| 1.17 | 07 Dec 04 |
anwering in broswer to message works now as supposed |
+27 -7 | schnider | MAIN | |
| 1.16 | 02 Dec 04 |
instant messaging integreated in header, can be desabled by build.properties setting instantmessaging.enable=false |
+3 -3 | schnider | MAIN | |
| 1.15 | 25 Nov 04 |
comment added, package.html files added, small improvements in imClient class |
+49 -32 | schnider | MAIN | |
| 1.14 | 16 Nov 04 |
added more comment |
+44 -27 | schnider | MAIN | |
| 1.13 | 08 Nov 04 |
renaming and some cosmetics and furter testcases |
+9 -3 | schnider | MAIN | |
| 1.12 | 02 Nov 04 |
logout now destroys IM-connection object and javascript closes the other IM related windows (thanks to flo's great javascript trick!) |
+3 -3 | schnider | MAIN | |
| 1.11 | 27 Oct 04 |
minor changes and tests |
+14 -4 | schnider | MAIN | |
| 1.10 | 27 Oct 04 |
new param 'server' sended to flash client |
+3 -3 | schnider | MAIN | |
| 1.9 | 26 Oct 04 |
online users list now in a popup window |
+18 -3 | schnider | MAIN | |
| 1.8 | 22 Oct 04 |
autoSubscription implemented, Autogeneration of roster groups and entries |
+26 -5 | schnider | MAIN | |
| 1.7 | 21 Oct 04 |
flash client shows in its own window |
+26 -10 | schnider | MAIN | |
| 1.6 | 21 Oct 04 |
getUsername, getPassword added |
+14 -2 | schnider | MAIN | |
| 1.5 | 20 Oct 04 |
added a few more methods for convenience in velocity |
+84 -2 | schnider | MAIN | |
| 1.4 | 20 Oct 04 |
getStatus() returns new a String |
+13 -10 | schnider | MAIN | |
| 1.3 | 19 Oct 04 |
added IMcontroller to test enviroement in olat |
+13 -12 | schnider | MAIN | |
| 1.2 | 18 Oct 04 |
added more method comments |
+25 -2 | schnider | MAIN | |
| 1.1 | 18 Oct 04 |
initial version of instant messaging packet. Account creation still open topic |
+298 | schnider | MAIN | |
| 1.50.2.2 | 25 May 05 |
merges von head: bugfixes of head relevant to 3.2.1 |
+9 -1 | fjost | OLAT-3-2-x-BRANCH | |
| 1.50.2.1 | 02 May 05 |
Merges from HEAD. |
+25 -25 | schnider | OLAT-3-2-x-BRANCH | |
| 1.67.2.1 | 08 Jun 06 |
OLAT-1557: merge HEAD into branch-1557 |
+1 -2 | cweisse | OLAT-4_2_0-BPS-1557 | |
| 1.64.4.2 | 22 May 06 |
OLAT-1233:Merge HEAD into branch-1233 |
+1 -2 | guretzki | OLAT-4_2_0-UNIZH-1233 | |
| 1.64.4.1 | 10 May 06 |
OLAT-1233: Merge HEAD into Branch |
+1 -1 | guretzki | OLAT-4_2_0-UNIZH-1233 | |
| 1.63.18.1 | 06 Apr 06 |
merged head (with ajax, header cleanup) |
+15 -11 | guretzki | OLAT-4_2_0-UNIZH-1480 | |
| 1.66.2.2 | 09 Jun 06 |
merge HEAD into BRANCH-1530 |
+12 -13 | Alexander Schneider | OLAT-4_2_0-UNIZH-1530 | |
| 1.66.2.1 | 07 Jun 06 |
merge HEAD into BRANCH-1530 |
+13 -15 | Alexander Schneider | OLAT-4_2_0-UNIZH-1530 | |
| 1.65.4.1 | 15 May 06 |
OLAT-1463: updated smack IM lib |
+1 -2 | schnider | OLAT-4_2_0-UNIZH-903_2 | |
| 1.66.4.1 | 21 Jul 06 |
merges from HEAD |
+14 -17 | gnaegi | OLAT-4_2_0-goodsolutions-1232 | |
| 1.74.2.1 | 10 Oct 06 |
MERGE HEAD TO BRANCH 5.0.x prepare for 5.0.1 |
+20 -12 | Patrick Brunner | OLAT-5_0_x-BRANCH | |
| 1.75.6.1 | 16 Nov 06 |
OLAT-1879 Merge HEAD into Branch 1879 |
+8 -8 | leberle | OLAT-5_1_0-BPS-1879 | |
| 1.84.4.8 | 17 Aug 07 |
OLAT-2590: IM in test mode - different status |
+11 -9 | schnider | OLAT-5_2_x-BRANCH | |
| 1.84.4.7 | 16 Aug 07 |
OLAT-2531: moved exception handling to clienthelper as this one is in the velocity file |
+2 -10 | schnider | OLAT-5_2_x-BRANCH | |
| 1.84.4.6 | 16 Aug 07 |
OLAT-2589: improved im disabled while doing test |
+4 | schnider | OLAT-5_2_x-BRANCH | |
| 1.84.4.5 | 13 Aug 07 |
OLAT-2560: toggle groups in roster now work properly |
+1 -1 | schnider | OLAT-5_2_x-BRANCH | |
| 1.84.4.4 | 08 Aug 07 |
more debug output |
+44 -32 | schnider | OLAT-5_2_x-BRANCH | |
| 1.84.4.3 | 06 Aug 07 |
OLAT-2470: no more double display of same msg, made chatwindow a bit bigger |
+5 -5 | schnider | OLAT-5_2_x-BRANCH | |
| 1.84.4.2 | 06 Aug 07 |
OLAT-2492: auto away feature for chat |
+12 -1 | schnider | OLAT-5_2_x-BRANCH | |
| 1.84.4.1 | 31 Jul 07 |
OLAT-2449: disable chat functionnality if doing a test in a couse and clean up unused stuff |
+4 -250 | schnider | OLAT-5_2_x-BRANCH | |
| 1.86.2.3 | 20 Aug 08 |
OLAT-1796 Boilerplate: replaced "Copyright (c) 1999-200[0-9]" with "Copyright (c) since 2004" |
+1 -1 | Alexander Schneider | OLAT-6_0_x-BRANCH | |
| 1.86.2.2 | 27 Jun 08 |
OLAT-3220: Change InstantMessaging to use one single jabber-server together with other OLAT-instances - allowing @ in usernames (needs to be configured) - see comments in build.properties / olat_config.xml |
+10 -2 | rhaag | OLAT-6_0_x-BRANCH | |
| 1.86.2.1 | 26 May 08 |
OLAT-3182: improvements in groupchatManager handling |
+19 | schnider | OLAT-6_0_x-BRANCH | |
| 1.97.24.1 | 30 Jul 10 |
OLAT-5679: merge back to 6.3.x branch |
+19 | schnider | OLAT-6_3_0-PUBLIC | |
| 1.93.2.1 | 03 Feb 09 |
head merged |
+2 -1 | bja | OLAT-HEAD-BPS-1229 | |
| 1.70.6.2 | 15 Jun 07 |
OLAT-1595 : mergeOLAT-5_1_xToBranch |
+8 -8 | ikroll | OLAT-HEAD-BPS-1595 | |
| 1.70.6.1 | 05 Oct 06 |
http://bugs.olat.org/jira/browse/OLAT-1595 OLAT-1595: Merge HEAD into BRANCH (work in progress) |
+48 -35 | ikroll | OLAT-HEAD-BPS-1595 | |
| 1.75.8.4 | 06 Jan 08 |
OLAT-2434 Merging HEAD to CF branch, adding database migration script. There are some classes I had to patch in the core to make this branch work, I will commit them directly to HEAD when merging the branch back to HEAD, so this branch will not compile out of the box. |
+65 -290 | gnaegi | OLAT-HEAD-BPS-Prototype_CF | |
| 1.75.8.3 | 19 Jul 07 |
OLAT-2434 BPS-CF update branch to current HEAD development after fixing power search method and ajax user search |
+44 -45 | gnaegi | OLAT-HEAD-BPS-Prototype_CF | |
| 1.75.8.2 | 18 Jul 07 |
OLAT-2434 BPS-CF update branch to current HEAD development after user delete state refactoring |
+14 -13 | gnaegi | OLAT-HEAD-BPS-Prototype_CF | |
| 1.75.8.1 | 17 Jul 07 |
OLAT-2434 BPS-CF update old branch to current head development. has some errors in test classes |
+112 -101 | gnaegi | OLAT-HEAD-BPS-Prototype_CF | |
| 1.94.2.1 | 18 May 09 |
OLAT-3766 cpeditor: Update BRANCH from HEAD |
+2 -2 | gwassmann | OLAT-HEAD-FRENTIX-3766-CPEDITOR | |
| 1.94.10.2 | 27 Jul 09 |
OLAT-3946 update from HEAD |
+18 -5 | gwassmann | OLAT-HEAD-FRENTIX-3946-Podcast | |
| 1.94.10.1 | 10 Jun 09 |
OLAT-3946 podcast: merge from head and some other changes |
+2 -2 | gwassmann | OLAT-HEAD-FRENTIX-3946-Podcast | |
| 1.98.6.2 | 09 Dec 10 |
OLAT-5494: merge olat3 HEAD to Portfolio Branch |
+14 -14 | srosse | OLAT-HEAD-FRENTIX-5494-EPORTFOLIO | |
| 1.98.6.1 | 09 Sep 10 |
OLAT-5494: merge head to epf-branch: olat3 |
+19 | rhaag | OLAT-HEAD-FRENTIX-5494-EPORTFOLIO | |
| 1.69.10.3 | 03 Nov 06 |
Synchronyzing 1577 branch (glossary, scorm assessable, repo can reference) with HEAD |
+33 -21 | gnaegi | OLAT-HEAD-JGS-1577 | |
| 1.69.10.2 | 23 Aug 06 |
olat-1577 fix IM Enum bug |
+2 -2 | fjost | OLAT-HEAD-JGS-1577 | |
| 1.69.10.1 | 14 Aug 06 |
Merging HEAD to branch |
+24 -22 | gnaegi | OLAT-HEAD-JGS-1577 | |
| 1.70.4.1 | 10 Aug 06 |
MERGE HEAD TO BRANCH 1508 |
+23 -22 | Patrick Brunner | OLAT-HEAD-UNIZH-1508 | |
| 1.82.2.2 | 19 Jul 07 |
OLAT-2385 - forth time merge MAIN HEAD with the OLAT-HEAD-UZH-2385 BRANCH (common base version is Temp_lavinia_1, merged with Temp_lavinia_2, where Temp_lavinia_2 is the latest tag on MAIN HEAD) |
+44 -45 | lavinia | OLAT-HEAD-UZH-2385 | |
| 1.82.2.1 | 18 Jul 07 |
OLAT-2385 - third time merge MAIN HEAD with the OLAT-HEAD-UZH-2385 BRANCH (common base version is Temp_lavinia_2, merged with Temp_lavinia_1, where Temp_lavinia_1 is the latest tag on MAIN HEAD) |
+14 -13 | lavinia | OLAT-HEAD-UZH-2385 | |
| 1.83.2.2 | 30 Aug 07 | +65 -291 | fjost | OLAT-HEAD-UZH-OLAT_2433 | ||
| 1.83.2.1 | 18 Jul 07 |
OLAT-2433 work in progress.... |
+4 -4 | fjost | OLAT-HEAD-UZH-OLAT_2433 | |
| 1.93.4.2 | 28 May 09 |
OLAT-3674: merge head to branch |
+2 -2 | rhaag | OLAT-HEAD_FRENTIX-3674 | |
| 1.93.4.1 | 23 Dec 08 |
merge Head to Branch |
+2 -1 | rhaag | OLAT-HEAD_FRENTIX-3674 | |
| 1.97.20.1 | 20 Jan 10 |
renaming of Manger to BasesecurityManager |
+2 -2 | schnider | tmpOLAT-HEAD-640-until-2010-03-10 |