summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2012-04-21113-1129/+15144
|\
| * fix a php noticeGeorg Ehrke2012-04-212-1/+7
| |
| * fix merge conflictsGeorg Ehrke2012-04-2135-123/+8587
| |\
| | * improve the app installer.Frank Karlitschek2012-04-216-3/+17
| | | | | | | | | | | | | | | show a label if an app is an internal app or a third party app from the app store. show a preview image of the app if available
| | * add a link to the desktop and mobile clients download.Frank Karlitschek2012-04-211-0/+6
| | |
| | * add a button to open the online documentationFrank Karlitschek2012-04-211-0/+1
| | |
| | * support searching the knowledge baseFrank Karlitschek2012-04-201-2/+3
| | |
| | * add phpmailer to 3rdpartyFrank Karlitschek2012-04-202-0/+3290
| | |
| | * new OC_Mail class to handle all mail sending. The benefit is that is way mor ↵Frank Karlitschek2012-04-203-1/+125
| | | | | | | | | | | | flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code
| | * Merge branch 'merge-requests/105'Georg Ehrke2012-04-192-60/+70
| | |\
| | | * Merge commit 'refs/merge-requests/105' of ↵Georg Ehrke2012-04-192-60/+70
| | | |\ | | | | | | | | | | | | | | | git://gitorious.org/owncloud/owncloud into merge-requests/105
| | | | * cal import should group events by uid, export should have correct newlines, ↵Scott Shambarger2012-03-312-60/+70
| | | | | | | | | | | | | | | | | | | | fix for oc-384
| | * | | showing the file extensions more visible by default. I still think it's ↵Jan-Christoph Borchardt2012-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | shitty design, but I get worse nightmares over thinking that showing file extensions would become a configuration option.
| | * | | emulate touch with custom mtime for swift backendRobin Appelman2012-04-191-11/+39
| | | | |
| | * | | add SWIFT (openstack object storage) storage backendRobin Appelman2012-04-1812-1/+4864
| | | | |
| | * | | check if removed folders are really goneRobin Appelman2012-04-181-0/+9
| | | | |
| | * | | add function to get mimetype from stringRobin Appelman2012-04-181-0/+20
| | | | |
| | * | | add test cases for cryptstreamRobin Appelman2012-04-182-0/+13
| | | | |
| | * | | make use of the fact that stream_read will always read 8192 bytes for ↵Robin Appelman2012-04-182-23/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encryption stream https://bugs.php.net/bug.php?id=21641
| | * | | bugfixes for encryption library and test casesRobin Appelman2012-04-182-27/+64
| | |/ /
| * | | Merge branch 'master' into calendar_sharingGeorg Ehrke2012-04-1845-677/+5201
| |\| |
| | * | check if PHP mod GD is installedArthur Schiwon2012-04-171-0/+3
| | | |
| | * | check if PHP mod JSON is installedArthur Schiwon2012-04-171-0/+3
| | | |
| | * | test data for archivesRobin Appelman2012-04-173-0/+4
| | | |
| | * | upload arrow has full opacity, button is highlighted for new users and empty ↵Jan-Christoph Borchardt2012-04-172-2/+3
| | | | | | | | | | | | | | | | folders
| | * | LDAP: don't forget to unbindArthur Schiwon2012-04-161-0/+11
| | | |
| | * | checked, works for meArthur Schiwon2012-04-161-1/+0
| | | |
| | * | group ldap: check configurationArthur Schiwon2012-04-161-2/+16
| | | |
| | * | group LDAP: implement groupExists function, needed for SharingArthur Schiwon2012-04-161-0/+9
| | | |
| | * | OC_Group does expect object, not stringArthur Schiwon2012-04-161-1/+1
| | | |
| | * | minor code beautificationArthur Schiwon2012-04-161-2/+3
| | | |
| | * | use the right attribute for member retrievalArthur Schiwon2012-04-161-1/+2
| | | |
| | * | a string be a stringArthur Schiwon2012-04-161-1/+1
| | | |
| | * | dont show action text for folders boldRobin Appelman2012-04-161-1/+1
| | | |
| | * | fix delete button not always disapearingRobin Appelman2012-04-161-2/+2
| | | |
| | * | fix 2 potential xss problemsRobin Appelman2012-04-163-3/+3
| | | |
| | * | adding sticker logo jpgJan-Christoph Borchardt2012-04-161-0/+0
| | | |
| | * | improving leftcontent display, increasing item heightJan-Christoph Borchardt2012-04-161-1/+3
| | | |
| | * | reload log after changing log levelRobin Appelman2012-04-162-4/+17
| | | |
| | * | merge log into adminRobin Appelman2012-04-167-57/+60
| | | |
| | * | updated logos and iconsJan-Christoph Borchardt2012-04-1622-598/+5050
| | | |
| | * | fix creating unique filenamesRobin Appelman2012-04-161-1/+4
| | | |
| | * | fix group backendRobin Appelman2012-04-161-1/+1
| | | |
| | * | return user specific paths from oc_filecache::getpathRobin Appelman2012-04-161-1/+6
| | | |
| * | | implement shared calendar activation on server sideGeorg Ehrke2012-04-184-2/+24
| | | |
| * | | implement shared calendar activation on js-sideGeorg Ehrke2012-04-181-4/+4
| | | |
| * | | resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflictsGeorg Ehrke2012-04-181-3/+7
| | | |
| * | | fix merge conflictsGeorg Ehrke2012-04-15157-13932/+36076
| |\| |
| * | | Merge branch 'master' into calendar_sharingGeorg Ehrke2012-04-1518-56/+58
| |\ \ \
| * \ \ \ fix merge conflictsGeorg Ehrke2012-04-15115-586/+1063
| |\ \ \ \