333e8986f6
LDAP: copyright stuff
2012-05-04 13:26:07 +02:00
def59755ad
LDAP: cleanup
2012-05-04 13:26:07 +02:00
adb32ad347
LDAP: checkPassword ain't static
2012-05-04 13:26:07 +02:00
594221a467
LDAP: make oc_user_ldap::checkPassword make use of central OC_LDAP
2012-05-04 13:26:07 +02:00
3499783ea5
remove debug info
2012-05-04 13:26:07 +02:00
7aad40ca4d
LDAP: make oc_user_ldap::userExists make use of central OC_LDAP
2012-05-04 13:26:07 +02:00
6f982d2e20
LDAP: make oc_user_ldap::getUsers make use of central OC_LDAP
2012-05-04 13:26:07 +02:00
7a06e144ec
LDAP: central function for user and group list retrieval (will replace retrieveList from group part)
2012-05-04 13:26:07 +02:00
2296521a2e
Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116
2012-05-04 11:16:29 +02:00
e61e40c23d
Contacts: Hack around malformed BDAY.
2012-05-04 01:27:59 +02:00
bde5b4a7ff
Contacts: Don't load event handlers more than once, or you're asking for trouble :-P
2012-05-04 00:13:35 +02:00
07ff1e723a
Calendar: Fix repeating events
2012-05-03 23:33:44 +02:00
89c8316f8f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2012-05-03 23:26:43 +02:00
077ea94f71
Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud
...
Conflicts:
apps/calendar/ajax/events.php
2012-05-03 23:18:43 +02:00
76a60a2fc3
ups, we don't have a CSS file therefore
2012-05-03 23:03:05 +02:00
b6ea57c8b6
Bookmarks: Move delete code to Bookmarks class, also change to use id
2012-05-03 17:33:57 +02:00
8076b1e12d
Contacts: Remove some logging.
2012-05-03 16:01:40 +02:00
a89231ac1d
Contacts: Clean up tipsies.
2012-05-03 16:01:40 +02:00
5be9084c73
Contacts: Fixed paths in import.
2012-05-03 16:01:40 +02:00
cbee0d3128
Contacts: Fix paths and improve markup and css in address book overview.
2012-05-03 16:01:40 +02:00
97a8af7f25
ported oc_db
2012-05-03 13:06:08 +02:00
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
375ba98645
Contacts: Move gif used by jquery.Jcrop and make style sheet use %webroot% path.
2012-05-03 11:15:44 +02:00
15be032740
Contacts: Improve loading contact.
2012-05-03 11:15:44 +02:00
6cc9f600d2
Contacts: Don't resize profile picture if it's not too big.
2012-05-03 11:15:44 +02:00
351740601a
port oc_response
2012-05-03 10:46:27 +02:00
80dff77b65
Fix private links
2012-05-02 19:24:43 -04:00
e5ef3e1340
move archive library to core so we can properly depend on it
2012-05-02 23:48:23 +02:00
0b51c53443
run none of the extranal storage tests on default
2012-05-02 23:44:00 +02:00
4ba527625f
don't try to register file actions when we're not in the files app
2012-05-02 23:26:57 +02:00
47081a2471
Gallery: Update version for database update
2012-05-02 21:36:34 +02:00
f7e410147f
Contacts: check for malformed VCards in calendar hook
2012-05-02 21:36:33 +02:00
6d37b8567b
Refactoring and upload support for Google Drive backend
2012-05-02 14:41:57 -04:00
4fe90f62f4
port checkAppEnabled
2012-05-02 19:08:37 +02:00
eec7c3833c
fix install
2012-05-02 19:02:41 +02:00
71f9b1968e
Tasks: Make it possible to close the details area
2012-05-02 17:28:19 +02:00
33c343ed11
add require_once('../lib/base.php'); to webdav.php
2012-05-02 16:47:25 +02:00
da03d05700
create folder 'remote' for the remote services like caldav, carddav and webdav
2012-05-02 16:41:23 +02:00
82a61e2e1a
port oc_preferences
2012-05-02 15:54:34 +02:00
ff66600bc0
port appconfig
2012-05-02 14:11:29 +02:00
8e99475886
first part of the config stuff
2012-05-02 13:28:56 +02:00
8c7f854671
move all the files stuff into a files class
2012-05-02 12:54:31 +02:00
f1830866a3
Contacts: Removed styling and (most) js from template. Started making app more keyboard/screenreader friendly. General cleanup in code and markup.
2012-05-02 12:10:44 +02:00
72256abf34
Contacts: Trying to improve PHOTO handling a bit.
2012-05-02 11:44:00 +02:00
6750998984
files is not internal any more, part II
2012-05-02 11:26:22 +02:00
8ed8d9cd91
fixing namespace
2012-05-02 00:55:26 +02:00
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
e48f511606
port linkto and serverHost
2012-05-01 23:19:39 +02:00
31e32e3c10
ported checkLoggedIn and checkAdmin
2012-05-01 22:59:38 +02:00
e2fb094693
some more porting
2012-05-01 21:07:08 +02:00
ab58471904
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-01 20:07:36 +02:00
1a2bbd2ee4
ported addSyript and other small stuff
2012-05-01 20:03:41 +02:00
20f3875f1b
Change default from address to sharing-noreply@server for emailing private links
2012-05-01 13:06:17 -04:00
254b8b9506
porting of OC_User to public API complete.
...
What better thing to do during a long train ride than refactoring ;-)
2012-05-01 19:04:20 +02:00
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
5bf69237b2
ported isLoggedIn
2012-05-01 18:46:15 +02:00
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
3f9ac6405a
port some of the log call to the new public api
...
more to come
2012-05-01 14:29:34 +02:00
51b6aab436
LDAP: remove Notices on settings
2012-05-01 12:25:17 +02:00
54854b2e3d
LDAP: decent behaviour and log message when there is no connection to the LDAP server
2012-05-01 12:17:33 +02:00
11314c81d9
add/remove handlers
2012-05-01 10:07:48 +02:00
e8ec999090
port to use the new public api
2012-05-01 09:49:22 +02:00
e409e7cd4c
forgot a file
2012-05-01 09:38:10 +02:00
5193ddd7d7
fixing syntax error
2012-04-30 21:55:25 +02:00
8a3d41c043
fix a PHP Notice
2012-04-30 21:46:33 +02:00
6c908a4cd0
fix path in calendars geo.js
2012-04-30 21:18:54 +02:00
f425b80deb
one todo less
2012-04-30 19:21:29 +02:00
b20b30b6fe
Implement a basic versioning configuration. Only a on/off switch for now.
...
I changed my mind about the more complex configuration options. We go with good default for now and don´t expose all the technical options to the users.
They can still override in the config file if it´s really really needed and they know what they are doing
2012-04-30 19:18:00 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
9c520c70a8
Various file path fixes.
2012-04-30 01:48:01 +02:00
a8b6fdd396
Contacts: Small css tweaks.
2012-04-30 01:01:24 +02:00
0bccd9c18c
Contacts: Forgot to add the import template.
2012-04-29 23:26:14 +02:00
f6fefe9a36
Contacts: Ensure TYPE parameters on email aren't deleted on edit. They are still not shown in the UI.
...
Remove an obsolute file and did some cleanup.
2012-04-29 22:12:27 +02:00
023479b1e2
Contacts: removed unused method and ajax file.
2012-04-29 22:12:27 +02:00
163344243b
jquery.combobox: Added 'showButton' option
2012-04-29 22:12:27 +02:00
b862c49ae6
enable by default. at least during oC4 testing
2012-04-29 21:18:28 +02:00
0d0129221b
add a info.xml to files
2012-04-29 21:17:22 +02:00
84bd83b1dc
fix file deletion
2012-04-29 16:09:41 +02:00
c6f034a5d2
Support "songs" ampache API action for proper rhythmbox support
2012-04-29 00:47:57 +02:00
afeb9d9cbf
moving the file actions properly
2012-04-28 23:11:48 +02:00
bef701c448
add version file to files app
2012-04-28 13:35:05 +02:00
7eb7492360
some fixes for sharing
2012-04-27 23:14:53 +02:00
72c0d6968e
fix duplicated entries on upload
2012-04-27 22:48:27 +02:00
6e7f5ec4ce
Tasks: Add input to edit the task location
2012-04-27 20:26:12 +02:00
c627657fc6
Tasks: Fix the display of the list of tasks
2012-04-27 17:48:08 +02:00
a1b309a42a
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-27 13:23:58 +01:00
0aaf6d16a5
Merge branch 'master' into movable_apps_2
2012-04-27 14:22:12 +02:00
80c850d018
added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts
2012-04-27 13:19:16 +01:00
768041b6cb
Contacts: Added convinience method for notifications.
2012-04-27 10:35:31 +02:00
18c11ec81b
jquery.combobox: Added 'editable' option and cleaned up a bit.
2012-04-27 10:35:31 +02:00
1384fdfe01
Contacts: Updated first run page.
2012-04-27 10:35:31 +02:00
f7fb4a54c9
ampache should work now
2012-04-26 22:00:37 +02:00
5fda0e4b3b
make *DAV work with movable apps
2012-04-26 21:56:29 +02:00
6930af4c0f
Merge branch 'master' into movable_apps_2
2012-04-26 21:27:22 +02:00
78b2da583d
move files to the correct place
2012-04-26 21:24:41 +02:00
d96e962fc1
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-26 18:45:59 +01:00
18a024e251
started implementing ajax file rollback
2012-04-26 18:45:17 +01:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
c693ee2adb
added available version names to files dropdown menu via new ajax script
2012-04-26 16:48:43 +01:00
0249a72cab
fix downloading of files in files app
2012-04-26 17:35:12 +02:00
754844f5c9
Add ability to send private links from sharing via email
2012-04-26 10:33:24 -04:00
6312067ab5
improved styling, called css file in history.php
2012-04-26 14:32:29 +01:00
ebd82ee772
fixes for media app
2012-04-26 15:23:17 +02:00
2c92a79b5d
fixes for contacts app
2012-04-26 15:20:01 +02:00
b19fae392b
linked more button to history page
2012-04-26 13:54:38 +01:00
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
02c1127de3
changed function name to avoid clash with sharing dropdown
2012-04-26 13:41:22 +01:00
4bb1a2c2d6
Contacts: Some js cleanup.
2012-04-26 10:38:39 +02:00
5dbf362623
Contacts: Added import with with file picker.
2012-04-26 03:21:52 +02:00
c20abfef38
Fix a counting mistake
2012-04-25 19:30:58 -04:00
32de47d1d9
Update sharing when users are removed, added to groups, and removed from groups
2012-04-25 18:18:58 -04:00
b75f680b8e
gallery app seems to work now :)
2012-04-25 21:20:30 +02:00
1a913ac282
bookmarks app seems to work now :)
2012-04-25 21:20:06 +02:00
6895c54a3f
Fix javascript checkbox toggle for resharing
2012-04-25 14:37:14 -04:00
cbba469990
LDAP rewrite, use unique LDAP user and group identifiers on LDAP side as well as fancy (unqiue as far as users a know from LDAP) names on the ownCloud side. It's done via mapping of owncloud names and LDAP identifiers.
...
some performance enhancements: faster searching for users and groups in their specific subtrees. Reading instead of searching were possible.
thanks for the feedback of Kevin van Kuik
2012-04-25 20:35:30 +02:00
0933b5e7ab
use uniquemember instead of deprecated memberuid to identify LDAP group members. Attention: not every method is adjusted yet, so it breaks some things.
2012-04-25 20:35:30 +02:00
a82d709f87
don't forget new JS file
2012-04-25 20:35:30 +02:00
e1cd690a7c
LDPA: group settings into basic and advanced to look less crowded. Still needs some love. Looks different to the other admin settings, though.
2012-04-25 20:35:29 +02:00
c00762b49b
added dropdown js menu for file versions, improved readability of history.php
2012-04-25 17:37:45 +01:00
7d9587bab3
Forgot to remove error log messages...
2012-04-25 11:54:16 -04:00
b369adbd94
Allow admin to disable resharing of files
2012-04-25 11:51:30 -04:00
a3dff248a1
fixed path to history script
2012-04-25 14:27:55 +01:00
8ae1430090
added script and loaded it for adding history button
2012-04-25 13:56:43 +01:00
81f549baee
made code a little more readable
2012-04-25 13:51:08 +01:00
4795295fb1
Contacts: Fixed some file paths.
2012-04-25 10:44:27 +02:00
d76552a009
Merge branch 'sabredav_1.6'
2012-04-25 10:39:31 +02:00
20f1c1e6ca
Forgot to fix one file...
2012-05-06 00:39:01 +02:00
6c554d0ffa
Calendar: Fix calendar export link
2012-05-06 00:35:49 +02:00
93ae945414
Contacts: Fix for leftcontent positioning in Android browser.
2012-05-06 00:34:08 +02:00
2953f4d11a
Contacts: Removed redundant styles.
2012-05-06 00:34:07 +02:00
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
565e02d061
Add back removed groups to the select form correctly
2012-05-05 17:10:07 -04:00
d854e4a144
Calendar: fix return of insert id
2012-05-05 22:32:55 +02:00
f991948a71
Fix loading by apptype in webdav
2012-05-05 21:58:10 +02:00
ef9511c713
Refactor sharing UI; bug fixes, code clean-up, and more efficient with less ajax calls
2012-05-05 15:18:14 -04:00
d764585d8b
Remove blind effect for email private link in drop down
2012-05-05 14:57:25 -04:00
03f81fdd88
fix js fail in media player
2012-04-25 10:27:17 +02:00
323b19a4a0
some fixes in contacts javascript files
2012-04-25 10:17:54 +02:00
60c0827ba3
Merge branch 'master' into movable_apps
2012-04-25 09:23:01 +02:00
9ee2bb9719
fix js fail in media player
2012-04-25 09:22:19 +02:00
5b70e2fb25
some performance improvements to the openstack swift backend
2012-04-25 00:12:12 +02:00
5c3ea14819
fix mimetypes of encrypted files
2012-04-25 00:12:12 +02:00
f17eea506a
fix merge conflicts
2012-04-24 21:59:56 +02:00
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
a3d0a74d03
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-24 15:38:36 +02:00
69a2173fdb
non working app. moved to the apps-playground repository
2012-04-24 14:00:44 +02:00
b824425186
Added loading indicator.
2012-04-24 11:38:11 +02:00
988f98fc6f
Contacts: Check that UIDs really are unique on import. Better solution would be to suggest to merge contacts, but that will have to wait to OC5 ;-)
2012-04-24 11:35:56 +02:00
22f4acadc0
Contacts: In app import (for Chrome and Firefox only)
2012-04-24 01:44:07 +02:00
b8da5c5262
Contacts: Tried to format NOTE field a bit. Needs to be improved more though.
2012-04-24 01:44:07 +02:00
dfc94cbe84
Contacts: In app import. Cleanup still needed.
2012-04-24 01:44:07 +02:00
0cd9570277
Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/owncloud/2012-April/002900.html
2012-04-24 01:44:07 +02:00
4ea927a798
wrote a new versioning app over the weekend. Basic functionality to far but it works (TM) and has all the needed features (TM) for ownCloud 4. Userinterface integration and small improvements still missing.
2012-04-23 23:54:49 +02:00
b704ff1bc7
Tasks: Simple add task action
2012-04-23 22:13:35 +02:00
fd47fbe176
fix contacts app a bit
2012-04-23 20:42:52 +02:00
9092692b8e
make calendar work with movable apps
2012-04-23 20:32:55 +02:00
10eea3f464
fix pathes of shared calendars
2012-04-23 20:13:55 +02:00
d1110c62ef
fix file path in apps/media/ajax/api.php
2012-04-23 20:01:48 +02:00
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
728e6a6bf9
Tasks: Simple categories input
2012-04-23 18:28:44 +02:00
3b9d283245
fix path in apps/files/templats/index.php
2012-04-23 16:25:07 +02:00
c0df15367f
fix style.css of the files app
2012-04-23 16:18:15 +02:00
08fe6bdb27
fix path in /apps/files/js/timezone.php
2012-04-23 16:17:35 +02:00
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
912c87eeda
LDAP: optimize LDAP requests for users and groups. Settings are still to do, though.
2012-04-23 13:04:58 +02:00
1b084cc120
Merge branch 'master' into movable_apps
2012-04-23 13:03:50 +02:00
6ee7dc5f59
only retrieve requested attributes
2012-04-23 12:32:17 +02:00
fffbf26159
don't forget to declare class properties
2012-04-23 11:22:11 +02:00
82ba2151d1
Wrong app check.
2012-04-23 10:52:13 +02:00
8f2e9caf96
Contacts: Tipsyfied photo toolbar.
2012-04-23 10:52:13 +02:00
d17eba19c1
fix image viewer
2012-04-22 21:27:20 +02:00
c5b31b001a
add the option to disable file encryption while still being able to decrypt existing files
2012-04-22 21:27:20 +02:00
e8f062dc93
Contacts:
...
- Added overlay toolbar to contact photo with 'Delete current', 'Edit current', 'Load from OC_Filesystem' and 'Upload' options.
- Made action icons translucent instead of hiding them.
2012-04-22 20:47:24 +02:00
8a6cb23170
Contacts: Clear cache for contact photo and thumbnail when it has been changed.
2012-04-22 20:47:24 +02:00
e888f4d9bc
Merge branch 'master' into sabredav_1.6
2012-04-22 13:20:50 +02:00
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
1bba445642
hide alarm and attendees tab
2012-04-22 13:15:24 +02:00
f08cfcecec
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
24aff287cf
Link to icon was absolute.
2012-04-22 03:39:59 +02:00
f85aaf1f58
Contacts: Added bg color and shadow to controls. I suck at CSS...
2012-04-22 02:32:51 +02:00
80ddf37bb7
Missing double quote.
2012-04-22 02:09:13 +02:00
651de1e588
Contacts: Fix error on photo crop.
2012-04-22 01:50:46 +02:00
9e3242d05e
Contacts: Changed layout as discussed with JanC. Still WiP.
2012-04-22 00:44:53 +02:00
56e064bd09
Don't trigger unnecessary change events.
2012-04-22 00:44:53 +02:00
16fc4dfd1a
Contacts: Fixed contact photo drag'n'drop upload - again...
2012-04-22 00:44:53 +02:00
a34631f84e
Contacts: Add check for empty FN field.
2012-04-22 00:44:53 +02:00
69f3b5e2d2
make the button a bit more consistent to the other ownCloud interface
2012-04-21 23:34:24 +02:00
260c48c29a
cleanup the admin page layout mess a bit. Still a lot to improve in the future :-)
2012-04-21 23:23:02 +02:00
0918fc7d91
fix merge conflicts
2012-04-21 23:21:50 +02:00
80950f2e1c
make field completely visible
2012-04-21 23:10:35 +02:00
ff3b199cc8
use less space
2012-04-21 23:08:52 +02:00
1a49497899
structure the information a bit more so that is easier readable
2012-04-21 22:55:18 +02:00
74e5402711
fix a php notice
2012-04-21 22:27:19 +02:00
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
acea156a3d
Tasks: Save description field
2012-04-20 23:37:42 +02:00
3d68732657
Tasks: Due date without time support added
2012-04-20 22:56:59 +02:00
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
c3d78cf77a
remove require once lib base in files scan.php
2012-04-20 22:34:13 +02:00
1384be4bff
Tasks: Task summary is always text, at it as suchs
2012-04-20 18:19:10 +02:00
70ba428222
Tasks: Make gettasks more robust against malformed VTODO data
2012-04-20 18:18:07 +02:00
c75bbb59a9
Tasks: Add due property handling
2012-04-20 18:16:39 +02:00
3aeea0c196
Merge branch 'merge-requests/105'
2012-04-19 20:31:24 +02:00
3706bbec1b
Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105
2012-04-19 20:30:58 +02:00
5cefd34660
emulate touch with custom mtime for swift backend
2012-04-19 00:25:47 +02:00
9a707e10bf
add SWIFT (openstack object storage) storage backend
2012-04-18 20:54:28 +02:00
d1ad4dc8d6
add test cases for cryptstream
2012-04-18 20:54:28 +02:00
b39c3d4c4e
make use of the fact that stream_read will always read 8192 bytes for encryption stream
...
https://bugs.php.net/bug.php?id=21641
2012-04-18 20:54:28 +02:00
26e9a0dd13
bugfixes for encryption library and test cases
2012-04-18 20:54:28 +02:00
b44bc9f4b2
remove require once lib base in some more files
2012-04-18 17:42:11 +02:00
921fc59d8f
Tasks: Add "more" block containing description
2012-04-18 17:28:16 +02:00
45de7ad221
move files to app folder
2012-04-18 17:27:34 +02:00
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
cf492a9649
Merge branch 'master' into calendar_sharing
2012-04-18 11:51:59 +02:00
de71842888
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
8959e0af3d
implement shared calendar activation on js-side
2012-04-18 11:39:00 +02:00
7402543d3e
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
2012-04-18 09:53:54 +02:00
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
4dabd0fb9c
test data for archives
2012-04-17 18:04:06 +02:00
6ba30cb713
Tasks: Clicking task summary opens input for edit
2012-04-17 17:32:21 +02:00
66018b89b2
LDAP: don't forget to unbind
2012-04-16 18:03:02 +02:00
86192c2f8d
checked, works for me
2012-04-16 17:31:39 +02:00
9cd5221d47
group ldap: check configuration
2012-04-16 17:28:58 +02:00
ed54de1bbf
group LDAP: implement groupExists function, needed for Sharing
2012-04-16 16:23:00 +02:00
8afeb0fedb
Tasks: Implement task lists overview
2012-04-16 15:34:14 +02:00
320fde9eec
OC_Group does expect object, not string
2012-04-16 15:09:38 +02:00
899c7631d5
minor code beautification
2012-04-16 15:09:38 +02:00
e1948c651b
use the right attribute for member retrieval
2012-04-16 15:09:38 +02:00
02f4e78f3e
a string be a string
2012-04-16 15:09:38 +02:00
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
77cefdedb8
Merge branch 'master' into sabredav_1.6
2012-04-15 22:28:11 +02:00
dc18e65b46
fix merge conflicts
2012-04-15 22:26:55 +02:00
b0e68d039c
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 15:09:54 +00:00
712e25bb02
Update ace
2012-04-15 15:09:37 +00:00
0b426b5e64
Display correct URL in caldav and carddav paths
2012-04-15 16:50:45 +02:00
9b1d6246a9
Remove useless, unmaintained dav.php
2012-04-15 16:50:44 +02:00
9ac65c51f5
dont try to view psd files
2012-04-15 16:26:08 +02:00
fef3434bdf
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 14:02:13 +00:00
738601f4fe
Remove google web font
2012-04-15 14:01:59 +00:00
679ddc0e32
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 16:01:06 +02:00
f36d31f74d
pdfjs updated from github
2012-04-15 15:59:31 +02:00
80f4c4f923
Bookmarks: handle input with & and ?, fixes oc-201
2012-04-15 15:53:40 +02:00
9ee3eb1412
remove unused css
2012-04-15 13:44:43 +00:00
947d2e5705
Tasks: Mark task as complete when checking the checkbox
2012-04-15 15:39:49 +02:00
19d81068f6
Tasks: Code cleanup
2012-04-15 15:38:44 +02:00
b3ae2208b1
clean the collection view after rescanning
2012-04-15 15:19:30 +02:00
cf3bb08dfb
enable archive support on default
2012-04-15 15:19:30 +02:00
9ee931e790
only run archive tests if the test data is available
2012-04-15 15:19:30 +02:00
819af69972
group LDAP: simple basic tests
2012-04-15 14:50:03 +02:00
0a46c7a393
group LDAP: usersInGroup not getUsersInGroup
...
offer static readonly properties
2012-04-15 14:50:03 +02:00
2a03db6065
don't forget changes in lib_ldap for last commit
2012-04-15 14:50:03 +02:00
8a6fa65ed6
group LDAP: implemented getUsersInGroup()
2012-04-15 14:50:03 +02:00
b480071946
group LDAP: implemented getUserGroups()
2012-04-15 14:50:03 +02:00
0912f40ebe
typo
2012-04-15 14:50:03 +02:00
54a9fd2e6a
group LDAP: implemented inGroup()
2012-04-15 14:50:03 +02:00
8ddea7e95c
Merge branch 'master' into calendar_sharing
2012-04-15 14:28:31 +02:00
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
e292b1fcdb
fix merge conflicts
2012-04-15 12:43:07 +02:00
3b71e46cf7
Contact: Don't use non core class in appinfo/app.php
2012-04-14 18:34:59 +02:00
29bb5d27e4
few pieces of documentation
2012-04-14 18:26:51 +02:00
19243b3e91
give back expected result types as long as logic is not there yet
2012-04-14 18:08:40 +02:00
e160acefe3
test for ldap group backend
2012-04-14 18:08:40 +02:00
61a43419a5
starting to create the ldap group backend (with some inspiration from Yoann Gini) and preparing an general LDAP class
2012-04-14 18:08:40 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
926b2b78fe
keep version numbers in their own files for faster reading
2012-04-14 16:29:11 +02:00
029e1aced7
Tasks: Update to use new categories interface
2012-04-14 14:55:37 +02:00
44c34115a4
Remove go to line
2012-04-14 12:49:31 +00:00
7d1880078c
Merge branch 'master' into tasks
2012-04-14 13:47:56 +02:00
9b1c881ca8
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 11:18:25 +00:00
5c55b9c5ac
Sharing: Add a filename after public share link
...
We don't do anythink with the name, but it is nice to know the file the
link point to.
2012-04-14 12:45:32 +02:00
524bd2e75f
Sharing: Don't get share icon for undefined filename
2012-04-14 12:45:32 +02:00
7504ceb6f2
Sharing: Define missing template vars
2012-04-14 12:45:32 +02:00
3babb8c22c
improve flexibility of search providers a bit
2012-04-14 11:29:54 +02:00
8ed4606685
LDAP: don't keep possibly outdated passwords
2012-04-14 11:08:50 +02:00
e256ac8791
fix unsharing of events
2012-04-13 21:49:24 -04:00
c65adc12d5
add chosen script to calendar
2012-04-13 21:29:51 -04:00
5d4c546693
fix public sharing of calendars
2012-04-13 17:36:47 -04:00
ea3499a712
fix class name
2012-04-13 17:26:34 -04:00
1e0364baa8
check permission check in share function
2012-04-13 17:16:28 -04:00
77a9e343aa
Merge branch 'master' into sabredav_1.6
2012-04-13 16:42:10 -04:00
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
02dc343209
fix address of public shared calendars
2012-04-13 16:26:06 -04:00
854eaff34f
hide share tab in shared events
2012-04-13 16:20:19 -04:00
0aaaefbb4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-13 20:10:35 +00:00
1165b358b4
Update language string
2012-04-13 20:09:04 +00:00
b9f9228a22
Contacts: Save the category list update when updating/adding contact
2012-04-13 21:13:58 +02:00
4c52007996
Calendar: Update category list when updating/adding event
2012-04-13 21:13:58 +02:00
471e735b0c
Calendar: Document active parameter in allCalendars
2012-04-13 21:13:58 +02:00
7cf7d5c3dd
Calendar: Also set repeat options when editing a non repeating event
2012-04-13 21:13:58 +02:00
28e0d64ede
Calendar: Fix saving of Categories in an event
2012-04-13 21:13:58 +02:00
f9b7ed3a1f
Calendar: Implement rescan of Categories
2012-04-13 21:13:58 +02:00
6aee6dae6b
VCategories css is now in styles.css
2012-04-13 18:50:40 +02:00
b654121b50
Contacts: Better error reporting.
2012-04-13 18:50:40 +02:00
6066ea3170
only run tests for files_external when asked for explicitly
2012-04-13 18:49:50 +02:00
8686667b10
some idexes for the media player tables
2012-04-13 18:49:50 +02:00
df2e788a1c
fix calendarid in eventform and validation of calendarid
2012-04-12 23:15:19 -04:00
a7908ba76b
fix bugs in share class
2012-04-12 22:11:48 -04:00
e9c1f8b4e6
Contacts: No need to sort the categories anymore
2012-04-12 23:10:49 +02:00
43ba23430d
Contacts: Change "category" to "group" in UI
2012-04-12 23:10:49 +02:00
78189e2247
Contacts: update category list when the categories change
2012-04-12 23:10:49 +02:00
9165b5c28e
Use the same category input and management as the contacts app
2012-04-12 23:10:49 +02:00
b2011bd0a0
Remove unused function getCategoryOptions from OC_Calendar_Object
2012-04-12 23:10:49 +02:00
5fa90cd214
Contacts: Also initialize org var in updateValuesFromAdd
2012-04-12 23:10:49 +02:00
86edc0da31
Contacts: add space before parameter
2012-04-12 23:10:49 +02:00
fa853102e4
Contacts: Move use of OC_Contacts_App::$categories to inside of OC_Contacts_App
...
This is in preparation of making $categories protected and initialized
with default categories.
2012-04-12 23:10:49 +02:00
48f99fe661
off by default. great tool for developers but confusing for users.
2012-04-12 20:23:45 +02:00
bd262eaac0
Fixed OC-261 by modifying js files in apps/media/
2012-04-12 17:56:53 +02:00
d9aa31fd92
Use OC_Helper::serverHost() in openid settings
2012-04-12 17:51:17 +02:00
8cea656ad7
upgrade getid3
2012-04-12 15:54:08 +02:00
0f16935763
fix bugs and optimize OC_Calendar_Object Class
2012-04-11 10:21:45 -04:00
613e15035e
Merge branch 'master' into sabredav_1.6
2012-04-10 22:44:13 -04:00
ac2d14101c
Merge branch 'master' into calendar_sharing
2012-04-10 20:10:07 -04:00
64d3301523
make shared events editable and add (empty) classes for alarm and attendees
2012-04-10 16:03:38 -04:00
2dfa02a346
Contacts: fix function names to coding standard
2012-04-10 21:53:36 +02:00
3f6e971571
Contacts: Don't lowercase categories value when saving
2012-04-10 21:19:39 +02:00
fd72556fd1
Contacts: Make part.no_contacts.php translatable
2012-04-10 21:15:38 +02:00
eaa649cfb2
fix bug in share lib of calendar
2012-04-10 11:18:02 -04:00
47f94548ce
don´t enable by default. still broken
2012-04-10 15:05:33 +02:00
6cf3f10d35
fix includes
2012-04-09 22:51:53 +02:00
b0894b3148
Add Craigs granite library to 3rdparty and files_versioning. Still not working and lots ot stuff to do.
2012-04-09 22:10:29 +02:00
4fda6af725
Contacts: Fix for not being able to add contact to empty/non-existant address book.
2012-04-09 16:30:58 +02:00
9c247ce874
Removed padding.
2012-04-09 16:30:58 +02:00
53091551d8
Re-added file I had accidentally removed earlier :-P
2012-04-09 16:30:58 +02:00
ecc596534a
Decode json response for admin exports
2012-04-08 19:08:17 +00:00
9294a95438
fix view of single shared events
2012-04-07 22:54:38 -04:00
960553f9c4
fix path and class name
2012-04-07 22:45:44 -04:00
5a4237a31d
make dropdown menu work with single event sharing
2012-04-07 22:41:24 -04:00
97d216c94d
add dropdown to eventform
2012-04-07 22:40:20 -04:00
4d884c3849
clean up events.php of calendar
2012-04-07 22:39:37 -04:00
e940152bce
fix bugs in share lib of calendar
2012-04-07 22:39:02 -04:00
eef9a1e7ed
add access check to ajax files
2012-04-07 22:37:26 -04:00
e18c0d54f6
add output functions and access function to app.php of calendar
2012-04-07 22:35:29 -04:00
c0869887cf
Return JSON for import and export methods of OC_Migrate
2012-04-07 21:55:16 +00:00
9edf45a324
Merge branch 'master' into migration
2012-04-07 17:31:30 +00:00
d2886f2020
Hide instance import as it eats data
2012-04-07 17:27:09 +00:00
00449cdf37
rename admin_export -> admin_migrate
2012-04-07 17:23:25 +00:00
23d39f7ef0
Display errors on import
2012-04-07 16:13:18 +00:00
d1ae6512cc
Contacts: Misc. cleanup tweaks.
2012-04-07 16:03:43 +02:00
b71cf1a4f9
Fix bug oc-413: PHP fatal error in contacts page when no contacts in ownCloud.
2012-04-07 16:03:43 +02:00
660951dc64
Add some filetypes
2012-04-07 13:32:00 +00:00
a098c7c685
Give editor focus after saving
2012-04-06 21:38:38 +00:00
22466010fc
Provide undo when closing editor with unsaved changes
2012-04-06 21:37:28 +00:00
2fe0716cb4
Show nice errors
2012-04-06 20:52:41 +00:00
60e3b563e2
webdav needs to load authentication apps
2012-04-04 12:41:32 +02:00
dd4e577f6d
Contacts: l11n for geo autocomplete. Not sure if it works though.
2012-04-03 08:13:10 +02:00
fc555b48ec
Contacts: Added autocomplete using geonames.org.
2012-04-03 07:29:47 +02:00
b3f107ddda
Contacts: First work on cleaner design.
2012-04-03 03:29:12 +02:00
896bff5748
Contacts: rescan categories on load if there are none.
2012-04-03 03:29:12 +02:00
bd9fa658de
merged from upstream
2012-04-02 23:54:18 +02:00
Arthur Schiwon
Thomas Tanghus
Bart Visscher
Frank Karlitschek
Michael Gapczynski
Robin Appelman
Georg Ehrke
Thomas Müller
Bartek Przybylski
Frank Karlitschek
NIEK Antoine
Jan-Christoph Borchardt
Sam Tuke
Sam Tuke
Jan-Christoph Borchardt
Tom Needham
Jakob Sack
Deepak Mittal
Daniele E. Domenichelli
Florian Hülsmann