Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into calendar_repeat | Georg Ehrke | 2012-05-29 | 14 | -30/+14 |
|\ | |||||
| * | fix status | Georg Ehrke | 2012-05-29 | 1 | -9/+5 |
| | | | | | | | | of timezone detection | ||||
| * | Correct typo in last_insert_id for calendar and pg fix #oc-731 | Brice Maron | 2012-05-28 | 1 | -1/+1 |
| | | |||||
| * | Contacts: Fix XSS. | Thomas Tanghus | 2012-05-28 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of gitorious.org:owncloud/owncloud | Frank Karlitschek | 2012-05-28 | 3 | -2/+3 |
| |\ | |||||
| | * | Contacts: Double check XSS, and fix a rookie error ;-) | Thomas Tanghus | 2012-05-28 | 2 | -2/+2 |
| | | | |||||
| | * | add urlencode for caldav link | Georg Ehrke | 2012-05-28 | 1 | -0/+1 |
| | | | |||||
| * | | remove not needed includes | Frank Karlitschek | 2012-05-28 | 8 | -16/+3 |
| |/ | |||||
* | | Merge branch 'master' into calendar_repeat | Georg Ehrke | 2012-05-26 | 14 | -18/+20 |
|\| | |||||
| * | allow longer paths for gallery | Robin Appelman | 2012-05-26 | 2 | -4/+4 |
| | | |||||
| * | update copyright | Frank Karlitschek | 2012-05-26 | 9 | -9/+9 |
| | | |||||
| * | LDAP: support for 'member' as group-member-association | Arthur Schiwon | 2012-05-26 | 2 | -2/+3 |
| | | |||||
| * | fix share for users with a point within their name | Georg Ehrke | 2012-05-26 | 1 | -3/+4 |
| | | |||||
* | | Merge branch 'master' into calendar_repeat | Georg Ehrke | 2012-05-25 | 62 | -319/+849 |
|\| | |||||
| * | Add HEAD request management for files ajax/download.php | Brice Maron | 2012-05-24 | 1 | -1/+1 |
| | | |||||
| * | Add translation for error message | Brice Maron | 2012-05-24 | 1 | -1/+1 |
| | | |||||
| * | Add error message when uploading folder or null files. ref oc-739 | Brice Maron | 2012-05-24 | 1 | -0/+5 |
| | | |||||
| * | share code between smb and ftp filestorage backends | Robin Appelman | 2012-05-24 | 4 | -157/+92 |
| | | |||||
| * | Add pending line in file list before trying to upload. Correct indentation | Brice Maron | 2012-05-24 | 1 | -111/+110 |
| | | |||||
| * | smb filestorage backend | Robin Appelman | 2012-05-24 | 4 | -0/+159 |
| | | |||||
| * | Initial work on UI for mounting external storage | Michael Gapczynski | 2012-05-24 | 6 | -1/+176 |
| | | |||||
| * | Fix private link sharing via email, fix for bug oc-750 | Michael Gapczynski | 2012-05-23 | 1 | -1/+0 |
| | | |||||
| * | Correct small style problem with task app fix #oc-689 | Brice Maron | 2012-05-23 | 1 | -1/+1 |
| | | |||||
| * | removed closing php tag | Sam Tuke | 2012-05-22 | 1 | -3/+1 |
| | | |||||
| * | encryption is not yet compatible with ldap | Frank Karlitschek | 2012-05-22 | 1 | -1/+1 |
| | | |||||
| * | Contacts: XSS fix. Still some more to check. | Thomas Tanghus | 2012-05-21 | 1 | -0/+3 |
| | | |||||
| * | add warning | Frank Karlitschek | 2012-05-20 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'calendar_dropimport' | Georg Ehrke | 2012-05-19 | 2 | -0/+119 |
| |\ | |||||
| | * | Merge branch 'master' into calendar_dropimport | Georg Ehrke | 2012-05-17 | 415 | -32642/+4144 |
| | |\ | |||||
| | * | | some little js fixes for drop import | Georg Ehrke | 2012-05-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'master' into calendar_dropimport | Georg Ehrke | 2012-05-13 | 4 | -6/+7 |
| | |\ \ | |||||
| | * | | | add first version of drop import | Georg Ehrke | 2012-05-13 | 2 | -0/+119 |
| | | | | | |||||
| * | | | | Make sure sharing and versions dropdowns come down in the same location for ↵v4.0.0 | Michael Gapczynski | 2012-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | all files | ||||
| * | | | | some fixes for contacts, gallery and openid | Georg Ehrke | 2012-05-19 | 3 | -6/+0 |
| | | | | | |||||
| * | | | | fix for calendar | Georg Ehrke | 2012-05-19 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | getStorage belongs to files not to apps. | Frank Karlitschek | 2012-05-19 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Fix check for when to store a new version of a file | Michael Gapczynski | 2012-05-18 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix revert link on history page of file versions | Michael Gapczynski | 2012-05-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix versioning of shared files | Michael Gapczynski | 2012-05-18 | 1 | -17/+51 |
| | | | | | |||||
| * | | | | Forgot to actually call remove on the history dropdown | Michael Gapczynski | 2012-05-18 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Remove the history dropdown before creating a new one | Michael Gapczynski | 2012-05-18 | 1 | -3/+11 |
| | | | | | |||||
| * | | | | Don't show the select form in the history dropdown if a file has no other ↵ | Michael Gapczynski | 2012-05-18 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | versions | ||||
| * | | | | LDAP: we're 0.2 now | Arthur Schiwon | 2012-05-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | LDAP: only check once for name conflicts on update. Set a value on install ↵ | Arthur Schiwon | 2012-05-18 | 2 | -15/+24 |
| | | | | | | | | | | | | | | | | | | | | as well | ||||
| * | | | | Contacts: Added MS opacity mumbo-jumbo that I can't test myself to file form ↵ | Thomas Tanghus | 2012-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | fields. | ||||
| * | | | | make upload work with IE again | Arthur Schiwon | 2012-05-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | LDAP: update meta info | Arthur Schiwon | 2012-05-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | mark the apps as part of the shipped package and increase the requirement to ↵ | Frank Karlitschek | 2012-05-18 | 23 | -30/+53 |
| | | | | | | | | | | | | | | | | | | | | ownCloud 4 | ||||
| * | | | | LDAP: don't make us of global constants (completing, was removed with latest ↵ | Arthur Schiwon | 2012-05-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | additions to update.php) | ||||
| * | | | | LDAP: check wether applying naming rule would end up in conflicts on update, ↵ | Arthur Schiwon | 2012-05-18 | 3 | -23/+53 |
| | | | | | | | | | | | | | | | | | | | | if so don't do it |