Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into filesystem | Robin Appelman | 2012-01-08 | 141 | -542/+65669 |
|\ | |||||
| * | Merge branch 'master' of gitorious.org:owncloud/owncloud | Bartek Przybylski | 2012-01-08 | 2 | -5/+18 |
| |\ | |||||
| | * | Also use track_number to retrieve song track. | Cloud Dumper | 2012-01-08 | 1 | -1/+14 |
| | * | Sort results from music collection getters. | Cloud Dumper | 2012-01-08 | 1 | -4/+4 |
| * | | rename and delete hooks | Bartek Przybylski | 2012-01-08 | 2 | -6/+74 |
| * | | gallery version bump to force db update | Bartek Przybylski | 2012-01-08 | 1 | -2/+2 |
| * | | automatic adding of photo to album, feedback for user while scanning, general... | Bartek Przybylski | 2012-01-08 | 11 | -72/+82 |
| |/ | |||||
| * | enable gallery and admin_export by default at least for the alpha and beta. | Frank Karlitschek | 2012-01-07 | 2 | -1/+3 |
| * | improve search function | Georg Ehrke | 2012-01-06 | 3 | -3/+37 |
| * | Merge branch 'master' into calendar | Georg Ehrke | 2012-01-05 | 1 | -1/+1 |
| |\ | |||||
| | * | remove error output if symlink already exists. this can happen if a user remo... | Frank Karlitschek | 2012-01-03 | 1 | -1/+1 |
| * | | fix login check in ajax files | Georg Ehrke | 2012-01-05 | 3 | -3/+9 |
| * | | fix js for repeating events | Georg Ehrke | 2012-01-05 | 1 | -1/+4 |
| * | | fix autodetection for the week of the month | Georg Ehrke | 2012-01-05 | 1 | -1/+2 |
| * | | fix editeventdialog for monthly repeating events with a specific weekday and ... | Georg Ehrke | 2012-01-05 | 1 | -7/+7 |
| * | | fix repeat rule for every weekday | Georg Ehrke | 2012-01-05 | 1 | -1/+1 |
| * | | fix end for repeating events | Georg Ehrke | 2012-01-05 | 1 | -5/+5 |
| * | | Merge branch 'master' into calendar | Georg Ehrke | 2012-01-03 | 9 | -18/+127 |
| |\| | |||||
| | * | Merge git://gitorious.org/owncloud/owncloud into oc_image | Thomas Tanghus | 2012-01-02 | 9 | -0/+4458 |
| | |\ | |||||
| | * \ | Merge git://gitorious.org/owncloud/owncloud into oc_image | Thomas Tanghus | 2012-01-01 | 1 | -12/+8 |
| | |\ \ | |||||
| | * | | | Removed redundant DB queries. | Thomas Tanghus | 2011-12-31 | 2 | -7/+16 |
| | * | | | Thumbnails was overwriting default style so hover and active didn't work. Mov... | Thomas Tanghus | 2011-12-30 | 2 | -6/+6 |
| | * | | | Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts | Thomas Tanghus | 2011-12-30 | 3 | -2/+11 |
| | |\ \ \ | |||||
| | * | | | | Added license and waiver of conditions for jquery.inview. | Thomas Tanghus | 2011-12-30 | 8 | -11/+111 |
| * | | | | | Merge branch 'master' into calendar | Georg Ehrke | 2012-01-02 | 13 | -14/+4477 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | add jplayer source | Robin Appelman | 2012-01-01 | 9 | -0/+4458 |
| | | |_|/ | | |/| | | |||||
| | * | | | Fix return for empty Shared folder in opendir() | Michael Gapczynski | 2012-01-01 | 1 | -12/+8 |
| | | |/ | | |/| | |||||
| | * | | contacts entry duplication fix | Bartek Przybylski | 2011-12-30 | 1 | -1/+1 |
| | * | | Merge branch 'master' of gitorious.org:owncloud/owncloud | Bartek Przybylski | 2011-12-30 | 7 | -0/+484 |
| | |\| | |||||
| | * | | gallery fixes | Bartek Przybylski | 2011-12-30 | 2 | -1/+10 |
| * | | | remove unused js | Georg Ehrke | 2012-01-02 | 1 | -52/+13 |
| * | | | add function to detect always the timezone | Georg Ehrke | 2012-01-02 | 7 | -5/+53 |
| * | | | Merge branch 'master' into calendar | Georg Ehrke | 2011-12-29 | 78 | -51/+59802 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | More missing js. | Thomas Tanghus | 2011-12-28 | 1 | -0/+12 |
| | * | | Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails | Thomas Tanghus | 2011-12-28 | 74 | -50/+59323 |
| | |\| | |||||
| | | * | Contacts: small merge cleanups | Bart Visscher | 2011-12-27 | 3 | -27/+3 |
| | | * | Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud... | Bart Visscher | 2011-12-27 | 21 | -42/+537 |
| | | |\ | |||||
| | | | * | Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup | Thomas Tanghus | 2011-12-16 | 1 | -1/+3 |
| | | | |\ | |||||
| | | | * | | Misc. changes after review by bartv. | Thomas Tanghus | 2011-12-16 | 16 | -43/+38 |
| | | | * | | Update README | Thomas Tanghus | 2011-12-13 | 1 | -1/+4 |
| | | | * | | Added readme.tanghus | Thomas Tanghus | 2011-12-11 | 1 | -0/+19 |
| | | | * | | Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup | Thomas Tanghus | 2011-12-11 | 3 | -17/+6 |
| | | | |\ \ | |||||
| | | | * | | | Updating of contact list when activating/adding/deleting address books now wo... | Thomas Tanghus | 2011-12-11 | 10 | -116/+96 |
| | | | * | | | Resolved conflict | Thomas Tanghus | 2011-12-09 | 1 | -6/+0 |
| | | | * | | | Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup | Thomas Tanghus | 2011-12-09 | 46 | -580/+509 |
| | | | |\ \ \ | |||||
| | | | * | | | | Various fixes to multiple address books handling | Thomas Tanghus | 2011-12-09 | 13 | -37/+146 |
| | | | * | | | | Fixed adding, editing and deleting address books. One minor UI flaw remains. | Thomas Tanghus | 2011-12-05 | 8 | -21/+101 |
| | | | * | | | | Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_ba... | Thomas Tanghus | 2011-12-04 | 3 | -3/+5 |
| | | | |\ \ \ \ | |||||
| | | | * | | | | | Added UI for selecting/editing address books. | Thomas Tanghus | 2011-12-04 | 11 | -6/+277 |
| | | | * | | | | | Removed some debug statements. | Thomas Tanghus | 2011-12-01 | 2 | -30/+24 |