Commit Graph

148 Commits

Author SHA1 Message Date
Jenkins for ownCloud d7e77f6426 [tx-robot] updated from transifex 2012-08-04 02:04:21 +02:00
Jenkins for ownCloud 36ccaf51ed [tx-robot] updated from transifex 2012-07-31 22:57:24 +02:00
Jenkins for ownCloud 3430dcd367 [tx-robot] updated from transifex 2012-07-30 02:05:41 +02:00
Jenkins for ownCloud 18f6552a08 [tx-robot] updated from transifex 2012-07-29 02:06:29 +02:00
Jenkins for ownCloud fa4052d6f1 [tx-robot] updated from transifex 2012-07-28 02:05:38 +02:00
Jörn Friedrich Dreyer e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Lukas Reschke c63db28eaf CSRF check 2012-07-07 15:54:52 +02:00
Tom Needham 426193cf6c Migration: Fix contacts and bookmarks 2012-06-27 21:18:31 +00:00
Brice Maron 51d33768b8 Prevent errors and mini enhancement of saved window in bookmarks 2012-06-24 21:30:14 +00:00
Brice Maron 0fb9d0bf29 Correct bookmark app : add through interface and remove missing css 2012-06-24 21:24:43 +00:00
Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
2012-06-21 17:15:35 +00:00
Bjoern Schiessle 34739b7ec5 use new sanitizeHTML() function 2012-06-21 13:57:18 +02:00
Bjoern Schiessle 2f9763d216 check if user is allowed to edit bookmarks 2012-06-21 11:50:51 +02:00
Arthur Schiwon f255ac8b3a make bookmarks bookmarklet work again, kudos to Victor Dubiniuk 2012-06-20 20:03:25 +02:00
Arthur Schiwon 4b231c15d5 bookmarks: make read later-button draggable again, fixes oc-944 2012-06-20 19:43:02 +02:00
Brice Maron 4753cc3ebd Merge branch 'master' into multi_app_dir
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
2012-06-14 21:16:59 +00:00
Marco B 3be5e2af26 utf8 in der DB config 2012-06-11 23:04:28 +02:00
Lukas Reschke 9f276729c2 Using POST instead of GET. 2012-06-10 23:38:26 +02:00
Brice Maron 6a812644e4 Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
Brice Maron cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Bart Visscher a33f580db1 Remove OC_App::register function
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
Frank Karlitschek 9e73524168 mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
Michael Gapczynski cbfbbe672c Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
Conflicts:
	apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Michael Gapczynski 6d37f9b951 Remove scroll to bookmarks_menu, no longer existent and the bookmark controls are always visible at the top anyways 2012-05-13 21:10:27 -04:00
Michael Gapczynski 1629c77eb5 Validate bookmark inputs, fixes bug oc-636 2012-05-13 16:58:47 -04:00
Vitaly Kuznetsov 6f981738bb Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example) 2012-05-10 09:10:53 +00:00
Brice Maron 41d0308806 Change label for saving bookmark button 2012-05-08 19:04:06 +00:00
Brice Maron fa4a52260f Try to correct query string url for search in bookmark 2012-05-08 16:22:35 +00:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Frank Karlitschek b462795be2 added a nice API to get the installes Apps with names, urls and icon from the outside.
This is useful for some nice upcoming desktop and mobile integration
2012-05-05 23:42:38 +02:00
Bart Visscher b6ea57c8b6 Bookmarks: Move delete code to Bookmarks class, also change to use id 2012-05-03 17:33:57 +02:00
Frank Karlitschek 97a8af7f25 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek 43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek 4fe90f62f4 port checkAppEnabled 2012-05-02 19:08:37 +02:00
Frank Karlitschek 8e99475886 first part of the config stuff 2012-05-02 13:28:56 +02:00
Frank Karlitschek 2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek 93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek 31e32e3c10 ported checkLoggedIn and checkAdmin 2012-05-01 22:59:38 +02:00
Frank Karlitschek 1a2bbd2ee4 ported addSyript and other small stuff 2012-05-01 20:03:41 +02:00
Frank Karlitschek 70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Frank Karlitschek d0554bef06 finish porting of the LOG calls or the apps to the public api 2012-05-01 17:38:27 +02:00
Frank Karlitschek e8ec999090 port to use the new public api 2012-05-01 09:49:22 +02:00
Georg Ehrke 3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Georg Ehrke 1a913ac282 bookmarks app seems to work now :) 2012-04-25 21:20:06 +02:00
Georg Ehrke 4c2cf35050 fix merge conflicts 2012-04-22 13:19:12 +02:00
Frank Karlitschek 69f3b5e2d2 make the button a bit more consistent to the other ownCloud interface 2012-04-21 23:34:24 +02:00
Georg Ehrke 69ee0efc0b remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Arthur Schiwon 80f4c4f923 Bookmarks: handle input with & and ?, fixes oc-201 2012-04-15 15:53:40 +02:00