Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflicts | Georg Ehrke | 2012-04-26 | 241 | -5403/+11916 |
|\ | |||||
| * | a lot of users have problems with big files. So add an explicit button to ↵ | Frank Karlitschek | 2012-04-26 | 1 | -0/+1 |
| | | | | | | | | the documentation | ||||
| * | Add ability to send private links from sharing via email | Michael Gapczynski | 2012-04-26 | 2 | -2/+34 |
| | | |||||
| * | 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 |
| | | |||||
| * | bring fileactions to the right position again | Arthur Schiwon | 2012-04-26 | 1 | -1/+1 |
| | | |||||
| * | Update sharing when users are removed, added to groups, and removed from groups | Michael Gapczynski | 2012-04-25 | 2 | -0/+31 |
| | | |||||
| * | resolve merge conflicts | Arthur Schiwon | 2012-04-26 | 9 | -68/+1279 |
| |\ | |||||
| | * | Fixed cancelling of uploads and wrong merge conflict resolution | Simon Birnbach | 2012-04-15 | 2 | -12/+36 |
| | | | |||||
| | * | Fixed cancelling upload of same file to folder and subfolder | Simon Birnbach | 2012-04-15 | 2 | -1/+4 |
| | | | |||||
| | * | Merge git://gitorious.org/owncloud/owncloud | Simon Birnbach | 2012-04-15 | 399 | -17994/+26501 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: files/css/files.css files/js/files.js | ||||
| | * | | Added uploading to folder and cancellable downloads | Simon Birnbach | 2012-03-27 | 6 | -36/+173 |
| | | | | |||||
| | * | | Added global progressbar for all uploads | Simon Birnbach | 2012-03-17 | 3 | -1/+15 |
| | | | | |||||
| | * | | Fixed upload of undeleted file and size information | Simon Birnbach | 2012-03-17 | 1 | -7/+3 |
| | | | | |||||
| | * | | Support for legacy browsers | Simon Birnbach | 2012-03-16 | 3 | -95/+183 |
| | | | | |||||
| | * | | coding guidelines | Simon Birnbach | 2012-03-16 | 1 | -3/+3 |
| | | | | |||||
| | * | | Initial version of drag&drop file upload support | Simon Birnbach | 2012-03-16 | 3 | -0/+950 |
| | | | | |||||
| * | | | fix problem with filescanning | Robin Appelman | 2012-04-25 | 1 | -0/+3 |
| | | | | |||||
| * | | | 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 ↵ | Arthur Schiwon | 2012-04-25 | 4 | -53/+509 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well as fancy (unqiue as far as users a know from LDAP) names on the ownCloud side. It's done via mapping of owncloud names and LDAP identifiers. some performance enhancements: faster searching for users and groups in their specific subtrees. Reading instead of searching were possible. thanks for the feedback of Kevin van Kuik | ||||
| * | | | use uniquemember instead of deprecated memberuid to identify LDAP group ↵ | Arthur Schiwon | 2012-04-25 | 2 | -4/+33 |
| | | | | | | | | | | | | | | | | members. Attention: not every method is adjusted yet, so it breaks some things. | ||||
| * | | | 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 ↵ | Arthur Schiwon | 2012-04-25 | 2 | -15/+25 |
| | | | | | | | | | | | | | | | | needs some love. Looks different to the other admin settings, though. | ||||
| * | | | 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 history buttons | Sam Tuke | 2012-04-25 | 2 | -0/+240 |
| | | | | |||||
| * | | | 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 | 194 | -5201/+9439 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-22 | 20 | -46/+578 |
| | |\ \ \ | |||||
| | * | | | | update to SabreDav 1.6.2 | Georg Ehrke | 2012-04-21 | 180 | -0/+24863 |
| | | | | | | |||||
| | * | | | | remove old sabredav files | Georg Ehrke | 2012-04-21 | 153 | -20626/+0 |
| | | | | | | |||||
| | * | | | | fix merge conflicts | Georg Ehrke | 2012-04-21 | 113 | -1129/+15144 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-15 | 269 | -14542/+37152 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-13 | 160 | -16492/+15851 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-10 | 104 | -614/+5525 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-30 | 27 | -67/+177 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-29 | 27 | -200/+2503 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-27 | 16 | -55/+143 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-25 | 32 | -72/+1005 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-22 | 11 | -17/+233 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-21 | 12 | -187/+248 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-19 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |