summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2012-04-26241-5403/+11916
|\
| * a lot of users have problems with big files. So add an explicit button to ↵Frank Karlitschek2012-04-261-0/+1
| | | | | | | | the documentation
| * Add ability to send private links from sharing via emailMichael Gapczynski2012-04-262-2/+34
| |
| * 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
| |
| * bring fileactions to the right position againArthur Schiwon2012-04-261-1/+1
| |
| * Update sharing when users are removed, added to groups, and removed from groupsMichael Gapczynski2012-04-252-0/+31
| |
| * resolve merge conflictsArthur Schiwon2012-04-269-68/+1279
| |\
| | * Fixed cancelling of uploads and wrong merge conflict resolutionSimon Birnbach2012-04-152-12/+36
| | |
| | * Fixed cancelling upload of same file to folder and subfolderSimon Birnbach2012-04-152-1/+4
| | |
| | * Merge git://gitorious.org/owncloud/owncloudSimon Birnbach2012-04-15399-17994/+26501
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: files/css/files.css files/js/files.js
| | * | Added uploading to folder and cancellable downloadsSimon Birnbach2012-03-276-36/+173
| | | |
| | * | Added global progressbar for all uploadsSimon Birnbach2012-03-173-1/+15
| | | |
| | * | Fixed upload of undeleted file and size informationSimon Birnbach2012-03-171-7/+3
| | | |
| | * | Support for legacy browsersSimon Birnbach2012-03-163-95/+183
| | | |
| | * | coding guidelinesSimon Birnbach2012-03-161-3/+3
| | | |
| | * | Initial version of drag&drop file upload supportSimon Birnbach2012-03-163-0/+950
| | | |
| * | | fix problem with filescanningRobin Appelman2012-04-251-0/+3
| | | |
| * | | Fix javascript checkbox toggle for resharingMichael Gapczynski2012-04-251-1/+1
| | | |
| * | | LDAP rewrite, use unique LDAP user and group identifiers on LDAP side as ↵Arthur Schiwon2012-04-254-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 Schiwon2012-04-252-4/+33
| | | | | | | | | | | | | | | | members. Attention: not every method is adjusted yet, so it breaks some things.
| * | | don't forget new JS fileArthur Schiwon2012-04-251-0/+3
| | | |
| * | | LDPA: group settings into basic and advanced to look less crowded. Still ↵Arthur Schiwon2012-04-252-15/+25
| | | | | | | | | | | | | | | | needs some love. Looks different to the other admin settings, though.
| * | | 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 history buttonsSam Tuke2012-04-252-0/+240
| | | |
| * | | 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-25194-5201/+9439
| |\ \ \
| | * \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-2220-46/+578
| | |\ \ \
| | * | | | update to SabreDav 1.6.2Georg Ehrke2012-04-21180-0/+24863
| | | | | |
| | * | | | remove old sabredav filesGeorg Ehrke2012-04-21153-20626/+0
| | | | | |
| | * | | | fix merge conflictsGeorg Ehrke2012-04-21113-1129/+15144
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-15269-14542/+37152
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-13160-16492/+15851
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-10104-614/+5525
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-3027-67/+177
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2927-200/+2503
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2716-55/+143
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2532-72/+1005
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2211-17/+233
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2112-187/+248
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-191-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \