Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-22 | 1 | -0/+1 |
| | |||||
* | Merge branch 'share_api' | Michael Gapczynski | 2012-08-19 | 4 | -2/+132 |
|\ | | | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php | ||||
| * | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-14 | 1 | -0/+14 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php | ||||
| * \ | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-09 | 1 | -5/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php | ||||
| * \ \ | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-06 | 2 | -0/+15 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php | ||||
| * \ \ \ | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-31 | 2 | -2/+17 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js | ||||
| * \ \ \ \ | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-25 | 7 | -7/+135 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php | ||||
| * | | | | | | Make file actions permissions aware | Michael Gapczynski | 2012-07-25 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-20 | 1 | -2/+3 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-12 | 1 | -0/+14 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Remove useless setting of RUNTIME_NOAPPS | Bart Visscher | 2012-08-08 | 1 | -4/+0 |
| | | | | | |||||
* | | | | | Remove unused RUNTIME_NOSETUPFS var | Bart Visscher | 2012-08-08 | 1 | -2/+1 |
| |_|_|/ |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-07-31 | 2 | -0/+15 |
| |_|/ |/| | | |||||
* | | | Set filter to empty if not set by Ampache client | Michael Gapczynski | 2012-07-27 | 1 | -3/+2 |
| | | | |||||
* | | | Set the user id when authenticating user for Ampache, fixes bug oc-219 | Michael Gapczynski | 2012-07-27 | 1 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-07-26 | 1 | -0/+14 |
| |/ |/| | |||||
* | | remove unused variables | Robin Appelman | 2012-07-20 | 3 | -6/+4 |
| | | |||||
* | | fix remote and public.php | Robin Appelman | 2012-07-13 | 1 | -1/+1 |
|/ | |||||
* | remove superfluous ?> at the end of .php files (left out apps/*/templates) | Jörn Friedrich Dreyer | 2012-07-09 | 6 | -9/+0 |
| | |||||
* | Don't call getLocalFile() until you know it actually is music | Michael Gapczynski | 2012-06-26 | 1 | -1/+1 |
| | |||||
* | Media: Change includes in app.php to use the autoloader | Bart Visscher | 2012-06-25 | 2 | -15/+16 |
| | |||||
* | Use intervals for sessions deletion with postgres fix oc-492 | Brice Maron | 2012-06-24 | 1 | -2/+8 |
| | |||||
* | Resolve scanning issue case comparison of songs | Brice Maron | 2012-06-24 | 1 | -1/+1 |
| | |||||
* | Correct seq name in media songs fix oc-589 | Brice Maron | 2012-06-24 | 1 | -1/+1 |
| | |||||
* | Remove references to /apps/ and correct inclusion of settings | Brice Maron | 2012-06-22 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-21 | 4 | -9/+12 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: lib/app.php lib/base.php lib/minimizer/css.php lib/minimizer/js.php lib/template.php lib/util.php | ||||
| * | correct presentation of HTML encoded characters | Bjoern Schiessle | 2012-06-21 | 1 | -1/+1 |
| | | |||||
| * | use new sanitizeHTML() function | Bjoern Schiessle | 2012-06-20 | 2 | -8/+8 |
| | | |||||
| * | write_close the session when scanning files or music | Robin Appelman | 2012-06-16 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-14 | 2 | -1/+5 |
|\| | | | | | | | | | | | | | | | Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php | ||||
| * | utf8 in der DB config | Marco B | 2012-06-11 | 1 | -1/+1 |
| | | |||||
| * | prevent opening non-music files through the media ajax api | Robin Appelman | 2012-06-09 | 1 | -0/+4 |
| | | |||||
* | | Correct remote and public, and last occurence of OC:: | Brice Maron | 2012-06-06 | 2 | -4/+4 |
|/ | |||||
* | update translations | Robin Appelman | 2012-06-06 | 2 | -1/+14 |
| | |||||
* | xss vulnerability fixed | Bjoern Schiessle | 2012-06-05 | 1 | -3/+3 |
| | |||||
* | Remove OC_App::register function | Bart Visscher | 2012-05-31 | 1 | -2/+0 |
| | | | | The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty. | ||||
* | add lib collection and lib scanner to media's appinfo/app.php | Georg Ehrke | 2012-05-29 | 1 | -0/+2 |
| | |||||
* | remove not needed includes | Frank Karlitschek | 2012-05-28 | 2 | -6/+1 |
| | |||||
* | mark the apps as part of the shipped package and increase the requirement to ↵ | Frank Karlitschek | 2012-05-18 | 1 | -1/+2 |
| | | | | ownCloud 4 | ||||
* | update translations | Robin Appelman | 2012-05-17 | 2 | -4/+17 |
| | |||||
* | removing executable bit - again | Thomas Mueller | 2012-05-15 | 13 | -0/+0 |
| | |||||
* | selective app loading for remote/public | Robin Appelman | 2012-05-14 | 1 | -1/+5 |
| | |||||
* | Variable not declared in media app, fixes bug oc-633. Thanks to die3lustigen2. | Michael Gapczynski | 2012-05-13 | 1 | -1/+1 |
| | |||||
* | update translations | Robin Appelman | 2012-05-13 | 1 | -2/+2 |
| | |||||
* | load remote and public paths from info.xml during upgrade instead of setting ↵ | Robin Appelman | 2012-05-11 | 4 | -81/+4 |
| | | | | them every time | ||||
* | Fix music file action i.e. click to play, make OC.filePath act like ↵ | Michael Gapczynski | 2012-05-10 | 1 | -1/+0 |
| | | | | OC_Helper::linkTo() for index.php links | ||||
* | update translations | Robin Appelman | 2012-05-09 | 12 | -19/+71 |
| | |||||
* | Add remote for media/tomahawk.php | Bart Visscher | 2012-05-08 | 2 | -4/+3 |
| | |||||
* | Create a function for linking to remote.php | Bart Visscher | 2012-05-07 | 2 | -2/+2 |
| | |||||
* | fix path for ampache in settings | Georg Ehrke | 2012-05-07 | 1 | -1/+1 |
| |