aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | fix merge conflictsGeorg Ehrke2012-04-2431-1242/+585
| |\| | | |
| * | | | | fix pathes in contactsGeorg Ehrke2012-04-242-30/+37
| * | | | | fix contacts app a bitGeorg Ehrke2012-04-232-13/+13
| * | | | | make calendar work with movable appsGeorg Ehrke2012-04-232-4/+4
| * | | | | fix pathes of shared calendarsGeorg Ehrke2012-04-231-2/+2
| * | | | | fix file path in apps/media/ajax/api.phpGeorg Ehrke2012-04-231-5/+3
| * | | | | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-235-20/+57
| |\ \ \ \ \
| * | | | | | fix path in apps/files/templats/index.phpGeorg Ehrke2012-04-231-1/+1
| * | | | | | fix style.css of the files appGeorg Ehrke2012-04-231-2/+2
| * | | | | | fix path in /apps/files/js/timezone.phpGeorg Ehrke2012-04-231-1/+1
| * | | | | | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-2317-56/+285
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsGeorg Ehrke2012-04-2251-435/+1933
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into movable_appsGeorg Ehrke2012-04-2012-113/+777
| |\ \ \ \ \ \ \ \
| * | | | | | | | | remove require once lib base in files scan.phpGeorg Ehrke2012-04-201-2/+0
| * | | | | | | | | remove require once lib base in some more filesGeorg Ehrke2012-04-185-8/+4
| * | | | | | | | | move files to app folderGeorg Ehrke2012-04-1868-0/+2767
| * | | | | | | | | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-188-10/+49
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove the require_once lib base from all (or nearly all) filesGeorg Ehrke2012-04-17111-111/+111
* | | | | | | | | | | added revert attempt outcome messages, removed contextual ajax revert button ...Sam Tuke2012-04-276-32/+77
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Contacts: Added convinience method for notifications.Thomas Tanghus2012-04-271-0/+12
* | | | | | | | | | jquery.combobox: Added 'editable' option and cleaned up a bit.Thomas Tanghus2012-04-271-8/+13
* | | | | | | | | | Contacts: Updated first run page.Thomas Tanghus2012-04-271-2/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudSam Tuke2012-04-262-2/+34
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Add ability to send private links from sharing via emailMichael Gapczynski2012-04-262-2/+34
* | | | | | | | | started implementing ajax file rollbackSam Tuke2012-04-264-17/+61
* | | | | | | | | added available version names to files dropdown menu via new ajax scriptSam Tuke2012-04-264-31/+122
|/ / / / / / / /
* | | | | | | | improved styling, called css file in history.phpSam Tuke2012-04-264-4/+8
* | | | | | | | linked more button to history pageSam Tuke2012-04-261-3/+3
* | | | | | | | changed function name to avoid clash with sharing dropdownSam Tuke2012-04-261-2/+2
* | | | | | | | Contacts: Some js cleanup.Thomas Tanghus2012-04-261-5/+13
* | | | | | | | Contacts: Added import with with file picker.Thomas Tanghus2012-04-265-8/+76
* | | | | | | | Fix a counting mistakeMichael Gapczynski2012-04-251-1/+1
* | | | | | | | Update sharing when users are removed, added to groups, and removed from groupsMichael Gapczynski2012-04-252-0/+31
* | | | | | | | Fix javascript checkbox toggle for resharingMichael Gapczynski2012-04-251-1/+1
* | | | | | | | LDAP rewrite, use unique LDAP user and group identifiers on LDAP side as well...Arthur Schiwon2012-04-254-53/+509
* | | | | | | | use uniquemember instead of deprecated memberuid to identify LDAP group membe...Arthur Schiwon2012-04-252-4/+33
* | | | | | | | don't forget new JS fileArthur Schiwon2012-04-251-0/+3
* | | | | | | | LDPA: group settings into basic and advanced to look less crowded. Still need...Arthur Schiwon2012-04-252-15/+25
* | | | | | | | added dropdown js menu for file versions, improved readability of history.phpSam Tuke2012-04-252-2/+60
* | | | | | | | Forgot to remove error log messages...Michael Gapczynski2012-04-251-3/+0
* | | | | | | | Allow admin to disable resharing of filesMichael Gapczynski2012-04-255-1/+45
* | | | | | | | fixed path to history scriptSam Tuke2012-04-251-1/+1
* | | | | | | | added script and loaded it for adding history buttonSam Tuke2012-04-252-1/+9
* | | | | | | | made code a little more readableSam Tuke2012-04-251-19/+19
* | | | | | | | Contacts: Fixed some file paths.Thomas Tanghus2012-04-251-14/+14
* | | | | | | | Merge branch 'sabredav_1.6'Georg Ehrke2012-04-256-22/+21
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-2215-39/+508
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | fix merge conflictsGeorg Ehrke2012-04-2154-453/+2183
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-15212-13891/+36258
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-13103-37016/+312
| |\ \ \ \ \ \ \ \ \