Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | fix merge conflicts | Georg Ehrke | 2012-04-24 | 31 | -1242/+585 | |
| |\| | | | | ||||||
| * | | | | | fix pathes in contacts | Georg Ehrke | 2012-04-24 | 2 | -30/+37 | |
| * | | | | | fix contacts app a bit | Georg Ehrke | 2012-04-23 | 2 | -13/+13 | |
| * | | | | | make calendar work with movable apps | Georg Ehrke | 2012-04-23 | 2 | -4/+4 | |
| * | | | | | fix pathes of shared calendars | Georg Ehrke | 2012-04-23 | 1 | -2/+2 | |
| * | | | | | fix file path in apps/media/ajax/api.php | Georg Ehrke | 2012-04-23 | 1 | -5/+3 | |
| * | | | | | Merge branch 'master' into movable_apps | Georg Ehrke | 2012-04-23 | 5 | -20/+57 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | fix path in apps/files/templats/index.php | Georg Ehrke | 2012-04-23 | 1 | -1/+1 | |
| * | | | | | | fix style.css of the files app | Georg Ehrke | 2012-04-23 | 1 | -2/+2 | |
| * | | | | | | fix path in /apps/files/js/timezone.php | Georg Ehrke | 2012-04-23 | 1 | -1/+1 | |
| * | | | | | | Merge branch 'master' into movable_apps | Georg Ehrke | 2012-04-23 | 17 | -56/+285 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | fix merge conflicts | Georg Ehrke | 2012-04-22 | 51 | -435/+1933 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into movable_apps | Georg Ehrke | 2012-04-20 | 12 | -113/+777 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove require once lib base in files scan.php | Georg Ehrke | 2012-04-20 | 1 | -2/+0 | |
| * | | | | | | | | | remove require once lib base in some more files | Georg Ehrke | 2012-04-18 | 5 | -8/+4 | |
| * | | | | | | | | | move files to app folder | Georg Ehrke | 2012-04-18 | 68 | -0/+2767 | |
| * | | | | | | | | | Merge branch 'master' into movable_apps | Georg Ehrke | 2012-04-18 | 8 | -10/+49 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remove the require_once lib base from all (or nearly all) files | Georg Ehrke | 2012-04-17 | 111 | -111/+111 | |
* | | | | | | | | | | | added revert attempt outcome messages, removed contextual ajax revert button ... | Sam Tuke | 2012-04-27 | 6 | -32/+77 | |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
* | | | | | | | | | | Contacts: Added convinience method for notifications. | Thomas Tanghus | 2012-04-27 | 1 | -0/+12 | |
* | | | | | | | | | | jquery.combobox: Added 'editable' option and cleaned up a bit. | Thomas Tanghus | 2012-04-27 | 1 | -8/+13 | |
* | | | | | | | | | | Contacts: Updated first run page. | Thomas Tanghus | 2012-04-27 | 1 | -2/+1 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' of gitorious.org:owncloud/owncloud | Sam Tuke | 2012-04-26 | 2 | -2/+34 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| * | | | | | | | | Add ability to send private links from sharing via email | Michael Gapczynski | 2012-04-26 | 2 | -2/+34 | |
* | | | | | | | | | started implementing ajax file rollback | Sam Tuke | 2012-04-26 | 4 | -17/+61 | |
* | | | | | | | | | added available version names to files dropdown menu via new ajax script | Sam Tuke | 2012-04-26 | 4 | -31/+122 | |
|/ / / / / / / / | ||||||
* | | | | | | | | improved styling, called css file in history.php | Sam Tuke | 2012-04-26 | 4 | -4/+8 | |
* | | | | | | | | linked more button to history page | Sam Tuke | 2012-04-26 | 1 | -3/+3 | |
* | | | | | | | | changed function name to avoid clash with sharing dropdown | Sam Tuke | 2012-04-26 | 1 | -2/+2 | |
* | | | | | | | | Contacts: Some js cleanup. | Thomas Tanghus | 2012-04-26 | 1 | -5/+13 | |
* | | | | | | | | Contacts: Added import with with file picker. | Thomas Tanghus | 2012-04-26 | 5 | -8/+76 | |
* | | | | | | | | Fix a counting mistake | Michael Gapczynski | 2012-04-25 | 1 | -1/+1 | |
* | | | | | | | | Update sharing when users are removed, added to groups, and removed from groups | Michael Gapczynski | 2012-04-25 | 2 | -0/+31 | |
* | | | | | | | | Fix javascript checkbox toggle for resharing | Michael Gapczynski | 2012-04-25 | 1 | -1/+1 | |
* | | | | | | | | LDAP rewrite, use unique LDAP user and group identifiers on LDAP side as well... | Arthur Schiwon | 2012-04-25 | 4 | -53/+509 | |
* | | | | | | | | use uniquemember instead of deprecated memberuid to identify LDAP group membe... | Arthur Schiwon | 2012-04-25 | 2 | -4/+33 | |
* | | | | | | | | don't forget new JS file | Arthur Schiwon | 2012-04-25 | 1 | -0/+3 | |
* | | | | | | | | LDPA: group settings into basic and advanced to look less crowded. Still need... | Arthur Schiwon | 2012-04-25 | 2 | -15/+25 | |
* | | | | | | | | added dropdown js menu for file versions, improved readability of history.php | Sam Tuke | 2012-04-25 | 2 | -2/+60 | |
* | | | | | | | | Forgot to remove error log messages... | Michael Gapczynski | 2012-04-25 | 1 | -3/+0 | |
* | | | | | | | | Allow admin to disable resharing of files | Michael Gapczynski | 2012-04-25 | 5 | -1/+45 | |
* | | | | | | | | fixed path to history script | Sam Tuke | 2012-04-25 | 1 | -1/+1 | |
* | | | | | | | | added script and loaded it for adding history button | Sam Tuke | 2012-04-25 | 2 | -1/+9 | |
* | | | | | | | | made code a little more readable | Sam Tuke | 2012-04-25 | 1 | -19/+19 | |
* | | | | | | | | Contacts: Fixed some file paths. | Thomas Tanghus | 2012-04-25 | 1 | -14/+14 | |
* | | | | | | | | Merge branch 'sabredav_1.6' | Georg Ehrke | 2012-04-25 | 6 | -22/+21 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-22 | 15 | -39/+508 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| * | | | | | | | | fix merge conflicts | Georg Ehrke | 2012-04-21 | 54 | -453/+2183 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-15 | 212 | -13891/+36258 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-13 | 103 | -37016/+312 | |
| |\ \ \ \ \ \ \ \ \ |