Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflicts | Georg Ehrke | 2012-04-21 | 113 | -1129/+15144 |
|\ | |||||
| * | fix a php notice | Georg Ehrke | 2012-04-21 | 2 | -1/+7 |
| | | |||||
| * | fix merge conflicts | Georg Ehrke | 2012-04-21 | 35 | -123/+8587 |
| |\ | |||||
| | * | improve the app installer. | Frank Karlitschek | 2012-04-21 | 6 | -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 Karlitschek | 2012-04-21 | 1 | -0/+6 |
| | | | |||||
| | * | add a button to open the online documentation | Frank Karlitschek | 2012-04-21 | 1 | -0/+1 |
| | | | |||||
| | * | support searching the knowledge base | Frank Karlitschek | 2012-04-20 | 1 | -2/+3 |
| | | | |||||
| | * | add phpmailer to 3rdparty | Frank Karlitschek | 2012-04-20 | 2 | -0/+3290 |
| | | | |||||
| | * | new OC_Mail class to handle all mail sending. The benefit is that is way mor ↵ | Frank Karlitschek | 2012-04-20 | 3 | -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 Ehrke | 2012-04-19 | 2 | -60/+70 |
| | |\ | |||||
| | | * | Merge commit 'refs/merge-requests/105' of ↵ | Georg Ehrke | 2012-04-19 | 2 | -60/+70 |
| | | |\ | | | | | | | | | | | | | | | | git://gitorious.org/owncloud/owncloud into merge-requests/105 | ||||
| | | | * | cal import should group events by uid, export should have correct newlines, ↵ | Scott Shambarger | 2012-03-31 | 2 | -60/+70 |
| | | | | | | | | | | | | | | | | | | | | fix for oc-384 | ||||
| | * | | | showing the file extensions more visible by default. I still think it's ↵ | Jan-Christoph Borchardt | 2012-04-19 | 1 | -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 backend | Robin Appelman | 2012-04-19 | 1 | -11/+39 |
| | | | | | |||||
| | * | | | add SWIFT (openstack object storage) storage backend | Robin Appelman | 2012-04-18 | 12 | -1/+4864 |
| | | | | | |||||
| | * | | | check if removed folders are really gone | Robin Appelman | 2012-04-18 | 1 | -0/+9 |
| | | | | | |||||
| | * | | | add function to get mimetype from string | Robin Appelman | 2012-04-18 | 1 | -0/+20 |
| | | | | | |||||
| | * | | | add test cases for cryptstream | Robin Appelman | 2012-04-18 | 2 | -0/+13 |
| | | | | | |||||
| | * | | | make use of the fact that stream_read will always read 8192 bytes for ↵ | Robin Appelman | 2012-04-18 | 2 | -23/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encryption stream https://bugs.php.net/bug.php?id=21641 | ||||
| | * | | | bugfixes for encryption library and test cases | Robin Appelman | 2012-04-18 | 2 | -27/+64 |
| | |/ / | |||||
| * | | | Merge branch 'master' into calendar_sharing | Georg Ehrke | 2012-04-18 | 45 | -677/+5201 |
| |\| | | |||||
| | * | | check if PHP mod GD is installed | Arthur Schiwon | 2012-04-17 | 1 | -0/+3 |
| | | | | |||||
| | * | | check if PHP mod JSON is installed | Arthur Schiwon | 2012-04-17 | 1 | -0/+3 |
| | | | | |||||
| | * | | test data for archives | Robin Appelman | 2012-04-17 | 3 | -0/+4 |
| | | | | |||||
| | * | | upload arrow has full opacity, button is highlighted for new users and empty ↵ | Jan-Christoph Borchardt | 2012-04-17 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | folders | ||||
| | * | | LDAP: don't forget to unbind | Arthur Schiwon | 2012-04-16 | 1 | -0/+11 |
| | | | | |||||
| | * | | checked, works for me | Arthur Schiwon | 2012-04-16 | 1 | -1/+0 |
| | | | | |||||
| | * | | group ldap: check configuration | Arthur Schiwon | 2012-04-16 | 1 | -2/+16 |
| | | | | |||||
| | * | | group LDAP: implement groupExists function, needed for Sharing | Arthur Schiwon | 2012-04-16 | 1 | -0/+9 |
| | | | | |||||
| | * | | OC_Group does expect object, not string | Arthur Schiwon | 2012-04-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | minor code beautification | Arthur Schiwon | 2012-04-16 | 1 | -2/+3 |
| | | | | |||||
| | * | | use the right attribute for member retrieval | Arthur Schiwon | 2012-04-16 | 1 | -1/+2 |
| | | | | |||||
| | * | | a string be a string | Arthur Schiwon | 2012-04-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | dont show action text for folders bold | Robin Appelman | 2012-04-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix delete button not always disapearing | Robin Appelman | 2012-04-16 | 1 | -2/+2 |
| | | | | |||||
| | * | | fix 2 potential xss problems | Robin Appelman | 2012-04-16 | 3 | -3/+3 |
| | | | | |||||
| | * | | adding sticker logo jpg | Jan-Christoph Borchardt | 2012-04-16 | 1 | -0/+0 |
| | | | | |||||
| | * | | improving leftcontent display, increasing item height | Jan-Christoph Borchardt | 2012-04-16 | 1 | -1/+3 |
| | | | | |||||
| | * | | reload log after changing log level | Robin Appelman | 2012-04-16 | 2 | -4/+17 |
| | | | | |||||
| | * | | merge log into admin | Robin Appelman | 2012-04-16 | 7 | -57/+60 |
| | | | | |||||
| | * | | updated logos and icons | Jan-Christoph Borchardt | 2012-04-16 | 22 | -598/+5050 |
| | | | | |||||
| | * | | fix creating unique filenames | Robin Appelman | 2012-04-16 | 1 | -1/+4 |
| | | | | |||||
| | * | | fix group backend | Robin Appelman | 2012-04-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | return user specific paths from oc_filecache::getpath | Robin Appelman | 2012-04-16 | 1 | -1/+6 |
| | | | | |||||
| * | | | implement shared calendar activation on server side | Georg Ehrke | 2012-04-18 | 4 | -2/+24 |
| | | | | |||||
| * | | | implement shared calendar activation on js-side | Georg Ehrke | 2012-04-18 | 1 | -4/+4 |
| | | | | |||||
| * | | | resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts | Georg Ehrke | 2012-04-18 | 1 | -3/+7 |
| | | | | |||||
| * | | | fix merge conflicts | Georg Ehrke | 2012-04-15 | 157 | -13932/+36076 |
| |\| | | |||||
| * | | | Merge branch 'master' into calendar_sharing | Georg Ehrke | 2012-04-15 | 18 | -56/+58 |
| |\ \ \ | |||||
| * \ \ \ | fix merge conflicts | Georg Ehrke | 2012-04-15 | 115 | -586/+1063 |
| |\ \ \ \ |